From 2405f05826104c8a5cad1a09f23598b2fe0de377 Mon Sep 17 00:00:00 2001
From: Tiberiu Sabau <tibssabau@yahoo.com>
Date: Tue, 3 Mar 2026 22:37:12 +0100
Subject: [PATCH 1/4] feat(web): add repeat icon to recurring events

---
 .../Event/Grid/GridEvent/GridEvent.tsx        |  7 +++++
 .../components/Grid/AllDayRow/AllDayEvent.tsx |  7 +++++
 .../SomedayEventRectangle.tsx                 | 28 +++++++++----------
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
index eb82e7c88..667d107e5 100644
--- a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
+++ b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
@@ -23,6 +23,7 @@ import {
   FlexDirections,
   FlexWrap,
 } from "@web/components/Flex/styled";
+import { RepeatIcon } from "@web/components/Icons/Repeat";
 import { Text } from "@web/components/Text";
 import { selectIsEventPending } from "@web/ducks/events/selectors/pending.selectors";
 import { useAppSelector } from "@web/store/store.hooks";
@@ -140,6 +141,12 @@ const _GridEvent = (
         flexWrap={FlexWrap.WRAP}
       >
         <StyledEventTitle eventHeight={position.height} role="textbox">
+          {isRecurring && (
+            <RepeatIcon
+              size={12}
+              style={{ marginRight: "4px", verticalAlign: "middle" }}
+            />
+          )}
           {event.title}
         </StyledEventTitle>
         {!event.isAllDay && (
diff --git a/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx b/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
index f15c0c7b0..334af8a04 100644
--- a/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
+++ b/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
@@ -9,6 +9,7 @@ import { type Schema_GridEvent } from "@web/common/types/web.event.types";
 import { getEventPosition } from "@web/common/utils/position/position.util";
 import { Flex } from "@web/components/Flex";
 import { AlignItems, FlexDirections } from "@web/components/Flex/styled";
+import { RepeatIcon } from "@web/components/Icons/Repeat";
 import { SpaceCharacter } from "@web/components/SpaceCharacter";
 import { Text } from "@web/components/Text";
 import { selectIsEventPending } from "@web/ducks/events/selectors/pending.selectors";
@@ -96,6 +97,12 @@ const AllDayEvent = ({
         direction={FlexDirections.COLUMN}
       >
         <Text size="m" role="textbox">
+          {isRecurring && (
+            <RepeatIcon
+              size={12}
+              style={{ marginRight: "4px", verticalAlign: "middle" }}
+            />
+          )}
           {event.title}
           <SpaceCharacter />
         </Text>
diff --git a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
index 15fd46b16..1e4ff54fd 100644
--- a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
+++ b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
@@ -5,10 +5,11 @@ import {
   FlexDirections,
   JustifyContent,
 } from "@web/components/Flex/styled";
+import { RepeatIcon } from "@web/components/Icons/Repeat";
 import { Text } from "@web/components/Text";
 import { type Props_DraftForm } from "@web/views/Calendar/components/Draft/context/DraftContext";
 import { type Actions_Sidebar } from "@web/views/Calendar/components/Draft/sidebar/hooks/useSidebarActions";
-import { StyledMigrateArrow, StyledRecurrenceText } from "./styled";
+import { StyledMigrateArrow } from "./styled";
 
 interface Props {
   category: Categories_Event;
@@ -26,6 +27,7 @@ export const SomedayEventRectangle = ({
   const target = category === Categories_Event.SOMEDAY_WEEK ? "week" : "month";
   const canMigrate =
     !event.recurrence?.rule || event.recurrence?.rule.length === 0;
+  const isRecurring = !canMigrate;
 
   return (
     <div ref={formProps.refs.setReference} {...formProps.getReferenceProps()}>
@@ -34,9 +36,17 @@ export const SomedayEventRectangle = ({
         direction={FlexDirections.ROW}
         justifyContent={JustifyContent.SPACE_BETWEEN}
       >
-        <Text size="l">{event.title}</Text>
+        <Text size="l">
+          {isRecurring && (
+            <RepeatIcon
+              size={14}
+              style={{ marginRight: "4px", verticalAlign: "middle" }}
+            />
+          )}
+          {event.title}
+        </Text>
 
-        {canMigrate ? (
+        {canMigrate && (
           <Flex>
             <StyledMigrateArrow
               onClick={(e) => {
@@ -59,18 +69,6 @@ export const SomedayEventRectangle = ({
               {">"}
             </StyledMigrateArrow>
           </Flex>
-        ) : (
-          <Flex>
-            <StyledRecurrenceText
-              onClick={(e) => {
-                e.stopPropagation();
-                alert("Can't migrate recurring events");
-              }}
-              title="Can't migrate recurring events"
-            >
-              ☝️
-            </StyledRecurrenceText>
-          </Flex>
         )}
       </Flex>
     </div>

From 2bbf3c9358031bf7cdc13332b78fad198420dde5 Mon Sep 17 00:00:00 2001
From: Tiberiu Sabau <tibssabau@yahoo.com>
Date: Tue, 3 Mar 2026 23:10:19 +0100
Subject: [PATCH 2/4] fix(web) add unit tests

---
 .../Event/Grid/GridEvent/GridEvent.test.tsx   | 151 +++++++++++++++++-
 .../Event/Grid/GridEvent/GridEvent.tsx        |   7 +-
 .../components/Grid/AllDayRow/AllDayEvent.tsx |   7 +-
 .../SomedayEventRectangle.tsx                 |  10 +-
 .../SomedayEventContainer/styled.ts           |  13 --
 5 files changed, 169 insertions(+), 19 deletions(-)

diff --git a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.test.tsx b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.test.tsx
index 3a6f1eea4..2b40682e1 100644
--- a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.test.tsx
+++ b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.test.tsx
@@ -1,5 +1,9 @@
 import { screen } from "@testing-library/react";
-import { createMockStandaloneEvent } from "@core/util/test/ccal.event.factory";
+import {
+  createMockBaseEvent,
+  createMockInstance,
+  createMockStandaloneEvent,
+} from "@core/util/test/ccal.event.factory";
 import { render } from "@web/__tests__/__mocks__/mock.render";
 import { createInitialState } from "@web/__tests__/utils/state/store.test.util";
 import { type Schema_GridEvent } from "@web/common/types/web.event.types";
@@ -234,4 +238,149 @@ describe("GridEvent", () => {
     // but here we're testing that the selector only checks event1's pending state
     expect(renderSpy).toHaveBeenCalledTimes(2); // Rerender was called, but memo should prevent actual re-render
   });
+
+  describe("repeat icon for recurring events", () => {
+    it("should render repeat icon for base recurring event with rule", () => {
+      const baseEvent = createMockBaseEvent({
+        _id: "base-event-1",
+        title: "Weekly Meeting",
+        recurrence: { rule: ["RRULE:FREQ=WEEKLY"] },
+      });
+
+      const event = createMockGridEvent(baseEvent);
+
+      const initialState = createInitialState({
+        events: {
+          pendingEvents: {
+            eventIds: [],
+          },
+        },
+      });
+
+      render(
+        <GridEventMemo
+          event={event}
+          isDraft={false}
+          isDragging={false}
+          isPlaceholder={false}
+          isResizing={false}
+          measurements={mockMeasurements}
+          onEventMouseDown={mockOnEventMouseDown}
+          onScalerMouseDown={mockOnScalerMouseDown}
+          weekProps={mockWeekProps}
+        />,
+        { state: initialState },
+      );
+
+      const icon = screen.getByTestId("repeat-icon");
+      expect(icon).toBeInTheDocument();
+      expect(screen.getByText("Weekly Meeting")).toBeInTheDocument();
+    });
+
+    it("should render repeat icon for recurring instance with eventId", () => {
+      const baseEventId = "base-123";
+      const gBaseId = "gbase-123";
+      const instance = createMockInstance(baseEventId, gBaseId, {
+        _id: "instance-1",
+        title: "Weekly Meeting Instance",
+      });
+
+      const event = createMockGridEvent(instance);
+
+      const initialState = createInitialState({
+        events: {
+          pendingEvents: {
+            eventIds: [],
+          },
+        },
+      });
+
+      render(
+        <GridEventMemo
+          event={event}
+          isDraft={false}
+          isDragging={false}
+          isPlaceholder={false}
+          isResizing={false}
+          measurements={mockMeasurements}
+          onEventMouseDown={mockOnEventMouseDown}
+          onScalerMouseDown={mockOnScalerMouseDown}
+          weekProps={mockWeekProps}
+        />,
+        { state: initialState },
+      );
+
+      const icon = screen.getByTestId("repeat-icon");
+      expect(icon).toBeInTheDocument();
+    });
+
+    it("should not render repeat icon for non-recurring event", () => {
+      const event = createMockGridEvent({
+        _id: "standalone-1",
+        title: "One-time Meeting",
+        recurrence: undefined,
+      });
+
+      const initialState = createInitialState({
+        events: {
+          pendingEvents: {
+            eventIds: [],
+          },
+        },
+      });
+
+      render(
+        <GridEventMemo
+          event={event}
+          isDraft={false}
+          isDragging={false}
+          isPlaceholder={false}
+          isResizing={false}
+          measurements={mockMeasurements}
+          onEventMouseDown={mockOnEventMouseDown}
+          onScalerMouseDown={mockOnScalerMouseDown}
+          weekProps={mockWeekProps}
+        />,
+        { state: initialState },
+      );
+
+      const icon = screen.queryByTestId("repeat-icon");
+      expect(icon).not.toBeInTheDocument();
+      expect(screen.getByText("One-time Meeting")).toBeInTheDocument();
+    });
+
+    it("should not render repeat icon when recurrence is disabled (rule is null)", () => {
+      const event = createMockGridEvent({
+        _id: "disabled-recurring-1",
+        title: "Disabled Recurring Meeting",
+        recurrence: { rule: null },
+      });
+
+      const initialState = createInitialState({
+        events: {
+          pendingEvents: {
+            eventIds: [],
+          },
+        },
+      });
+
+      render(
+        <GridEventMemo
+          event={event}
+          isDraft={false}
+          isDragging={false}
+          isPlaceholder={false}
+          isResizing={false}
+          measurements={mockMeasurements}
+          onEventMouseDown={mockOnEventMouseDown}
+          onScalerMouseDown={mockOnScalerMouseDown}
+          weekProps={mockWeekProps}
+        />,
+        { state: initialState },
+      );
+
+      const icon = screen.queryByTestId("repeat-icon");
+      expect(icon).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
index 667d107e5..598ccfa78 100644
--- a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
+++ b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
@@ -75,7 +75,11 @@ const _GridEvent = (
   const isPending = useAppSelector((state) =>
     event._id ? selectIsEventPending(state, event._id) : false,
   );
-  const isRecurring = event.recurrence && event.recurrence?.eventId !== null;
+  const rule = event.recurrence?.rule;
+  const recurrenceEventId = event.recurrence?.eventId;
+  const isRecurring =
+    (Array.isArray(rule) && rule.length > 0) ||
+    typeof recurrenceEventId === "string";
 
   const position = getEventPosition(
     event,
@@ -143,6 +147,7 @@ const _GridEvent = (
         <StyledEventTitle eventHeight={position.height} role="textbox">
           {isRecurring && (
             <RepeatIcon
+              data-testid="repeat-icon"
               size={12}
               style={{ marginRight: "4px", verticalAlign: "middle" }}
             />
diff --git a/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx b/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
index 334af8a04..ca72e32a3 100644
--- a/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
+++ b/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
@@ -54,7 +54,11 @@ const AllDayEvent = ({
   const isPending = useAppSelector((state) =>
     selectIsEventPending(state, event._id!),
   );
-  const isRecurring = event.recurrence && event.recurrence?.eventId !== null;
+  const rule = event.recurrence?.rule;
+  const recurrenceEventId = event.recurrence?.eventId;
+  const isRecurring =
+    (Array.isArray(rule) && rule.length > 0) ||
+    typeof recurrenceEventId === "string";
 
   const styledEventProps = {
     [DATA_EVENT_ELEMENT_ID]: event._id,
@@ -99,6 +103,7 @@ const AllDayEvent = ({
         <Text size="m" role="textbox">
           {isRecurring && (
             <RepeatIcon
+              data-testid="repeat-icon"
               size={12}
               style={{ marginRight: "4px", verticalAlign: "middle" }}
             />
diff --git a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
index 1e4ff54fd..2df3244b6 100644
--- a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
+++ b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
@@ -25,9 +25,12 @@ export const SomedayEventRectangle = ({
   onMigrate,
 }: Props) => {
   const target = category === Categories_Event.SOMEDAY_WEEK ? "week" : "month";
-  const canMigrate =
-    !event.recurrence?.rule || event.recurrence?.rule.length === 0;
-  const isRecurring = !canMigrate;
+  const rule = event.recurrence?.rule;
+  const recurrenceEventId = event.recurrence?.eventId;
+  const isRecurring =
+    (Array.isArray(rule) && rule.length > 0) ||
+    typeof recurrenceEventId === "string";
+  const canMigrate = !isRecurring;
 
   return (
     <div ref={formProps.refs.setReference} {...formProps.getReferenceProps()}>
@@ -39,6 +42,7 @@ export const SomedayEventRectangle = ({
         <Text size="l">
           {isRecurring && (
             <RepeatIcon
+              data-testid="repeat-icon"
               size={14}
               style={{ marginRight: "4px", verticalAlign: "middle" }}
             />
diff --git a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/styled.ts b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/styled.ts
index a363f106f..5fe82f277 100644
--- a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/styled.ts
+++ b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/styled.ts
@@ -18,16 +18,3 @@ export const StyledMigrateArrow = styled.span`
 export const StyledMigrateArrowInForm = styled(StyledMigrateArrow)`
   font-size: 27px;
 `;
-export const StyledRecurrenceText = styled.span`
-  border: 1px solid ${({ theme }) => theme.color.border.primary};
-  border-radius: 2px;
-  font-size: 10px;
-  opacity: 0;
-  transition: opacity 0.2s;
-  width: 43px;
-
-  &:hover {
-    opacity: 1;
-    transition: border ease-in 0.2s;
-  }
-`;

From 741f07fb2fa776af9040fb4d379a02d2acc3e06f Mon Sep 17 00:00:00 2001
From: Tiberiu Sabau <tibssabau@yahoo.com>
Date: Thu, 5 Mar 2026 11:55:20 +0100
Subject: [PATCH 3/4] fix: re-add warning for recurring events

---
 .../Event/Grid/GridEvent/GridEvent.tsx        |  1 +
 .../components/Grid/AllDayRow/AllDayEvent.tsx |  1 +
 .../SomedayEventRectangle.tsx                 | 23 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
index 598ccfa78..e3aabc8b4 100644
--- a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
+++ b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
@@ -147,6 +147,7 @@ const _GridEvent = (
         <StyledEventTitle eventHeight={position.height} role="textbox">
           {isRecurring && (
             <RepeatIcon
+              aria-hidden="true"
               data-testid="repeat-icon"
               size={12}
               style={{ marginRight: "4px", verticalAlign: "middle" }}
diff --git a/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx b/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
index ca72e32a3..a0f758055 100644
--- a/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
+++ b/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
@@ -103,6 +103,7 @@ const AllDayEvent = ({
         <Text size="m" role="textbox">
           {isRecurring && (
             <RepeatIcon
+              aria-hidden="true"
               data-testid="repeat-icon"
               size={12}
               style={{ marginRight: "4px", verticalAlign: "middle" }}
diff --git a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
index 2df3244b6..1ea011452 100644
--- a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
+++ b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
@@ -42,6 +42,7 @@ export const SomedayEventRectangle = ({
         <Text size="l">
           {isRecurring && (
             <RepeatIcon
+              aria-hidden="true"
               data-testid="repeat-icon"
               size={14}
               style={{ marginRight: "4px", verticalAlign: "middle" }}
@@ -50,7 +51,7 @@ export const SomedayEventRectangle = ({
           {event.title}
         </Text>
 
-        {canMigrate && (
+        {canMigrate ? (
           <Flex>
             <StyledMigrateArrow
               onClick={(e) => {
@@ -73,6 +74,26 @@ export const SomedayEventRectangle = ({
               {">"}
             </StyledMigrateArrow>
           </Flex>
+        ) : (
+          <Flex>
+            <span
+              onClick={(e) => {
+                e.stopPropagation();
+                alert("Can't migrate recurring events");
+              }}
+              style={{
+                border: "1px solid transparent",
+                borderRadius: "2px",
+                fontSize: "10px",
+                opacity: 0.5,
+                cursor: "not-allowed",
+                padding: "2px 4px",
+              }}
+              title="Can't migrate recurring events"
+            >
+              ☝️
+            </span>
+          </Flex>
         )}
       </Flex>
     </div>

From 62cddb28c99b10e9c11995c05722111d5b16096b Mon Sep 17 00:00:00 2001
From: Tiberiu Sabau <tibssabau@yahoo.com>
Date: Thu, 5 Mar 2026 12:40:12 +0100
Subject: [PATCH 4/4] fix: simplify logic and improve test coverage

---
 .../Event/Grid/GridEvent/GridEvent.test.tsx   |   8 +-
 .../Event/Grid/GridEvent/GridEvent.tsx        |   6 +-
 .../Grid/AllDayRow/AllDayEvent.test.tsx       | 193 ++++++++++++++++++
 .../components/Grid/AllDayRow/AllDayEvent.tsx |   6 +-
 .../SomedayEventRectangle.test.tsx            | 170 +++++++++++++++
 .../SomedayEventRectangle.tsx                 |  20 +-
 .../SomedayEventContainer/styled.ts           |  14 ++
 7 files changed, 390 insertions(+), 27 deletions(-)
 create mode 100644 packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.test.tsx
 create mode 100644 packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.test.tsx

diff --git a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.test.tsx b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.test.tsx
index 2b40682e1..187cee94f 100644
--- a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.test.tsx
+++ b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.test.tsx
@@ -272,7 +272,7 @@ describe("GridEvent", () => {
         { state: initialState },
       );
 
-      const icon = screen.getByTestId("repeat-icon");
+      const icon = screen.getByLabelText("Recurring event");
       expect(icon).toBeInTheDocument();
       expect(screen.getByText("Weekly Meeting")).toBeInTheDocument();
     });
@@ -310,7 +310,7 @@ describe("GridEvent", () => {
         { state: initialState },
       );
 
-      const icon = screen.getByTestId("repeat-icon");
+      const icon = screen.getByLabelText("Recurring event");
       expect(icon).toBeInTheDocument();
     });
 
@@ -344,7 +344,7 @@ describe("GridEvent", () => {
         { state: initialState },
       );
 
-      const icon = screen.queryByTestId("repeat-icon");
+      const icon = screen.queryByLabelText("Recurring event");
       expect(icon).not.toBeInTheDocument();
       expect(screen.getByText("One-time Meeting")).toBeInTheDocument();
     });
@@ -379,7 +379,7 @@ describe("GridEvent", () => {
         { state: initialState },
       );
 
-      const icon = screen.queryByTestId("repeat-icon");
+      const icon = screen.queryByLabelText("Recurring event");
       expect(icon).not.toBeInTheDocument();
     });
   });
diff --git a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
index e3aabc8b4..0d98f791e 100644
--- a/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
+++ b/packages/web/src/views/Calendar/components/Event/Grid/GridEvent/GridEvent.tsx
@@ -78,8 +78,7 @@ const _GridEvent = (
   const rule = event.recurrence?.rule;
   const recurrenceEventId = event.recurrence?.eventId;
   const isRecurring =
-    (Array.isArray(rule) && rule.length > 0) ||
-    typeof recurrenceEventId === "string";
+    Array.isArray(rule) || typeof recurrenceEventId === "string";
 
   const position = getEventPosition(
     event,
@@ -147,8 +146,7 @@ const _GridEvent = (
         <StyledEventTitle eventHeight={position.height} role="textbox">
           {isRecurring && (
             <RepeatIcon
-              aria-hidden="true"
-              data-testid="repeat-icon"
+              aria-label="Recurring event"
               size={12}
               style={{ marginRight: "4px", verticalAlign: "middle" }}
             />
diff --git a/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.test.tsx b/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.test.tsx
new file mode 100644
index 000000000..c2a7ca3a3
--- /dev/null
+++ b/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.test.tsx
@@ -0,0 +1,193 @@
+import { screen } from "@testing-library/react";
+import {
+  createMockBaseEvent,
+  createMockInstance,
+  createMockStandaloneEvent,
+} from "@core/util/test/ccal.event.factory";
+import { render } from "@web/__tests__/__mocks__/mock.render";
+import { createInitialState } from "@web/__tests__/utils/state/store.test.util";
+import { type Schema_GridEvent } from "@web/common/types/web.event.types";
+import { gridEventDefaultPosition } from "@web/common/utils/event/event.util";
+import { type Measurements_Grid } from "@web/views/Calendar/hooks/grid/useGridLayout";
+import { AllDayEventMemo } from "./AllDayEvent";
+
+const createMockGridEvent = (
+  overrides: Partial<Schema_GridEvent> = {},
+): Schema_GridEvent => {
+  const standaloneEvent = createMockStandaloneEvent();
+  return {
+    ...standaloneEvent,
+    position: gridEventDefaultPosition,
+    isAllDay: true,
+    ...overrides,
+  } as Schema_GridEvent;
+};
+
+const mockMeasurements: Measurements_Grid = {
+  mainGrid: {
+    top: 0,
+    left: 0,
+    height: 1000,
+    width: 1000,
+    x: 0,
+    y: 0,
+    bottom: 1000,
+    right: 1000,
+    toJSON: () => ({}),
+  },
+  hourHeight: 60,
+  colWidths: Array(7).fill(100),
+  allDayRow: null,
+  remeasure: jest.fn(),
+};
+
+const mockOnMouseDown = jest.fn();
+const mockOnScalerMouseDown = jest.fn();
+
+describe("AllDayEvent - Repeat Icon", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe("recurring event rendering", () => {
+    it("should render repeat icon for base recurring event with rule", () => {
+      const baseEvent = createMockBaseEvent({
+        _id: "base-123",
+        title: "Weekly Team Standup",
+      });
+
+      const event = createMockGridEvent(baseEvent);
+
+      const initialState = createInitialState({
+        events: {
+          pendingEvents: {
+            eventIds: [],
+          },
+        },
+      });
+
+      render(
+        <AllDayEventMemo
+          endOfView="2024-01-21T23:59:59Z"
+          event={event}
+          isPlaceholder={false}
+          measurements={mockMeasurements}
+          onMouseDown={mockOnMouseDown}
+          onScalerMouseDown={mockOnScalerMouseDown}
+          startOfView="2024-01-15T00:00:00Z"
+        />,
+        { state: initialState },
+      );
+
+      const icon = screen.getByLabelText("Recurring event");
+      expect(icon).toBeInTheDocument();
+      expect(screen.getByText("Weekly Team Standup")).toBeInTheDocument();
+    });
+
+    it("should render repeat icon for recurring instance with eventId", () => {
+      const baseEventId = "base-456";
+      const gBaseId = "gbase-456";
+      const instance = createMockInstance(baseEventId, gBaseId, {
+        _id: "instance-1",
+        title: "Weekly Team Standup Instance",
+        isAllDay: true,
+      });
+
+      const event = createMockGridEvent(instance);
+
+      const initialState = createInitialState({
+        events: {
+          pendingEvents: {
+            eventIds: [],
+          },
+        },
+      });
+
+      render(
+        <AllDayEventMemo
+          endOfView="2024-01-21T23:59:59Z"
+          event={event}
+          isPlaceholder={false}
+          measurements={mockMeasurements}
+          onMouseDown={mockOnMouseDown}
+          onScalerMouseDown={mockOnScalerMouseDown}
+          startOfView="2024-01-15T00:00:00Z"
+        />,
+        { state: initialState },
+      );
+
+      const icon = screen.getByLabelText("Recurring event");
+      expect(icon).toBeInTheDocument();
+    });
+
+    it("should not render repeat icon for non-recurring all-day event", () => {
+      const event = createMockGridEvent({
+        _id: "standalone-1",
+        title: "Company Holiday",
+        recurrence: undefined,
+      });
+
+      const initialState = createInitialState({
+        events: {
+          pendingEvents: {
+            eventIds: [],
+          },
+        },
+      });
+
+      render(
+        <AllDayEventMemo
+          endOfView="2024-01-21T23:59:59Z"
+          event={event}
+          isPlaceholder={false}
+          measurements={mockMeasurements}
+          onMouseDown={mockOnMouseDown}
+          onScalerMouseDown={mockOnScalerMouseDown}
+          startOfView="2024-01-15T00:00:00Z"
+        />,
+        { state: initialState },
+      );
+
+      expect(
+        screen.queryByLabelText("Recurring event"),
+      ).not.toBeInTheDocument();
+      expect(screen.getByText("Company Holiday")).toBeInTheDocument();
+    });
+
+    it("should not render repeat icon when recurrence is explicitly disabled", () => {
+      const event = createMockGridEvent({
+        _id: "standalone-2",
+        title: "One-time Event",
+        recurrence: {
+          rule: null,
+          eventId: undefined,
+        },
+      });
+
+      const initialState = createInitialState({
+        events: {
+          pendingEvents: {
+            eventIds: [],
+          },
+        },
+      });
+
+      render(
+        <AllDayEventMemo
+          endOfView="2024-01-21T23:59:59Z"
+          event={event}
+          isPlaceholder={false}
+          measurements={mockMeasurements}
+          onMouseDown={mockOnMouseDown}
+          onScalerMouseDown={mockOnScalerMouseDown}
+          startOfView="2024-01-15T00:00:00Z"
+        />,
+        { state: initialState },
+      );
+
+      expect(
+        screen.queryByLabelText("Recurring event"),
+      ).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx b/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
index a0f758055..00fe692f4 100644
--- a/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
+++ b/packages/web/src/views/Calendar/components/Grid/AllDayRow/AllDayEvent.tsx
@@ -57,8 +57,7 @@ const AllDayEvent = ({
   const rule = event.recurrence?.rule;
   const recurrenceEventId = event.recurrence?.eventId;
   const isRecurring =
-    (Array.isArray(rule) && rule.length > 0) ||
-    typeof recurrenceEventId === "string";
+    Array.isArray(rule) || typeof recurrenceEventId === "string";
 
   const styledEventProps = {
     [DATA_EVENT_ELEMENT_ID]: event._id,
@@ -103,8 +102,7 @@ const AllDayEvent = ({
         <Text size="m" role="textbox">
           {isRecurring && (
             <RepeatIcon
-              aria-hidden="true"
-              data-testid="repeat-icon"
+              aria-label="Recurring event"
               size={12}
               style={{ marginRight: "4px", verticalAlign: "middle" }}
             />
diff --git a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.test.tsx b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.test.tsx
new file mode 100644
index 000000000..622352870
--- /dev/null
+++ b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.test.tsx
@@ -0,0 +1,170 @@
+import "@testing-library/jest-dom";
+import { screen } from "@testing-library/react";
+import { Categories_Event, type Schema_Event } from "@core/types/event.types";
+import {
+  createMockBaseEvent,
+  createMockInstance,
+  createMockStandaloneEvent,
+} from "@core/util/test/ccal.event.factory";
+import { render } from "@web/__tests__/__mocks__/mock.render";
+import { type Props_DraftForm } from "@web/views/Calendar/components/Draft/context/DraftContext";
+import { SomedayEventRectangle } from "./SomedayEventRectangle";
+
+const mockFormProps: Props_DraftForm = {
+  context: {} as any,
+  refs: {
+    setFloating: jest.fn(),
+    setReference: jest.fn(),
+  },
+  strategy: "absolute" as const,
+  x: 0,
+  y: 0,
+  getReferenceProps: () => ({}),
+  getFloatingProps: () => ({}),
+} as any;
+
+const mockOnMigrate = jest.fn();
+
+describe("SomedayEventRectangle - Repeat Icon", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe("recurring event rendering", () => {
+    it("should render repeat icon for base recurring event with rule", () => {
+      const baseEvent = createMockBaseEvent({
+        _id: "base-789",
+        title: "Weekly Review",
+      }) as Schema_Event;
+
+      render(
+        <SomedayEventRectangle
+          category={Categories_Event.SOMEDAY_WEEK}
+          event={baseEvent}
+          formProps={mockFormProps}
+          onMigrate={mockOnMigrate}
+        />,
+      );
+
+      const icon = screen.getByLabelText("Recurring event");
+      expect(icon).toBeInTheDocument();
+      expect(screen.getByText("Weekly Review")).toBeInTheDocument();
+    });
+
+    it("should render repeat icon for recurring instance with eventId", () => {
+      const baseEventId = "base-101";
+      const gBaseId = "gbase-101";
+      const instance = createMockInstance(baseEventId, gBaseId, {
+        _id: "instance-2",
+        title: "Weekly Review Instance",
+      }) as Schema_Event;
+
+      render(
+        <SomedayEventRectangle
+          category={Categories_Event.SOMEDAY_MONTH}
+          event={instance}
+          formProps={mockFormProps}
+          onMigrate={mockOnMigrate}
+        />,
+      );
+
+      const icon = screen.getByLabelText("Recurring event");
+      expect(icon).toBeInTheDocument();
+      expect(screen.getByText("Weekly Review Instance")).toBeInTheDocument();
+    });
+
+    it("should not render repeat icon for non-recurring someday event", () => {
+      const event = createMockStandaloneEvent({
+        _id: "standalone-3",
+        title: "Read Book",
+        recurrence: undefined,
+      }) as Schema_Event;
+
+      render(
+        <SomedayEventRectangle
+          category={Categories_Event.SOMEDAY_WEEK}
+          event={event}
+          formProps={mockFormProps}
+          onMigrate={mockOnMigrate}
+        />,
+      );
+
+      expect(
+        screen.queryByLabelText("Recurring event"),
+      ).not.toBeInTheDocument();
+      expect(screen.getByText("Read Book")).toBeInTheDocument();
+    });
+
+    it("should not render repeat icon when recurrence is explicitly disabled", () => {
+      const event = createMockStandaloneEvent({
+        _id: "standalone-4",
+        title: "One-time Task",
+        recurrence: {
+          rule: null,
+          eventId: undefined,
+        },
+      }) as Schema_Event;
+
+      render(
+        <SomedayEventRectangle
+          category={Categories_Event.SOMEDAY_MONTH}
+          event={event}
+          formProps={mockFormProps}
+          onMigrate={mockOnMigrate}
+        />,
+      );
+
+      expect(
+        screen.queryByLabelText("Recurring event"),
+      ).not.toBeInTheDocument();
+      expect(screen.getByText("One-time Task")).toBeInTheDocument();
+    });
+  });
+
+  describe("migration controls", () => {
+    it("should show migration arrows for non-recurring events", () => {
+      const event = createMockStandaloneEvent({
+        _id: "standalone-5",
+        title: "Regular Task",
+        recurrence: undefined,
+      }) as Schema_Event;
+
+      render(
+        <SomedayEventRectangle
+          category={Categories_Event.SOMEDAY_WEEK}
+          event={event}
+          formProps={mockFormProps}
+          onMigrate={mockOnMigrate}
+        />,
+      );
+
+      const arrows = screen.getAllByRole("button");
+      expect(arrows).toHaveLength(2);
+      expect(arrows[0]).toHaveTextContent("<");
+      expect(arrows[1]).toHaveTextContent(">");
+    });
+
+    it("should show warning indicator for recurring events", () => {
+      const baseEvent = createMockBaseEvent({
+        _id: "base-202",
+        title: "Recurring Task",
+      }) as Schema_Event;
+
+      render(
+        <SomedayEventRectangle
+          category={Categories_Event.SOMEDAY_WEEK}
+          event={baseEvent}
+          formProps={mockFormProps}
+          onMigrate={mockOnMigrate}
+        />,
+      );
+
+      const warning = screen.getByText("☝️");
+      expect(warning).toBeInTheDocument();
+      expect(warning).toHaveAttribute(
+        "title",
+        "Can't migrate recurring events",
+      );
+    });
+  });
+});
diff --git a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
index 1ea011452..054ad94c3 100644
--- a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
+++ b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/SomedayEventRectangle.tsx
@@ -9,7 +9,7 @@ import { RepeatIcon } from "@web/components/Icons/Repeat";
 import { Text } from "@web/components/Text";
 import { type Props_DraftForm } from "@web/views/Calendar/components/Draft/context/DraftContext";
 import { type Actions_Sidebar } from "@web/views/Calendar/components/Draft/sidebar/hooks/useSidebarActions";
-import { StyledMigrateArrow } from "./styled";
+import { StyledMigrateArrow, StyledRecurringWarning } from "./styled";
 
 interface Props {
   category: Categories_Event;
@@ -28,8 +28,7 @@ export const SomedayEventRectangle = ({
   const rule = event.recurrence?.rule;
   const recurrenceEventId = event.recurrence?.eventId;
   const isRecurring =
-    (Array.isArray(rule) && rule.length > 0) ||
-    typeof recurrenceEventId === "string";
+    Array.isArray(rule) || typeof recurrenceEventId === "string";
   const canMigrate = !isRecurring;
 
   return (
@@ -42,8 +41,7 @@ export const SomedayEventRectangle = ({
         <Text size="l">
           {isRecurring && (
             <RepeatIcon
-              aria-hidden="true"
-              data-testid="repeat-icon"
+              aria-label="Recurring event"
               size={14}
               style={{ marginRight: "4px", verticalAlign: "middle" }}
             />
@@ -76,23 +74,15 @@ export const SomedayEventRectangle = ({
           </Flex>
         ) : (
           <Flex>
-            <span
+            <StyledRecurringWarning
               onClick={(e) => {
                 e.stopPropagation();
                 alert("Can't migrate recurring events");
               }}
-              style={{
-                border: "1px solid transparent",
-                borderRadius: "2px",
-                fontSize: "10px",
-                opacity: 0.5,
-                cursor: "not-allowed",
-                padding: "2px 4px",
-              }}
               title="Can't migrate recurring events"
             >
               ☝️
-            </span>
+            </StyledRecurringWarning>
           </Flex>
         )}
       </Flex>
diff --git a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/styled.ts b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/styled.ts
index 5fe82f277..2762b5634 100644
--- a/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/styled.ts
+++ b/packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventContainer/styled.ts
@@ -18,3 +18,17 @@ export const StyledMigrateArrow = styled.span`
 export const StyledMigrateArrowInForm = styled(StyledMigrateArrow)`
   font-size: 27px;
 `;
+
+export const StyledRecurringWarning = styled.span`
+  border: 1px solid transparent;
+  border-radius: 2px;
+  cursor: not-allowed;
+  font-size: 10px;
+  opacity: 0.5;
+  padding: 2px 4px;
+
+  &:hover {
+    opacity: 0.7;
+    transition: opacity 0.2s;
+  }
+`;