mirror of
https://github.com/bulwarkmail/webmail.git
synced 2026-11-01 08:12:43 +00:00
Resolves the two conflicts in components/calendar/event-modal.tsx created by #967 (RSVP controls), both keep-both: - #967's canRsvp memo and #986's resolveContactName hook are both kept; they are independent and were simply inserted at the same point. - #967's RsvpBar component is kept, and StatusBadge takes #986's signature ({ status, t }) since #986 drops the isOrganizer prop and updates both call sites to match.