@agent-native/core 0.98.7 → 0.98.9

package/corpus/templates/calendar/app/components/calendar/EventDetailPopover.tsx

@@ -47,6 +47,7 @@ import {
 } from "@/components/calendar/EventOptionControls";
 import { FindTimeTakeover } from "@/components/calendar/FindTimePanel";
 import { useGuestNotificationPrompt } from "@/components/calendar/GuestNotificationDialog";
+import { WorkingLocationEditor } from "@/components/calendar/WorkingLocationEditor";
 import { useCalendarContext } from "@/components/layout/AppLayout";
 import { TimezoneCombobox } from "@/components/TimezoneCombobox";
 import { Button } from "@/components/ui/button";
@@ -89,7 +90,9 @@ import {
   getEventEndValidationMessage,
   getLocalTimezone,
   getRecurrencePreset,
+  normalizeAllDayEditEndDate,
   remindersToDraftState,
+  resolveTimeEditScope,
   type AttachmentDraft,
   type RecurrencePreset,
   type ReminderDraft,
@@ -102,6 +105,13 @@ import {
   setEventDetailPopoverOpen,
 } from "@/lib/popover-click-guard";
 import { shortcutModifierLabel } from "@/lib/utils";
+import {
+  buildWorkingLocationUpdate,
+  createWorkingLocationDisplayLabels,
+  getWorkingLocationTitle,
+  isWorkingLocationEvent,
+  type WorkingLocationSelection,
+} from "@/lib/working-location";
 
 const ZOOM_AFTER_CONNECT_EVENT_ID_KEY = "calendar.zoomAfterConnectEventId";
 const ZOOM_AFTER_CONNECT_MAX_AGE_MS = 10 * 60 * 1000;
@@ -299,6 +309,8 @@ type EventUpdatePatch = Partial<CalendarEvent> & {
   addZoom?: boolean;
   addAttendees?: CalendarEvent["attendees"];
   scope?: UpdateEventScope;
+  workingLocationType?: "homeOffice" | "officeLocation" | "customLocation";
+  workingLocationLabel?: string;
 };
 
 function mergeAttendeesForPrompt(
@@ -495,6 +507,7 @@ export function EventDetailPopover({
   onDraftDiscard,
 }: EventDetailPopoverProps) {
   const t = useT();
+  const workingLocationLabels = createWorkingLocationDisplayLabels(t);
   const isMobile = useIsMobile();
   const [open, setOpen] = useState(defaultOpen);
   const [editingTitle, setEditingTitle] = useState(
@@ -513,6 +526,9 @@ export function EventDetailPopover({
     setSidebarEvent,
     setFocusedEvent,
   } = useCalendarContext();
+  const isWorkingLocation = isWorkingLocationEvent(event);
+  const isSingleDayWorkingLocation = isWorkingLocation && event.allDay;
+  const editableLocationValue = event.location || "";
 
   // Inline editing state
   const [editingField, setEditingField] = useState<string | null>(null);
@@ -520,7 +536,7 @@ export function EventDetailPopover({
   const [editDescription, setEditDescription] = useState(
     event.description || "",
   );
-  const [editLocation, setEditLocation] = useState(event.location || "");
+  const [editLocation, setEditLocation] = useState(editableLocationValue);
   const [editDate, setEditDate] = useState(() => toDateInputValue(event.start));
   const [editEndDate, setEditEndDate] = useState(() =>
     event.allDay
@@ -588,7 +604,7 @@ export function EventDetailPopover({
   useEffect(() => {
     if (editingField !== "description")
       setEditDescription(event.description || "");
-    if (editingField !== "location") setEditLocation(event.location || "");
+    if (editingField !== "location") setEditLocation(editableLocationValue);
     if (editingField !== "time") {
       setEditDate(toDateInputValue(event.start));
       setEditEndDate(
@@ -618,6 +634,7 @@ export function EventDetailPopover({
     event.id,
     event.description,
     event.location,
+    event.workingLocationProperties,
     event.start,
     event.end,
     event.allDay,
@@ -625,6 +642,7 @@ export function EventDetailPopover({
     event.reminders,
     event.remindersUseDefault,
     event.attachments,
+    editableLocationValue,
   ]);
 
   useEffect(() => {
@@ -673,7 +691,6 @@ export function EventDetailPopover({
       ? event.visibility
       : "default";
   const reminderValue = getReminderValue(event);
-
   // Save a field update
   const saveField = useCallback(
     (updates: EventUpdatePatch) => {
@@ -958,13 +975,14 @@ export function EventDetailPopover({
     const locationContainsMeetingLink =
       !!meetingLink && event.location?.includes(meetingLink.url);
     if (locationContainsMeetingLink && !trimmed) {
-      setEditLocation(event.location || "");
+      setEditLocation(editableLocationValue);
       setEditingField(null);
       return false;
     }
     let saved = false;
-    if (trimmed !== (event.location || "").trim()) {
-      const updates: Partial<CalendarEvent> = { location: trimmed };
+    const currentValue = (event.location || "").trim();
+    if (trimmed !== currentValue.trim()) {
+      const updates: EventUpdatePatch = { location: trimmed };
       if (
         locationContainsMeetingLink &&
         meetingLink &&
@@ -982,10 +1000,38 @@ export function EventDetailPopover({
     }
     setEditingField(null);
     return saved;
-  }, [editLocation, event.description, event.location, meetingLink, saveField]);
+  }, [
+    editLocation,
+    editableLocationValue,
+    event.description,
+    event.location,
+    meetingLink,
+    saveField,
+    t,
+  ]);
+
+  const handleSaveWorkingLocation = useCallback(
+    (selection: WorkingLocationSelection) => {
+      const update = buildWorkingLocationUpdate(event, selection);
+      if (isDraft) {
+        const { id: _id, scope: _scope, ...draftUpdate } = update;
+        onDraftUpdate?.(event.id, draftUpdate);
+        return;
+      }
+      updateEvent.mutate(update, {
+        onError: () => toast.error(t("calendarView.failedUpdateEvent")),
+      });
+    },
+    [event, isDraft, onDraftUpdate, t, updateEvent],
+  );
 
   const handleSaveTime = useCallback(() => {
-    const allDayEnd = new Date(`${editEndDate}T00:00:00`);
+    const normalizedEndDate = normalizeAllDayEditEndDate(
+      isSingleDayWorkingLocation,
+      editDate,
+      editEndDate,
+    );
+    const allDayEnd = new Date(`${normalizedEndDate}T00:00:00`);
     allDayEnd.setDate(allDayEnd.getDate() + 1);
     const newStart = event.allDay
       ? new Date(`${editDate}T00:00:00`).toISOString()
@@ -1013,7 +1059,11 @@ export function EventDetailPopover({
         allDay: event.allDay,
         startTimeZone: event.allDay ? undefined : editTimezone,
         endTimeZone: event.allDay ? undefined : editTimezone,
-        scope: isRecurringEvent ? editTimeScope : "single",
+        scope: resolveTimeEditScope(
+          isRecurringEvent,
+          isSingleDayWorkingLocation,
+          editTimeScope,
+        ),
       });
     }
     setEditTimeScope("single");
@@ -1028,6 +1078,7 @@ export function EventDetailPopover({
     event.start,
     event.end,
     event.allDay,
+    isSingleDayWorkingLocation,
     isRecurringEvent,
     editTimeScope,
     saveField,
@@ -1346,7 +1397,11 @@ export function EventDetailPopover({
           <div className="flex items-center justify-between px-4 py-2.5 border-b border-border">
             <div className="text-[11px] font-medium uppercase tracking-wider text-muted-foreground">
               <span>
-                {isDraft ? t("eventForm.draftEvent") : t("eventForm.event")}
+                {isWorkingLocation
+                  ? t("eventForm.workingLocation")
+                  : isDraft
+                    ? t("eventForm.draftEvent")
+                    : t("eventForm.event")}
               </span>
             </div>
             <div className="flex items-center gap-0.5">
@@ -1382,7 +1437,7 @@ export function EventDetailPopover({
           <div className="flex-1 overflow-y-auto">
             <div className="px-4 pt-4 pb-1">
               {/* Title — always editable */}
-              {isEditingTitle ? (
+              {isEditingTitle && !isWorkingLocation ? (
                 <input
                   ref={titleInputRef}
                   value={editingTitle}
@@ -1432,14 +1487,14 @@ export function EventDetailPopover({
                 />
               ) : (
                 <h2
-                  className="text-lg font-semibold text-foreground leading-tight mb-4 cursor-text rounded px-0.5 -mx-0.5 hover:bg-muted/50"
+                  className={`mb-4 -mx-0.5 rounded px-0.5 text-lg font-semibold leading-tight text-foreground ${!isOverlay && !isWorkingLocation ? "cursor-text hover:bg-muted/50" : ""}`}
                   onClick={() => {
-                    if (isOverlay) return;
+                    if (isOverlay || isWorkingLocation) return;
                     setEditingTitle(event.title);
                     setIsEditingTitle(true);
                   }}
                 >
-                  {event.title}
+                  {getWorkingLocationTitle(event, workingLocationLabels)}
                 </h2>
               )}
             </div>
@@ -1459,7 +1514,13 @@ export function EventDetailPopover({
                 <div className="flex items-start gap-3 py-1.5">
                   <IconClock className="mt-2 h-4 w-4 shrink-0 text-muted-foreground" />
                   <div className="flex-1 space-y-2">
-                    <div className="grid grid-cols-2 gap-2">
+                    <div
+                      className={`grid gap-2 ${
+                        isSingleDayWorkingLocation
+                          ? "grid-cols-1"
+                          : "grid-cols-2"
+                      }`}
+                    >
                       <input
                         type="date"
                         value={editDate}
@@ -1467,40 +1528,49 @@ export function EventDetailPopover({
                           const next = e.target.value;
                           setEditDate(next);
                           setEditEndDate((current) =>
-                            current < next ? next : current,
+                            // i18n-ignore -- this expression selects a date; it is not visible copy.
+                            isSingleDayWorkingLocation
+                              ? next
+                              : current < next
+                                ? next
+                                : current,
                           );
                         }}
                         className="w-full rounded-md border border-border bg-transparent px-2 py-1 text-sm text-foreground"
                         aria-label={t("eventForm.startDate")}
                       />
-                      <input
-                        type="date"
-                        min={editDate}
-                        value={editEndDate}
-                        onChange={(e) =>
-                          setEditEndDate(e.target.value || editDate)
-                        }
-                        className="w-full rounded-md border border-border bg-transparent px-2 py-1 text-sm text-foreground"
-                        aria-label={t("eventForm.endDate")}
-                      />
-                    </div>
-                    <div className="flex items-center gap-2">
-                      <input
-                        type="time"
-                        value={editStartTime}
-                        onChange={(e) => setEditStartTime(e.target.value)}
-                        className="flex-1 rounded-md border border-border bg-transparent px-2 py-1 text-sm text-foreground"
-                      />
-                      <span className="text-muted-foreground/50 text-xs">
-                        &rarr;
-                      </span>
-                      <input
-                        type="time"
-                        value={editEndTime}
-                        onChange={(e) => setEditEndTime(e.target.value)}
-                        className="flex-1 rounded-md border border-border bg-transparent px-2 py-1 text-sm text-foreground"
-                      />
+                      {!isSingleDayWorkingLocation && (
+                        <input
+                          type="date"
+                          min={editDate}
+                          value={editEndDate}
+                          onChange={(e) =>
+                            setEditEndDate(e.target.value || editDate)
+                          }
+                          className="w-full rounded-md border border-border bg-transparent px-2 py-1 text-sm text-foreground"
+                          aria-label={t("eventForm.endDate")}
+                        />
+                      )}
                     </div>
+                    {!event.allDay && (
+                      <div className="flex items-center gap-2">
+                        <input
+                          type="time"
+                          value={editStartTime}
+                          onChange={(e) => setEditStartTime(e.target.value)}
+                          className="flex-1 rounded-md border border-border bg-transparent px-2 py-1 text-sm text-foreground"
+                        />
+                        <span className="text-muted-foreground/50 text-xs">
+                          &rarr;
+                        </span>
+                        <input
+                          type="time"
+                          value={editEndTime}
+                          onChange={(e) => setEditEndTime(e.target.value)}
+                          className="flex-1 rounded-md border border-border bg-transparent px-2 py-1 text-sm text-foreground"
+                        />
+                      </div>
+                    )}
                     {!event.allDay && (
                       <TimezoneCombobox
                         id={`event-timezone-${event.id}`}
@@ -1508,31 +1578,37 @@ export function EventDetailPopover({
                         onChange={setEditTimezone}
                       />
                     )}
-                    {isRecurringEvent && !isDraft && (
-                      <div className="flex items-center gap-2">
-                        <span className="text-xs text-muted-foreground">
-                          {t("eventForm.applyTo")}
-                        </span>
-                        <Select
-                          value={editTimeScope}
-                          onValueChange={(value) =>
-                            setEditTimeScope(value as UpdateEventScope)
-                          }
-                        >
-                          <SelectTrigger className="h-7 flex-1 text-xs">
-                            <SelectValue />
-                          </SelectTrigger>
-                          <SelectContent>
-                            <SelectItem value="single">
-                              {t("eventForm.thisEvent")}
-                            </SelectItem>
-                            <SelectItem value="all">
-                              {t("eventForm.allEvents")}
-                            </SelectItem>
-                          </SelectContent>
-                        </Select>
-                      </div>
-                    )}
+                    {isRecurringEvent &&
+                      !isDraft &&
+                      !isSingleDayWorkingLocation && (
+                        <div className="flex items-center gap-2">
+                          <span className="text-xs text-muted-foreground">
+                            {t("eventForm.applyTo")}
+                          </span>
+                          <Select
+                            value={editTimeScope}
+                            onValueChange={(value) =>
+                              setEditTimeScope(value as UpdateEventScope)
+                            }
+                          >
+                            <SelectTrigger className="h-7 flex-1 text-xs">
+                              <SelectValue />
+                            </SelectTrigger>
+                            <SelectContent>
+                              <SelectItem value="single">
+                                {isWorkingLocation
+                                  ? t("eventForm.thisDayOnly")
+                                  : t("eventForm.thisEvent")}
+                              </SelectItem>
+                              <SelectItem value="all">
+                                {isWorkingLocation
+                                  ? t("eventForm.allDays")
+                                  : t("eventForm.allEvents")}
+                              </SelectItem>
+                            </SelectContent>
+                          </Select>
+                        </div>
+                      )}
                     <div className="flex justify-end gap-1.5">
                       <Button
                         variant="ghost"
@@ -1614,7 +1690,7 @@ export function EventDetailPopover({
                 </div>
               )}
 
-              {!event.allDay && !isOverlay && (
+              {!event.allDay && !isOverlay && !isWorkingLocation && (
                 <div className="flex items-center gap-3 py-1">
                   <div className="h-4 w-4 shrink-0" />
                   <Button
@@ -1630,7 +1706,7 @@ export function EventDetailPopover({
                 </div>
               )}
 
-              {!event.allDay && !isOverlay && (
+              {!event.allDay && !isOverlay && !isWorkingLocation && (
                 <FindTimeTakeover
                   open={findTimeOpen}
                   onOpenChange={setFindTimeOpen}
@@ -1742,222 +1818,237 @@ export function EventDetailPopover({
                   )}
                 </button>
               ) : null}
+
+              {isWorkingLocation && (
+                <WorkingLocationEditor
+                  event={event}
+                  isRecurring={isRecurringEvent}
+                  readOnly={isOverlay}
+                  disabled={updateEvent.isPending}
+                  onSave={handleSaveWorkingLocation}
+                />
+              )}
             </div>
 
-            {/* Separator */}
-            <div className="mx-4 my-2 border-t border-border/50" />
-
-            {/* Attendees — always shown */}
-            {event.attendees && event.attendees.length > 0 ? (
-              <EventAttendeesSection
-                event={event}
-                canEditOptional={!isOverlay}
-                onToggleOptional={handleToggleAttendeeOptional}
-              />
-            ) : !isOverlay ? (
-              <div className="px-4 py-1">
-                <div className="flex items-start gap-3">
-                  <IconUser className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
-                  <span className="text-sm text-muted-foreground/60">
-                    {t("eventForm.noGuests")}
-                  </span>
-                </div>
-              </div>
-            ) : null}
-
-            {/* Add guest input */}
-            {!isOverlay && (
-              <div className="px-4 py-1">
-                <div className="flex items-center gap-3">
-                  <IconPlus className="h-4 w-4 shrink-0 text-muted-foreground/40" />
-                  <AttendeeAutocomplete
-                    selectedEmails={(event.attendees || []).map(
-                      (attendee) => attendee.email,
-                    )}
-                    onAdd={handleAddAttendee}
-                    placeholder={t("eventForm.addGuests")}
-                    variant="inline"
-                    showChips={false}
-                    showAddButton
-                    inputClassName="text-foreground placeholder:text-muted-foreground/40"
+            {!isWorkingLocation && (
+              <>
+                {/* Separator */}
+                <div className="mx-4 my-2 border-t border-border/50" />
+
+                {/* Attendees — always shown */}
+                {event.attendees && event.attendees.length > 0 ? (
+                  <EventAttendeesSection
+                    event={event}
+                    canEditOptional={!isOverlay}
+                    onToggleOptional={handleToggleAttendeeOptional}
                   />
-                </div>
-              </div>
-            )}
+                ) : !isOverlay ? (
+                  <div className="px-4 py-1">
+                    <div className="flex items-start gap-3">
+                      <IconUser className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
+                      <span className="text-sm text-muted-foreground/60">
+                        {t("eventForm.noGuests")}
+                      </span>
+                    </div>
+                  </div>
+                ) : null}
+
+                {/* Add guest input */}
+                {!isOverlay && (
+                  <div className="px-4 py-1">
+                    <div className="flex items-center gap-3">
+                      <IconPlus className="h-4 w-4 shrink-0 text-muted-foreground/40" />
+                      <AttendeeAutocomplete
+                        selectedEmails={(event.attendees || []).map(
+                          (attendee) => attendee.email,
+                        )}
+                        onAdd={handleAddAttendee}
+                        placeholder={t("eventForm.addGuests")}
+                        variant="inline"
+                        showChips={false}
+                        showAddButton
+                        inputClassName="text-foreground placeholder:text-muted-foreground/40"
+                      />
+                    </div>
+                  </div>
+                )}
+
+                {/* Research Meeting button */}
+                {event.attendees && event.attendees.length > 0 && (
+                  <>
+                    <div className="mx-4 my-2 border-t border-border/50" />
+                    <div className="px-4 py-1">
+                      <ResearchMeetingButton event={event} />
+                    </div>
+                  </>
+                )}
 
-            {/* Research Meeting button */}
-            {event.attendees && event.attendees.length > 0 && (
-              <>
                 <div className="mx-4 my-2 border-t border-border/50" />
                 <div className="px-4 py-1">
-                  <ResearchMeetingButton event={event} />
+                  <ExtensionSlot
+                    id="calendar.event-detail.bottom"
+                    context={buildEventDetailSlotContext(event)}
+                    showEmptyAffordance
+                  />
                 </div>
               </>
             )}
 
-            <div className="mx-4 my-2 border-t border-border/50" />
-            <div className="px-4 py-1">
-              <ExtensionSlot
-                id="calendar.event-detail.bottom"
-                context={buildEventDetailSlotContext(event)}
-                showEmptyAffordance
-              />
-            </div>
-
             {/* Meeting link */}
-            {meetingLink ? (
-              <>
-                <div className="mx-4 my-2 border-t border-border/50" />
-                <div className="px-4 py-1.5">
-                  <a
-                    href={meetingLink.url}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="flex items-center justify-center w-full rounded-xl bg-[#4965E0] hover:bg-[#5A75F0] text-white font-semibold py-2 px-4 text-[15px] relative"
-                  >
-                    <IconVideo className="h-5 w-5 mr-2 opacity-80" />
-                    <span>{getMeetingLabel(meetingLink.type, t)}</span>
-                    <span className="absolute right-4 hidden items-center gap-1 opacity-50 sm:flex">
-                      <kbd className="text-xs font-normal">
-                        {shortcutModifierLabel()}
-                      </kbd>
-                      <kbd className="inline-flex h-5 w-5 items-center justify-center rounded bg-white/20 text-[11px] font-medium">
-                        J
-                      </kbd>
-                    </span>
-                  </a>
-                  {(meetingLink.pin || meetingLink.passcode) && (
-                    <div className="mt-1.5 text-xs text-muted-foreground/60">
-                      {meetingLink.pin && (
-                        <span>
-                          {t("eventForm.pin", { pin: meetingLink.pin })}
-                        </span>
-                      )}
-                      {meetingLink.pin && meetingLink.passcode && (
-                        <span className="mx-1">&middot;</span>
-                      )}
-                      {meetingLink.passcode && (
-                        <span>
-                          {t("eventForm.passcode", {
-                            passcode: meetingLink.passcode,
-                          })}
-                        </span>
-                      )}
-                    </div>
-                  )}
-                </div>
-              </>
-            ) : pendingConferenceProvider ? (
-              <>
-                <div className="mx-4 my-2 border-t border-border/50" />
-                <div className="px-4 py-1.5">
-                  <div className="flex w-full items-center rounded-xl bg-[#4965E0] py-2 pl-4 pr-2 text-white">
-                    {pendingConferenceProvider === "zoom" ? (
-                      <IconBrandZoom className="mr-2 h-5 w-5 opacity-90" />
-                    ) : (
-                      <IconVideo className="mr-2 h-5 w-5 opacity-90" />
-                    )}
-                    <span className="text-[15px] font-semibold">
-                      {pendingConferenceProvider === "zoom"
-                        ? t("eventForm.zoom")
-                        : t("eventForm.googleMeet")}
-                    </span>
-                    <button
-                      type="button"
-                      onClick={handleRemovePendingConference}
-                      aria-label={`Remove ${
-                        pendingConferenceProvider === "zoom"
-                          ? t("eventForm.zoom")
-                          : t("eventForm.googleMeet")
-                      }`}
-                      className="ml-auto rounded-md p-1 text-white/70 transition-colors hover:bg-white/15 hover:text-white"
+            {!isWorkingLocation &&
+              (meetingLink ? (
+                <>
+                  <div className="mx-4 my-2 border-t border-border/50" />
+                  <div className="px-4 py-1.5">
+                    <a
+                      href={meetingLink.url}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="flex items-center justify-center w-full rounded-xl bg-[#4965E0] hover:bg-[#5A75F0] text-white font-semibold py-2 px-4 text-[15px] relative"
                     >
-                      <IconX className="h-4 w-4" />
-                    </button>
+                      <IconVideo className="h-5 w-5 mr-2 opacity-80" />
+                      <span>{getMeetingLabel(meetingLink.type, t)}</span>
+                      <span className="absolute right-4 hidden items-center gap-1 opacity-50 sm:flex">
+                        <kbd className="text-xs font-normal">
+                          {shortcutModifierLabel()}
+                        </kbd>
+                        <kbd className="inline-flex h-5 w-5 items-center justify-center rounded bg-white/20 text-[11px] font-medium">
+                          J
+                        </kbd>
+                      </span>
+                    </a>
+                    {(meetingLink.pin || meetingLink.passcode) && (
+                      <div className="mt-1.5 text-xs text-muted-foreground/60">
+                        {meetingLink.pin && (
+                          <span>
+                            {t("eventForm.pin", { pin: meetingLink.pin })}
+                          </span>
+                        )}
+                        {meetingLink.pin && meetingLink.passcode && (
+                          <span className="mx-1">&middot;</span>
+                        )}
+                        {meetingLink.passcode && (
+                          <span>
+                            {t("eventForm.passcode", {
+                              passcode: meetingLink.passcode,
+                            })}
+                          </span>
+                        )}
+                      </div>
+                    )}
                   </div>
-                  <p className="mt-1.5 text-xs text-muted-foreground/60">
-                    {t("eventForm.conferencingLinkOnSave")}
-                  </p>
-                </div>
-              </>
-            ) : !isOverlay ? (
-              <>
-                <div className="mx-4 my-2 border-t border-border/50" />
-                {editingField === "meetingLink" ? (
+                </>
+              ) : pendingConferenceProvider ? (
+                <>
+                  <div className="mx-4 my-2 border-t border-border/50" />
                   <div className="px-4 py-1.5">
-                    <div className="flex items-center gap-2">
-                      <IconVideo className="h-4 w-4 shrink-0 text-muted-foreground" />
-                      <input
-                        ref={meetingLinkRef}
-                        value={editMeetingLink}
-                        onChange={(e) => setEditMeetingLink(e.target.value)}
-                        onKeyDown={(e) => {
-                          if (e.key === "Enter") {
-                            e.preventDefault();
-                            handleSaveMeetingLink();
-                          }
-                          if (e.key === "Escape") {
-                            e.preventDefault();
-                            setEditMeetingLink("");
-                            setEditingField(null);
-                          }
-                          e.stopPropagation();
-                        }}
-                        onBlur={handleSaveMeetingLink}
-                        placeholder={t("eventForm.pasteMeetingLink")}
-                        className="flex-1 bg-transparent border-none outline-none text-sm text-foreground placeholder:text-muted-foreground/40 focus:ring-0"
-                      />
+                    <div className="flex w-full items-center rounded-xl bg-[#4965E0] py-2 pl-4 pr-2 text-white">
+                      {pendingConferenceProvider === "zoom" ? (
+                        <IconBrandZoom className="mr-2 h-5 w-5 opacity-90" />
+                      ) : (
+                        <IconVideo className="mr-2 h-5 w-5 opacity-90" />
+                      )}
+                      <span className="text-[15px] font-semibold">
+                        {pendingConferenceProvider === "zoom"
+                          ? t("eventForm.zoom")
+                          : t("eventForm.googleMeet")}
+                      </span>
+                      <button
+                        type="button"
+                        onClick={handleRemovePendingConference}
+                        aria-label={`Remove ${
+                          pendingConferenceProvider === "zoom"
+                            ? t("eventForm.zoom")
+                            : t("eventForm.googleMeet")
+                        }`}
+                        className="ml-auto rounded-md p-1 text-white/70 transition-colors hover:bg-white/15 hover:text-white"
+                      >
+                        <IconX className="h-4 w-4" />
+                      </button>
                     </div>
+                    <p className="mt-1.5 text-xs text-muted-foreground/60">
+                      {t("eventForm.conferencingLinkOnSave")}
+                    </p>
                   </div>
-                ) : (
-                  <div className="px-4 py-1.5">
-                    {pendingVideoProvider ? (
-                      <MeetingLinkSkeleton provider={pendingVideoProvider} />
-                    ) : (
+                </>
+              ) : !isOverlay ? (
+                <>
+                  <div className="mx-4 my-2 border-t border-border/50" />
+                  {editingField === "meetingLink" ? (
+                    <div className="px-4 py-1.5">
                       <div className="flex items-center gap-2">
-                        <Button
-                          type="button"
-                          variant="outline"
-                          size="sm"
-                          className="h-8 flex-1 justify-center gap-1.5 px-2 text-xs"
-                          disabled={updateEvent.isPending}
-                          onClick={handleAddGoogleMeet}
-                        >
-                          <IconVideo className="h-3.5 w-3.5" />
-                          {t("eventForm.meet")}
-                        </Button>
-                        <Button
-                          type="button"
-                          variant="outline"
-                          size="sm"
-                          className="h-8 flex-1 justify-center gap-1.5 px-2 text-xs"
-                          disabled={
-                            updateEvent.isPending || connectZoom.isPending
-                          }
-                          onClick={handleAddZoom}
-                        >
-                          <IconBrandZoom className="h-3.5 w-3.5" />
-                          {t("eventForm.zoom")}
-                        </Button>
-                        <Button
-                          type="button"
-                          variant="ghost"
-                          size="sm"
-                          className="h-8 flex-1 justify-center gap-1.5 px-2 text-xs text-muted-foreground"
-                          onClick={() => setEditingField("meetingLink")}
-                        >
-                          <IconPlus className="h-3.5 w-3.5" />
-                          {t("eventForm.pasteLink")}
-                        </Button>
+                        <IconVideo className="h-4 w-4 shrink-0 text-muted-foreground" />
+                        <input
+                          ref={meetingLinkRef}
+                          value={editMeetingLink}
+                          onChange={(e) => setEditMeetingLink(e.target.value)}
+                          onKeyDown={(e) => {
+                            if (e.key === "Enter") {
+                              e.preventDefault();
+                              handleSaveMeetingLink();
+                            }
+                            if (e.key === "Escape") {
+                              e.preventDefault();
+                              setEditMeetingLink("");
+                              setEditingField(null);
+                            }
+                            e.stopPropagation();
+                          }}
+                          onBlur={handleSaveMeetingLink}
+                          placeholder={t("eventForm.pasteMeetingLink")}
+                          className="flex-1 bg-transparent border-none outline-none text-sm text-foreground placeholder:text-muted-foreground/40 focus:ring-0"
+                        />
                       </div>
-                    )}
-                  </div>
-                )}
-              </>
-            ) : null}
+                    </div>
+                  ) : (
+                    <div className="px-4 py-1.5">
+                      {pendingVideoProvider ? (
+                        <MeetingLinkSkeleton provider={pendingVideoProvider} />
+                      ) : (
+                        <div className="flex items-center gap-2">
+                          <Button
+                            type="button"
+                            variant="outline"
+                            size="sm"
+                            className="h-8 flex-1 justify-center gap-1.5 px-2 text-xs"
+                            disabled={updateEvent.isPending}
+                            onClick={handleAddGoogleMeet}
+                          >
+                            <IconVideo className="h-3.5 w-3.5" />
+                            {t("eventForm.meet")}
+                          </Button>
+                          <Button
+                            type="button"
+                            variant="outline"
+                            size="sm"
+                            className="h-8 flex-1 justify-center gap-1.5 px-2 text-xs"
+                            disabled={
+                              updateEvent.isPending || connectZoom.isPending
+                            }
+                            onClick={handleAddZoom}
+                          >
+                            <IconBrandZoom className="h-3.5 w-3.5" />
+                            {t("eventForm.zoom")}
+                          </Button>
+                          <Button
+                            type="button"
+                            variant="ghost"
+                            size="sm"
+                            className="h-8 flex-1 justify-center gap-1.5 px-2 text-xs text-muted-foreground"
+                            onClick={() => setEditingField("meetingLink")}
+                          >
+                            <IconPlus className="h-3.5 w-3.5" />
+                            {t("eventForm.pasteLink")}
+                          </Button>
+                        </div>
+                      )}
+                    </div>
+                  )}
+                </>
+              ) : null)}
 
             {/* Attachments */}
-            {!isOverlay && (
+            {!isOverlay && !isWorkingLocation && (
               <>
                 <div className="mx-4 my-2 border-t border-border/50" />
                 {editingField === "attachments" ? (
@@ -2051,85 +2142,104 @@ export function EventDetailPopover({
               </>
             )}
 
-            {/* Location — always shown, editable */}
-            <div className="mx-4 my-2 border-t border-border/50" />
-            {editingField === "location" ? (
-              <div className="flex items-start gap-3 px-4 py-1.5">
-                <IconMapPin className="mt-1.5 h-4 w-4 shrink-0 text-muted-foreground" />
-                <input
-                  ref={locationRef}
-                  value={editLocation}
-                  onChange={(e) => setEditLocation(e.target.value)}
-                  onKeyDown={(e) => {
-                    if (e.key === "Enter") {
-                      e.preventDefault();
-                      handleSaveLocation();
-                    }
-                    if (e.key === "Escape") {
-                      e.preventDefault();
-                      setEditLocation(event.location || "");
-                      setEditingField(null);
-                    }
-                    e.stopPropagation();
-                  }}
-                  onBlur={handleSaveLocation}
-                  placeholder={t("eventForm.addLocation")}
-                  className="flex-1 bg-transparent border-none outline-none text-sm text-foreground placeholder:text-muted-foreground/40 focus:ring-0"
-                />
-              </div>
-            ) : event.location && !locationIsMeetingLink ? (
-              <div
-                className={`flex items-start gap-3 px-4 py-1.5 ${!isOverlay ? "cursor-pointer hover:bg-muted/50 rounded-md" : ""}`}
-                onClick={() => {
-                  if (isOverlay) return;
-                  setEditingField("location");
-                }}
-              >
-                <IconMapPin className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
-                {locationIsUrl ? (
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <a
-                        href={event.location}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        className="text-sm text-primary hover:underline truncate block max-w-full"
-                        onClick={(e) => e.stopPropagation()}
-                      >
-                        {event.location}
-                      </a>
-                    </TooltipTrigger>
-                    <TooltipContent>{event.location}</TooltipContent>
-                  </Tooltip>
-                ) : (
-                  <span className="text-sm text-muted-foreground">
-                    {event.location}
-                  </span>
-                )}
-              </div>
-            ) : locationIsMeetingLink && meetingLink ? (
+            {!isWorkingLocation && (
               <>
-                <div className="flex items-start gap-3 px-4 py-1.5 rounded-md">
-                  <IconVideo className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
-                  <div className="min-w-0">
-                    <a
-                      href={meetingLink.url}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="block max-w-full truncate text-sm text-primary hover:underline"
-                    >
-                      {getMeetingLabel(meetingLink.type, t)}
-                    </a>
-                    <div className="text-xs text-muted-foreground">
-                      {t("eventForm.savedAsVideoLink")}
-                    </div>
+                {/* Location — always shown, editable */}
+                <div className="mx-4 my-2 border-t border-border/50" />
+                {editingField === "location" ? (
+                  <div className="flex items-start gap-3 px-4 py-1.5">
+                    <IconMapPin className="mt-1.5 h-4 w-4 shrink-0 text-muted-foreground" />
+                    <input
+                      ref={locationRef}
+                      value={editLocation}
+                      onChange={(e) => setEditLocation(e.target.value)}
+                      onKeyDown={(e) => {
+                        if (e.key === "Enter") {
+                          e.preventDefault();
+                          handleSaveLocation();
+                        }
+                        if (e.key === "Escape") {
+                          e.preventDefault();
+                          setEditLocation(editableLocationValue);
+                          setEditingField(null);
+                        }
+                        e.stopPropagation();
+                      }}
+                      onBlur={handleSaveLocation}
+                      placeholder={t("eventForm.addLocation")}
+                      className="flex-1 bg-transparent border-none outline-none text-sm text-foreground placeholder:text-muted-foreground/40 focus:ring-0"
+                    />
                   </div>
-                </div>
-                {!isOverlay && (
+                ) : event.location && !locationIsMeetingLink ? (
+                  <div
+                    className={`flex items-start gap-3 px-4 py-1.5 ${!isOverlay ? "cursor-pointer hover:bg-muted/50 rounded-md" : ""}`}
+                    onClick={() => {
+                      if (isOverlay) return;
+                      setEditingField("location");
+                    }}
+                  >
+                    <IconMapPin className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
+                    {locationIsUrl ? (
+                      <Tooltip>
+                        <TooltipTrigger asChild>
+                          <a
+                            href={event.location}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className="text-sm text-primary hover:underline truncate block max-w-full"
+                            onClick={(e) => e.stopPropagation()}
+                          >
+                            {event.location}
+                          </a>
+                        </TooltipTrigger>
+                        <TooltipContent>{event.location}</TooltipContent>
+                      </Tooltip>
+                    ) : (
+                      <span className="text-sm text-muted-foreground">
+                        {event.location}
+                      </span>
+                    )}
+                  </div>
+                ) : locationIsMeetingLink && meetingLink ? (
+                  <>
+                    <div className="flex items-start gap-3 px-4 py-1.5 rounded-md">
+                      <IconVideo className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
+                      <div className="min-w-0">
+                        <a
+                          href={meetingLink.url}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          className="block max-w-full truncate text-sm text-primary hover:underline"
+                        >
+                          {getMeetingLabel(meetingLink.type, t)}
+                        </a>
+                        <div className="text-xs text-muted-foreground">
+                          {t("eventForm.savedAsVideoLink")}
+                        </div>
+                      </div>
+                    </div>
+                    {!isOverlay && (
+                      <div
+                        className="flex items-center gap-3 px-4 py-1.5 cursor-pointer hover:bg-muted/50 rounded-md"
+                        onClick={() => {
+                          setEditLocation(editableLocationValue);
+                          setEditingField("location");
+                        }}
+                      >
+                        <IconMapPin className="h-4 w-4 shrink-0 text-muted-foreground/40" />
+                        <span className="text-sm text-muted-foreground/40">
+                          {t("eventForm.addLocation")}
+                        </span>
+                      </div>
+                    )}
+                  </>
+                ) : !isOverlay ? (
                   <div
                     className="flex items-center gap-3 px-4 py-1.5 cursor-pointer hover:bg-muted/50 rounded-md"
                     onClick={() => {
-                      setEditLocation("");
+                      setEditLocation(
+                        locationIsMeetingLink ? "" : editableLocationValue,
+                      );
                       setEditingField("location");
                     }}
                   >
@@ -2138,27 +2248,12 @@ export function EventDetailPopover({
                       {t("eventForm.addLocation")}
                     </span>
                   </div>
-                )}
+                ) : null}
               </>
-            ) : !isOverlay ? (
-              <div
-                className="flex items-center gap-3 px-4 py-1.5 cursor-pointer hover:bg-muted/50 rounded-md"
-                onClick={() => {
-                  setEditLocation(
-                    locationIsMeetingLink ? "" : event.location || "",
-                  );
-                  setEditingField("location");
-                }}
-              >
-                <IconMapPin className="h-4 w-4 shrink-0 text-muted-foreground/40" />
-                <span className="text-sm text-muted-foreground/40">
-                  {t("eventForm.addLocation")}
-                </span>
-              </div>
-            ) : null}
+            )}
 
             {/* Description — always shown for editable events; hidden for overlay events with no description */}
-            {(!isOverlay || event.description) && (
+            {!isWorkingLocation && (!isOverlay || event.description) && (
               <>
                 <div className="mx-4 my-2 border-t border-border/50" />
                 <div className="px-4 py-1.5">
@@ -2210,180 +2305,182 @@ export function EventDetailPopover({
             )}
 
             {/* Reminders */}
-            {!isOverlay && editingField === "reminders" ? (
-              <>
-                <div className="mx-4 my-2 border-t border-border/50" />
-                <div className="px-4 py-1.5">
-                  <div className="mb-2 flex items-center gap-3">
-                    <IconBell className="h-4 w-4 shrink-0 text-muted-foreground" />
-                    <span className="text-sm font-medium text-foreground">
-                      {t("eventForm.eventAlerts")}
-                    </span>
-                  </div>
-                  <ReminderControls
-                    idPrefix={`event-${event.id}`}
-                    mode={editReminderMode}
-                    reminders={editReminders}
-                    onModeChange={setEditReminderMode}
-                    onRemindersChange={setEditReminders}
-                  />
-                  <div className="mt-2 flex justify-end gap-1.5">
-                    <Button
-                      variant="ghost"
-                      size="sm"
-                      className="h-6 text-xs"
-                      onClick={() => {
-                        const reminderState = remindersToDraftState(event);
-                        setEditReminderMode(reminderState.mode);
-                        setEditReminders(reminderState.reminders);
-                        setEditingField(null);
-                      }}
-                    >
-                      {t("eventForm.cancel")}
-                    </Button>
-                    <Button
-                      size="sm"
-                      className="h-6 text-xs"
-                      onClick={handleSaveReminders}
-                    >
-                      {t("eventForm.save")}
-                    </Button>
+            {!isWorkingLocation &&
+              (!isOverlay && editingField === "reminders" ? (
+                <>
+                  <div className="mx-4 my-2 border-t border-border/50" />
+                  <div className="px-4 py-1.5">
+                    <div className="mb-2 flex items-center gap-3">
+                      <IconBell className="h-4 w-4 shrink-0 text-muted-foreground" />
+                      <span className="text-sm font-medium text-foreground">
+                        {t("eventForm.eventAlerts")}
+                      </span>
+                    </div>
+                    <ReminderControls
+                      idPrefix={`event-${event.id}`}
+                      mode={editReminderMode}
+                      reminders={editReminders}
+                      onModeChange={setEditReminderMode}
+                      onRemindersChange={setEditReminders}
+                    />
+                    <div className="mt-2 flex justify-end gap-1.5">
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        className="h-6 text-xs"
+                        onClick={() => {
+                          const reminderState = remindersToDraftState(event);
+                          setEditReminderMode(reminderState.mode);
+                          setEditReminders(reminderState.reminders);
+                          setEditingField(null);
+                        }}
+                      >
+                        {t("eventForm.cancel")}
+                      </Button>
+                      <Button
+                        size="sm"
+                        className="h-6 text-xs"
+                        onClick={handleSaveReminders}
+                      >
+                        {t("eventForm.save")}
+                      </Button>
+                    </div>
                   </div>
-                </div>
-              </>
-            ) : event.reminders && event.reminders.length > 0 ? (
-              <>
-                <div className="mx-4 my-2 border-t border-border/50" />
-                <div className="flex items-start gap-3 px-4 py-1.5">
-                  <IconBell className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
-                  <div className="space-y-0.5">
-                    {event.reminders.map((r, i) => (
-                      <div key={i} className="text-sm text-muted-foreground">
-                        {formatReminderText(r.minutes)}
-                      </div>
-                    ))}
+                </>
+              ) : event.reminders && event.reminders.length > 0 ? (
+                <>
+                  <div className="mx-4 my-2 border-t border-border/50" />
+                  <div className="flex items-start gap-3 px-4 py-1.5">
+                    <IconBell className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
+                    <div className="space-y-0.5">
+                      {event.reminders.map((r, i) => (
+                        <div key={i} className="text-sm text-muted-foreground">
+                          {formatReminderText(r.minutes)}
+                        </div>
+                      ))}
+                    </div>
                   </div>
-                </div>
-              </>
-            ) : null}
+                </>
+              ) : null)}
 
             {/* Availability, visibility, and alerts */}
-            {!isOverlay ? (
-              <>
-                <div className="mx-4 my-2 border-t border-border/50" />
-                <div className="px-4 py-1.5">
-                  <div className="grid grid-cols-3 gap-2">
-                    <div className="space-y-1">
-                      <span className="text-[10px] text-muted-foreground">
-                        {t("eventForm.showAs")}
-                      </span>
-                      <Select
-                        value={availabilityValue}
-                        onValueChange={(value) =>
-                          handleAvailabilityChange(value as AvailabilityValue)
-                        }
-                        disabled={updateEvent.isPending}
-                      >
-                        <SelectTrigger className="h-8 text-xs">
-                          <SelectValue />
-                        </SelectTrigger>
-                        <SelectContent>
-                          <SelectItem value="opaque">
-                            {t("eventForm.busy")}
-                          </SelectItem>
-                          <SelectItem value="transparent">
-                            {t("eventForm.free")}
-                          </SelectItem>
-                        </SelectContent>
-                      </Select>
-                    </div>
-                    <div className="space-y-1">
-                      <span className="text-[10px] text-muted-foreground">
-                        {t("eventForm.visibility")}
-                      </span>
-                      <Select
-                        value={visibilityValue}
-                        onValueChange={(value) =>
-                          handleVisibilityChange(value as VisibilityValue)
-                        }
-                        disabled={updateEvent.isPending}
-                      >
-                        <SelectTrigger className="h-8 text-xs">
-                          <SelectValue />
-                        </SelectTrigger>
-                        <SelectContent>
-                          <SelectItem value="default">
-                            {t("eventForm.default")}
-                          </SelectItem>
-                          <SelectItem value="public">
-                            {t("eventForm.public")}
-                          </SelectItem>
-                          <SelectItem value="private">
-                            {t("eventForm.private")}
-                          </SelectItem>
-                        </SelectContent>
-                      </Select>
+            {!isWorkingLocation &&
+              (!isOverlay ? (
+                <>
+                  <div className="mx-4 my-2 border-t border-border/50" />
+                  <div className="px-4 py-1.5">
+                    <div className="grid grid-cols-3 gap-2">
+                      <div className="space-y-1">
+                        <span className="text-[10px] text-muted-foreground">
+                          {t("eventForm.showAs")}
+                        </span>
+                        <Select
+                          value={availabilityValue}
+                          onValueChange={(value) =>
+                            handleAvailabilityChange(value as AvailabilityValue)
+                          }
+                          disabled={updateEvent.isPending}
+                        >
+                          <SelectTrigger className="h-8 text-xs">
+                            <SelectValue />
+                          </SelectTrigger>
+                          <SelectContent>
+                            <SelectItem value="opaque">
+                              {t("eventForm.busy")}
+                            </SelectItem>
+                            <SelectItem value="transparent">
+                              {t("eventForm.free")}
+                            </SelectItem>
+                          </SelectContent>
+                        </Select>
+                      </div>
+                      <div className="space-y-1">
+                        <span className="text-[10px] text-muted-foreground">
+                          {t("eventForm.visibility")}
+                        </span>
+                        <Select
+                          value={visibilityValue}
+                          onValueChange={(value) =>
+                            handleVisibilityChange(value as VisibilityValue)
+                          }
+                          disabled={updateEvent.isPending}
+                        >
+                          <SelectTrigger className="h-8 text-xs">
+                            <SelectValue />
+                          </SelectTrigger>
+                          <SelectContent>
+                            <SelectItem value="default">
+                              {t("eventForm.default")}
+                            </SelectItem>
+                            <SelectItem value="public">
+                              {t("eventForm.public")}
+                            </SelectItem>
+                            <SelectItem value="private">
+                              {t("eventForm.private")}
+                            </SelectItem>
+                          </SelectContent>
+                        </Select>
+                      </div>
+                      <div className="space-y-1">
+                        <span className="text-[10px] text-muted-foreground">
+                          {t("eventForm.alerts")}
+                        </span>
+                        <Select
+                          value={reminderValue}
+                          onValueChange={(value) =>
+                            handleReminderChange(value as ReminderValue)
+                          }
+                          disabled={updateEvent.isPending}
+                        >
+                          <SelectTrigger className="h-8 text-xs">
+                            <SelectValue />
+                          </SelectTrigger>
+                          <SelectContent>
+                            <SelectItem value="default">
+                              {t("eventForm.default")}
+                            </SelectItem>
+                            <SelectItem value="none">
+                              {t("eventForm.none")}
+                            </SelectItem>
+                            <SelectItem value="0">
+                              {t("eventForm.atStart")}
+                            </SelectItem>
+                            <SelectItem value="10">10 min</SelectItem>
+                            <SelectItem value="30">30 min</SelectItem>
+                            <SelectItem value="60">1 hour</SelectItem>
+                            <SelectItem value="1440">1 day</SelectItem>
+                            <SelectItem value="custom">
+                              {t("eventForm.customEllipsis")}
+                            </SelectItem>
+                          </SelectContent>
+                        </Select>
+                      </div>
                     </div>
-                    <div className="space-y-1">
-                      <span className="text-[10px] text-muted-foreground">
-                        {t("eventForm.alerts")}
-                      </span>
-                      <Select
-                        value={reminderValue}
-                        onValueChange={(value) =>
-                          handleReminderChange(value as ReminderValue)
-                        }
-                        disabled={updateEvent.isPending}
-                      >
-                        <SelectTrigger className="h-8 text-xs">
-                          <SelectValue />
-                        </SelectTrigger>
-                        <SelectContent>
-                          <SelectItem value="default">
-                            {t("eventForm.default")}
-                          </SelectItem>
-                          <SelectItem value="none">
-                            {t("eventForm.none")}
-                          </SelectItem>
-                          <SelectItem value="0">
-                            {t("eventForm.atStart")}
-                          </SelectItem>
-                          <SelectItem value="10">10 min</SelectItem>
-                          <SelectItem value="30">30 min</SelectItem>
-                          <SelectItem value="60">1 hour</SelectItem>
-                          <SelectItem value="1440">1 day</SelectItem>
-                          <SelectItem value="custom">
-                            {t("eventForm.customEllipsis")}
-                          </SelectItem>
-                        </SelectContent>
-                      </Select>
+                    <div className="mt-2 flex items-center gap-3">
+                      <IconPalette className="h-4 w-4 shrink-0 text-muted-foreground" />
+                      <EventColorSwatches
+                        value={event.colorId}
+                        onChange={handleColorChange}
+                      />
                     </div>
                   </div>
-                  <div className="mt-2 flex items-center gap-3">
-                    <IconPalette className="h-4 w-4 shrink-0 text-muted-foreground" />
-                    <EventColorSwatches
-                      value={event.colorId}
-                      onChange={handleColorChange}
-                    />
+                </>
+              ) : event.status || event.visibility ? (
+                <>
+                  <div className="mx-4 my-2 border-t border-border/50" />
+                  <div className="flex items-center gap-3 px-4 py-1.5 text-sm text-muted-foreground">
+                    <div className="h-4 w-4 shrink-0" />
+                    <span>
+                      {event.transparency === "transparent"
+                        ? t("eventForm.free")
+                        : t("eventForm.busy")}
+                      {event.visibility && event.visibility !== "default"
+                        ? ` · ${event.visibility} visibility`
+                        : ""}
+                    </span>
                   </div>
-                </div>
-              </>
-            ) : event.status || event.visibility ? (
-              <>
-                <div className="mx-4 my-2 border-t border-border/50" />
-                <div className="flex items-center gap-3 px-4 py-1.5 text-sm text-muted-foreground">
-                  <div className="h-4 w-4 shrink-0" />
-                  <span>
-                    {event.transparency === "transparent"
-                      ? t("eventForm.free")
-                      : t("eventForm.busy")}
-                    {event.visibility && event.visibility !== "default"
-                      ? ` · ${event.visibility} visibility`
-                      : ""}
-                  </span>
-                </div>
-              </>
-            ) : null}
+                </>
+              ) : null)}
 
             {/* Overlay person badge */}
             {event.overlayEmail && (