@open-mercato/core 0.8.1-develop.7274.1.21a0083828 → 0.8.1-develop.7294.1.0ef99fc518

package/src/modules/customers/components/detail/RoleAssignmentRow.tsx

@@ -11,6 +11,7 @@ import { Avatar } from '@open-mercato/ui/primitives/avatar'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import { fetchAssignableStaffMembers } from './assignableStaff'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
@@ -61,13 +62,14 @@ export function RoleAssignmentRow({
   onUpdated,
 }: RoleAssignmentRowProps) {
   const t = useT()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const [removing, setRemoving] = React.useState(false)
   const [changingUser, setChangingUser] = React.useState(false)
 
   const searchUsers = React.useCallback(async (query: string): Promise<LookupSelectItem[]> => {
     try {
-      const members = await fetchAssignableStaffMembers(query, { pageSize: 20 })
+      const members = await fetchAssignableStaffMembers(query, { pageSize: 20, activeOrgId })
       return members.map((member) => ({
         id: member.userId,
         title: member.displayName,
@@ -77,7 +79,7 @@ export function RoleAssignmentRow({
       logger.error('customers.roles.searchUsers failed', { err: error })
       return []
     }
-  }, [])
+  }, [activeOrgId])
 
   const handleUserChange = React.useCallback(async (userId: string | null) => {
     if (!userId || userId === role.userId) return

package/src/modules/customers/components/detail/ScheduleActivityDialog.tsx

@@ -21,6 +21,8 @@ import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import {
   useScheduleFormState,
   FIELD_VISIBILITY,
+  isDateRequired,
+  isTimeRequired,
   getFieldLabel,
   DateTimeFields,
   ParticipantsField,
@@ -365,8 +367,10 @@ export function ScheduleActivityDialog({
   const trimmedDate = state.date.trim()
   const trimmedStartTime = state.startTime.trim()
   const trimmedCallPhone = callPhoneNumber.trim()
-  const isDateMissing = !trimmedDate
-  const isTimeMissing = !state.allDay && !trimmedStartTime
+  // Only calendar-bound types must be scheduled; a task may stay an undated
+  // backlog item, so blocking its save on an empty date was wrong (#5941).
+  const isDateMissing = isDateRequired(state.activityType) && !trimmedDate
+  const isTimeMissing = isTimeRequired(state.activityType) && !state.allDay && !trimmedStartTime
   const isSubmitDisabled =
     state.saving ||
     !state.title.trim() ||
@@ -399,9 +403,13 @@ export function ScheduleActivityDialog({
     }
     state.setSaving(true)
     try {
-      const scheduledAt = state.allDay
-        ? new Date(`${state.date}T00:00:00`).toISOString()
-        : new Date(`${state.date}T${state.startTime}:00`).toISOString()
+      // An undated activity (a backlog task) has no moment to compute — sending
+      // an explicit null clears `scheduled_at` instead of posting an
+      // `Invalid Date` built from an empty date string (#5941).
+      const timeForPayload = state.allDay ? '00:00' : trimmedStartTime
+      const scheduledAt = trimmedDate
+        ? new Date(`${trimmedDate}T${timeForPayload || '00:00'}:00`).toISOString()
+        : null
 
       const recurrenceRule = state.recurrenceEnabled
         ? buildRecurrenceRule(state.recurrenceDays, state.recurrenceEndType, state.recurrenceCount, state.recurrenceEndDate)
@@ -422,8 +430,8 @@ export function ScheduleActivityDialog({
         title: state.title.trim(),
         body: state.description.trim() || null,
         status: 'planned',
-        date: trimmedDate,
-        time: state.allDay ? '00:00' : trimmedStartTime,
+        date: trimmedDate || null,
+        time: trimmedDate ? timeForPayload || null : null,
         phoneNumber: state.activityType === 'call' ? phoneNumberForPayload : undefined,
         // Only tasks expose the priority control, so other types leave the column
         // untouched rather than clearing it on a type switch (#5943).

package/src/modules/customers/components/detail/schedule/DateTimeFields.tsx

@@ -15,7 +15,7 @@ import {
   SelectValue,
 } from '@open-mercato/ui/primitives/select'
 import type { ActivityType, ScheduleFieldId } from './fieldConfig'
-import { isVisible, getFieldLabel } from './fieldConfig'
+import { isVisible, isDateRequired, isTimeRequired, getFieldLabel } from './fieldConfig'
 import { USER_TIMEZONE } from '../../../lib/localDay'
 
 function parseIsoDate(value: string): Date | null {
@@ -100,8 +100,10 @@ export function DateTimeFields({
   const showAllDay = isVisible(activityType, 'allDay')
   const showRecurrence = isVisible(activityType, 'recurrence')
 
-  const dateMissing = !date.trim()
-  const timeMissing = showStartTime && !allDay && !startTime.trim()
+  const dateRequired = isDateRequired(activityType)
+  const timeRequired = isTimeRequired(activityType)
+  const dateMissing = dateRequired && !date.trim()
+  const timeMissing = timeRequired && showStartTime && !allDay && !startTime.trim()
   const dateErrorId = 'schedule-date-error'
   const timeErrorId = 'schedule-time-error'
 
@@ -112,13 +114,18 @@ export function DateTimeFields({
         <div className="flex min-w-0 flex-[1.5] flex-col gap-1.5">
           <label className="text-overline font-semibold text-muted-foreground tracking-wider">
             {getFieldLabel(activityType, 'date', t, 'customers.schedule.date', 'Date')}
-            <span aria-hidden="true" className="ml-1 text-status-error-foreground">*</span>
+            {dateRequired ? (
+              <span aria-hidden="true" className="ml-1 text-status-error-foreground">*</span>
+            ) : null}
           </label>
           <DatePicker
             value={parseIsoDate(date)}
             onChange={(next) => setDate(formatIsoDate(next))}
             placeholder={t('customers.schedule.date.placeholder', 'Pick a date')}
-            required
+            required={dateRequired}
+            // An optional date seeds to today, so the picker needs a way back to
+            // "no due date"; the default apply/cancel footer cannot reach null.
+            footer={dateRequired ? undefined : 'today-clear'}
             aria-describedby={dateMissing ? dateErrorId : undefined}
             className={cn(
               'h-10',
@@ -135,7 +142,9 @@ export function DateTimeFields({
           <div className="flex min-w-0 flex-1 flex-col gap-1.5">
             <label className="text-overline font-semibold text-muted-foreground tracking-wider">
               {getFieldLabel(activityType, 'startTime', t, 'customers.schedule.start', 'Start')}
-              <span aria-hidden="true" className="ml-1 text-status-error-foreground">*</span>
+              {timeRequired ? (
+                <span aria-hidden="true" className="ml-1 text-status-error-foreground">*</span>
+              ) : null}
             </label>
             <TimePicker
               value={startTime || null}
@@ -147,7 +156,7 @@ export function DateTimeFields({
                 timeMissing ? 'border-status-error-border' : undefined,
               )}
               showNowButton
-              showClearButton={false}
+              showClearButton={!timeRequired}
             />
             {timeMissing ? (
               <p id={timeErrorId} className="text-xs text-status-error-foreground">

package/src/modules/customers/components/detail/schedule/ParticipantsField.tsx

@@ -10,6 +10,7 @@ import { Checkbox } from '@open-mercato/ui/primitives/checkbox'
 import { IconButton } from '@open-mercato/ui/primitives/icon-button'
 import { Popover, PopoverContent, PopoverTrigger } from '@open-mercato/ui/primitives/popover'
 import { SearchInput } from '@open-mercato/ui/primitives/search-input'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import { fetchAssignableStaffMembersPage } from '../assignableStaff'
 import type { ActivityType, ScheduleFieldId } from './fieldConfig'
 import { isVisible, getFieldLabel } from './fieldConfig'
@@ -39,6 +40,7 @@ function ParticipantSearchPopover({
   const [hasMore, setHasMore] = React.useState(false)
   const [loading, setLoading] = React.useState(false)
   const [loadError, setLoadError] = React.useState<string | null>(null)
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const selectableResults = React.useMemo(
     () => results.filter((result) => !existingIds.has(result.userId)),
     [existingIds, results],
@@ -48,7 +50,7 @@ function ParticipantSearchPopover({
     if (!open) return
     const controller = new AbortController()
     setLoading(true)
-    fetchAssignableStaffMembersPage(query, { page, pageSize: PAGE_SIZE, signal: controller.signal })
+    fetchAssignableStaffMembersPage(query, { page, pageSize: PAGE_SIZE, activeOrgId, signal: controller.signal })
       .then((result) => {
         const members = result.items
         const nextResults = members.map((member) => ({
@@ -77,7 +79,7 @@ function ParticipantSearchPopover({
       })
       .finally(() => setLoading(false))
     return () => controller.abort()
-  }, [open, page, query, t])
+  }, [activeOrgId, open, page, query, t])
 
   React.useEffect(() => {
     if (!open) return

package/src/modules/customers/components/detail/schedule/fieldConfig.ts

@@ -84,6 +84,21 @@ export function isVisible(type: ActivityType, fieldId: ScheduleFieldId): boolean
   return FIELD_VISIBILITY[type].has(fieldId)
 }
 
+// Calendar-bound types must land on a concrete moment, but a task is a backlog
+// item whose due date is optional by design (`interactions.scheduled_at` is
+// nullable and the task lists already render an undated row) — #5941.
+const OPTIONAL_DATE_TYPES: Set<ActivityType> = new Set(['task'])
+
+export function isDateRequired(type: ActivityType): boolean {
+  return isVisible(type, 'date') && !OPTIONAL_DATE_TYPES.has(type)
+}
+
+// A time without a date is meaningless, so the time follows the date: it is
+// only demanded for the types that must be scheduled in the first place.
+export function isTimeRequired(type: ActivityType): boolean {
+  return isVisible(type, 'startTime') && isDateRequired(type)
+}
+
 export function getFieldLabel(
   type: ActivityType,
   fieldId: ScheduleFieldId,

package/src/modules/customers/components/detail/schedule/index.ts

@@ -3,7 +3,7 @@ export { ParticipantsField } from './ParticipantsField'
 export { LocationField } from './LocationField'
 export { FooterFields } from './FooterFields'
 export { LinkedEntitiesField } from './LinkedEntitiesField'
-export { isVisible, getFieldLabel, FIELD_VISIBILITY, FIELD_LABEL_OVERRIDES } from './fieldConfig'
+export { isVisible, isDateRequired, isTimeRequired, getFieldLabel, FIELD_VISIBILITY, FIELD_LABEL_OVERRIDES } from './fieldConfig'
 export type { ActivityType, ScheduleFieldId } from './fieldConfig'
 export { useScheduleFormState, PARTICIPANT_COLORS } from './useScheduleFormState'
 export type { Participant, LinkedEntity, RsvpStatus, ScheduleActivityEditData } from './useScheduleFormState'

package/src/modules/customers/components/detail/schedule/useScheduleFormState.ts

@@ -1,5 +1,6 @@
 import * as React from 'react'
 import type { ActivityType } from './fieldConfig'
+import { isDateRequired } from './fieldConfig'
 
 export type RsvpStatus = 'pending' | 'accepted' | 'declined' | 'tentative'
 
@@ -165,14 +166,20 @@ export function useScheduleFormState({ open, editData }: UseScheduleFormStatePar
         // local-day convention.
         const sourceTimestamp = editData.occurredAt ?? editData.scheduledAt ?? null
         const seedDate = sourceTimestamp ? new Date(sourceTimestamp) : null
-        // No usable timestamp means this is a preset create (or a corrupt row), so
-        // fall forward to the create-mode default instead of "now" (#5940).
-        const dateForForm =
-          seedDate && !Number.isNaN(seedDate.getTime())
-            ? seedDate
-            : resolveDefaultActivityStart(resolvedType, new Date())
-        setDate(formatLocalDateInput(dateForForm))
-        setStartTime(formatLocalTimeInput(dateForForm))
+        const seedDateValid = seedDate !== null && !Number.isNaN(seedDate.getTime())
+        // A real edit of an undated task must stay undated: falling back to a
+        // computed default here would silently give a backlog item a due date on
+        // the next save (#5941). Menu-driven "New Task" (no id yet, so `isEditing`
+        // is false) still gets the create-mode default so #5940's forward-seeded
+        // default keeps working.
+        if (isEditing && !seedDateValid && !isDateRequired(resolvedType)) {
+          setDate('')
+          setStartTime('')
+        } else {
+          const dateForForm = seedDateValid ? (seedDate as Date) : resolveDefaultActivityStart(resolvedType, new Date())
+          setDate(formatLocalDateInput(dateForForm))
+          setStartTime(formatLocalTimeInput(dateForForm))
+        }
         setDuration(editData.durationMinutes ?? 30)
         setAllDay(editData.allDay ?? false)
         setDescription(editData.body ?? '')
@@ -253,7 +260,7 @@ export function useScheduleFormState({ open, editData }: UseScheduleFormStatePar
       document.body.style.removeProperty('overflow')
       document.body.style.removeProperty('pointer-events')
     }
-  }, [open, editData])
+  }, [open, editData, isEditing])
 
   // Update the Reminder default when the activity type changes in create mode.
   // Skipped in edit mode (the persisted value wins), and gated by `open` to

package/src/modules/customers/components/formConfig.tsx

@@ -30,7 +30,7 @@ import {
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { apiCall, apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
-import { PhoneNumberField } from '@open-mercato/ui/backend/inputs/PhoneNumberField'
+import { PhoneNumberField, type PhoneCountry } from '@open-mercato/ui/backend/inputs/PhoneNumberField'
 import { isValidPhoneNumber } from '@open-mercato/shared/lib/phone'
 import type {
   CrudCustomFieldRenderProps,
@@ -59,7 +59,11 @@ import {
   type CustomerDictionaryKind,
 } from '../lib/dictionaries'
 import { normalizeCustomFieldSubmitValue } from './detail/customFieldUtils'
-import { CUSTOMER_PHONE_INVALID_MESSAGE_KEY, CUSTOMER_URL_INVALID_MESSAGE_KEY } from '../data/validators'
+import {
+  CUSTOMER_EMAIL_INVALID_MESSAGE_KEY,
+  CUSTOMER_PHONE_INVALID_MESSAGE_KEY,
+  CUSTOMER_URL_INVALID_MESSAGE_KEY,
+} from '../data/validators'
 
 export const metadata = {
   navHidden: true,
@@ -75,6 +79,17 @@ export type Translator = (
   params?: Record<string, string | number>,
 ) => string
 
+export type CustomerFormFieldOptions = {
+  /** Country pre-selected in the phone field when the value is empty. */
+  defaultCountryIso2?: string
+  /**
+   * Country list for the phone field's selector. Supply it to limit the picker
+   * to specific markets or to name the countries yourself; omitted, the field
+   * localizes its built-in list for the active locale.
+   */
+  phoneCountries?: PhoneCountry[]
+}
+
 export type PersonFormValues = {
   displayName: string
   firstName: string
@@ -124,7 +139,7 @@ type DictionarySelectFieldProps = {
 
 export { CUSTOMER_DICTIONARIES_MANAGE_HREF, getCustomerDictionaryManageHref }
 
-const emailValidationSchema = z.string().email()
+const emailValidationSchema = z.string().email(CUSTOMER_EMAIL_INVALID_MESSAGE_KEY)
 const EMAIL_CHECK_DEBOUNCE_MS = 350
 
 const createSectionHeadingField = (id: string, title: string): CrudField => ({
@@ -418,7 +433,11 @@ const companyDictionaryFieldDefinitions: DictionaryFieldDefinition[] = [
   },
 ]
 
-const createPrimaryPhoneField = (t: Translator, defaultCountryIso2?: string): CrudField => ({
+const createPrimaryPhoneField = (
+  t: Translator,
+  defaultCountryIso2?: string,
+  phoneCountries?: PhoneCountry[],
+): CrudField => ({
   id: 'primaryPhone',
   label: t('customers.people.form.primaryPhone'),
   type: 'custom',
@@ -449,6 +468,7 @@ const createPrimaryPhoneField = (t: Translator, defaultCountryIso2?: string): Cr
         minDigits={7}
         onDuplicateLookup={!disabled && !error ? duplicateLookup : undefined}
         defaultCountryIso2={defaultCountryIso2}
+        countries={phoneCountries}
       />
     )
   },
@@ -723,7 +743,7 @@ export const createPersonFormSchema = () =>
       primaryEmail: z
         .string()
         .trim()
-        .email()
+        .email(CUSTOMER_EMAIL_INVALID_MESSAGE_KEY)
         .optional()
         .or(z.literal(''))
         .transform((val) => (val === '' ? undefined : val)),
@@ -871,8 +891,9 @@ export const createDisplayNameSection = (t: Translator) =>
     )
   }
 
-export const createPersonFormFields = (t: Translator, options?: { defaultCountryIso2?: string }): CrudField[] => {
+export const createPersonFormFields = (t: Translator, options?: CustomerFormFieldOptions): CrudField[] => {
   const defaultCountryIso2 = options?.defaultCountryIso2
+  const phoneCountries = options?.phoneCountries
   const contactSection = createSectionHeadingField('__contactInformationSection', t('customers.people.form.sections.contactInformation'))
   const companySection = createSectionHeadingField('__companyInformationSection', t('customers.people.form.sections.companyInformation'))
   const dictionaryFields: CrudField[] = dictionaryFieldDefinitions.map((definition) => ({
@@ -933,7 +954,7 @@ export const createPersonFormFields = (t: Translator, options?: { defaultCountry
     },
     contactSection,
     createPrimaryEmailField(t),
-    createPrimaryPhoneField(t, defaultCountryIso2),
+    createPrimaryPhoneField(t, defaultCountryIso2, phoneCountries),
     companySection,
     {
       id: 'companyEntityId',
@@ -1141,7 +1162,7 @@ export const createCompanyFormSchema = () =>
       primaryEmail: z
         .string()
         .trim()
-        .email()
+        .email(CUSTOMER_EMAIL_INVALID_MESSAGE_KEY)
         .optional()
         .or(z.literal(''))
         .transform((val) => (val === '' ? undefined : val)),
@@ -1228,8 +1249,9 @@ export const createCompanyFormSchema = () =>
     })
     .passthrough()
 
-export const createCompanyFormFields = (t: Translator, options?: { defaultCountryIso2?: string }): CrudField[] => {
+export const createCompanyFormFields = (t: Translator, options?: CustomerFormFieldOptions): CrudField[] => {
   const defaultCountryIso2 = options?.defaultCountryIso2
+  const phoneCountries = options?.phoneCountries
   const dictionaryFields: CrudField[] = companyDictionaryFieldDefinitions.map((definition) => ({
     id: definition.id,
     label: t(definition.labelKey),
@@ -1276,6 +1298,7 @@ export const createCompanyFormFields = (t: Translator, options?: { defaultCountr
           invalidLabel={t('customers.people.form.primaryPhone.invalid', 'Enter a valid phone number with country code (e.g. +1 212 555 1234)')}
           minDigits={7}
           defaultCountryIso2={defaultCountryIso2}
+          countries={phoneCountries}
         />
       ),
     } as CrudField,
@@ -1569,7 +1592,7 @@ const clearableEmailField = () =>
   z
     .string()
     .trim()
-    .email()
+    .email(CUSTOMER_EMAIL_INVALID_MESSAGE_KEY)
     .optional()
     .or(z.literal(''))
     .transform((val) => (val === '' ? null : val))
@@ -1657,7 +1680,7 @@ const buildIndustryLabels = (t: Translator): DictionarySelectLabels => ({
   manageTitle: t('customers.people.form.dictionary.manage'),
 })
 
-export const createCompanyEditFields = (t: Translator, options?: { defaultCountryIso2?: string }): CrudField[] => {
+export const createCompanyEditFields = (t: Translator, options?: CustomerFormFieldOptions): CrudField[] => {
   const baseFields = createCompanyFormFields(t, options)
   const industryLabels = buildIndustryLabels(t)
 
@@ -1682,7 +1705,7 @@ export const createCompanyEditFields = (t: Translator, options?: { defaultCountr
   })
 }
 
-export const createPersonEditFields = (t: Translator, options?: { defaultCountryIso2?: string }): CrudField[] => {
+export const createPersonEditFields = (t: Translator, options?: CustomerFormFieldOptions): CrudField[] => {
   const baseFields = createPersonFormFields(t, options)
   return [
     ...baseFields,

package/src/modules/customers/data/validators.ts

@@ -6,6 +6,7 @@ import { dictionaryEntrySortModeSchema } from '@open-mercato/core/modules/dictio
 const uuid = () => z.string().uuid()
 
 export const CUSTOMER_PHONE_INVALID_MESSAGE_KEY = 'customers.people.form.primaryPhone.invalid'
+export const CUSTOMER_EMAIL_INVALID_MESSAGE_KEY = 'customers.people.form.primaryEmail.invalid'
 export const CUSTOMER_URL_INVALID_MESSAGE_KEY = 'customers.people.form.websiteUrl.invalid'
 export const ACTIVITY_DATE_REQUIRED_MESSAGE_KEY = 'customers.activities.errors.dateRequired'
 export const ACTIVITY_TIME_REQUIRED_MESSAGE_KEY = 'customers.activities.errors.timeRequired'
@@ -37,7 +38,7 @@ const phoneSchema = z.preprocess(
 
 const clearableEmailSchema = z.preprocess(
   emptyStringToNull,
-  z.string().email().max(320).nullable().optional(),
+  z.string().email(CUSTOMER_EMAIL_INVALID_MESSAGE_KEY).max(320).nullable().optional(),
 )
 
 const clearableUrlSchema = z.preprocess(
@@ -219,8 +220,8 @@ export const activityCreateSchema = scopedSchema.extend({
   activityType: z.string().min(1).max(100),
   subject: z.string().max(200).optional(),
   body: z.string().max(8000).optional(),
-  date: z.string().trim().min(1, ACTIVITY_DATE_REQUIRED_MESSAGE_KEY).optional(),
-  time: z.string().trim().min(1, ACTIVITY_TIME_REQUIRED_MESSAGE_KEY).optional(),
+  date: z.string().trim().min(1, ACTIVITY_DATE_REQUIRED_MESSAGE_KEY).optional().nullable(),
+  time: z.string().trim().min(1, ACTIVITY_TIME_REQUIRED_MESSAGE_KEY).optional().nullable(),
   phoneNumber: interactionPhoneNumberSchema,
   occurredAt: z.coerce.date().optional(),
   dealId: uuid().optional(),
@@ -500,8 +501,10 @@ const interactionCreateBaseSchema = scopedSchema.extend({
   // rows, external writers, and the dispatch-crm MCP keep working. Open/terminal semantics
   // live in lib/interactionStatus.ts, not in this validator.
   status: z.string().max(50).optional().default('planned'),
-  date: z.string().trim().min(1, ACTIVITY_DATE_REQUIRED_MESSAGE_KEY).optional(),
-  time: z.string().trim().min(1, ACTIVITY_TIME_REQUIRED_MESSAGE_KEY).optional(),
+  // Nullable like the sibling `scheduledAt` below: an undated activity (a
+  // backlog task) says "no date" with an explicit null, not by omission (#5941).
+  date: z.string().trim().min(1, ACTIVITY_DATE_REQUIRED_MESSAGE_KEY).optional().nullable(),
+  time: z.string().trim().min(1, ACTIVITY_TIME_REQUIRED_MESSAGE_KEY).optional().nullable(),
   phoneNumber: interactionPhoneNumberSchema,
   scheduledAt: z.coerce.date().optional().nullable(),
   occurredAt: z.coerce.date().optional().nullable(),
@@ -515,7 +518,7 @@ const interactionCreateBaseSchema = scopedSchema.extend({
   ...interactionExtendedFields,
 })
 
-function deriveScheduledAtFromDateTime(date?: string, time?: string): Date | null {
+function deriveScheduledAtFromDateTime(date?: string | null, time?: string | null): Date | null {
   if (!date || typeof date !== 'string') return null
   const trimmedDate = date.trim()
   if (!trimmedDate) return null
@@ -567,8 +570,8 @@ const interactionUpdateBaseSchema = z
         title: z.string().trim().max(500).optional().nullable(),
         body: z.string().trim().max(10000).optional().nullable(),
         status: z.string().max(50).optional(),
-        date: z.string().trim().min(1, ACTIVITY_DATE_REQUIRED_MESSAGE_KEY).optional(),
-        time: z.string().trim().min(1, ACTIVITY_TIME_REQUIRED_MESSAGE_KEY).optional(),
+        date: z.string().trim().min(1, ACTIVITY_DATE_REQUIRED_MESSAGE_KEY).optional().nullable(),
+        time: z.string().trim().min(1, ACTIVITY_TIME_REQUIRED_MESSAGE_KEY).optional().nullable(),
         phoneNumber: interactionPhoneNumberSchema,
         scheduledAt: z.coerce.date().optional().nullable(),
         occurredAt: z.coerce.date().optional().nullable(),
@@ -608,6 +611,9 @@ export const interactionUpdateSchema = interactionUpdateBaseSchema
   // the update doesn't silently leave `scheduled_at` stale.
   .transform((value) => {
     if (value.scheduledAt !== undefined) return value
+    // An explicit `date: null` is how a caller drops the due date; mirror it
+    // onto `scheduledAt` rather than leaving the old timestamp behind (#5941).
+    if (value.date === null) return { ...value, scheduledAt: null }
     if (!value.date && !value.time) return value
     const derived = deriveScheduledAtFromDateTime(value.date, value.time)
     return derived ? { ...value, scheduledAt: derived } : value

package/src/modules/customers/i18n/de.json

@@ -2337,6 +2337,7 @@
   "customers.people.form.phoneDuplicateNotice": "Diese Telefonnummer ist bereits {{name}} zugeordnet.",
   "customers.people.form.preferredName": "Bevorzugter Name",
   "customers.people.form.primaryEmail": "E-Mail",
+  "customers.people.form.primaryEmail.invalid": "Geben Sie eine gültige E-Mail-Adresse ein (z. B. name@beispiel.de)",
   "customers.people.form.primaryEmailPlaceholder": "name@beispiel.de",
   "customers.people.form.primaryPhone": "Telefon",
   "customers.people.form.primaryPhone.invalid": "Enter a valid phone number (digits, spaces, dashes, parentheses)",

package/src/modules/customers/i18n/en.json

@@ -2337,6 +2337,7 @@
   "customers.people.form.phoneDuplicateNotice": "This phone number is already assigned to {{name}}.",
   "customers.people.form.preferredName": "Preferred name",
   "customers.people.form.primaryEmail": "Primary email",
+  "customers.people.form.primaryEmail.invalid": "Enter a valid email address (e.g. name@example.com)",
   "customers.people.form.primaryEmailPlaceholder": "name@example.com",
   "customers.people.form.primaryPhone": "Primary phone",
   "customers.people.form.primaryPhone.invalid": "Enter a valid phone number with country code (e.g. +1 212 555 1234)",

package/src/modules/customers/i18n/es.json

@@ -2337,6 +2337,7 @@
   "customers.people.form.phoneDuplicateNotice": "Este número de teléfono ya está asignado a {{name}}.",
   "customers.people.form.preferredName": "Nombre preferido",
   "customers.people.form.primaryEmail": "Correo electrónico",
+  "customers.people.form.primaryEmail.invalid": "Introduce una dirección de correo electrónico válida (p. ej., nombre@ejemplo.com)",
   "customers.people.form.primaryEmailPlaceholder": "nombre@ejemplo.com",
   "customers.people.form.primaryPhone": "Teléfono",
   "customers.people.form.primaryPhone.invalid": "Enter a valid phone number (digits, spaces, dashes, parentheses)",

package/src/modules/customers/i18n/ko.json

@@ -2337,6 +2337,7 @@
   "customers.people.form.phoneDuplicateNotice": "이 전화번호는 이미 {{name}}에 지정되어 있습니다.",
   "customers.people.form.preferredName": "선호하는 이름",
   "customers.people.form.primaryEmail": "기본 이메일",
+  "customers.people.form.primaryEmail.invalid": "유효한 이메일 주소를 입력하세요 (예: name@example.com)",
   "customers.people.form.primaryEmailPlaceholder": "name@example.com",
   "customers.people.form.primaryPhone": "기본 전화번호",
   "customers.people.form.primaryPhone.invalid": "국가 코드를 포함한 유효한 전화번호를 입력하세요 (예: +1 212 555 1234)",

package/src/modules/customers/i18n/pl.json

@@ -2337,6 +2337,7 @@
   "customers.people.form.phoneDuplicateNotice": "Ten numer telefonu jest już przypisany do {{name}}.",
   "customers.people.form.preferredName": "Preferowane imię",
   "customers.people.form.primaryEmail": "E-mail",
+  "customers.people.form.primaryEmail.invalid": "Wprowadź prawidłowy adres e-mail (np. nazwa@example.com)",
   "customers.people.form.primaryEmailPlaceholder": "nazwa@example.com",
   "customers.people.form.primaryPhone": "Telefon",
   "customers.people.form.primaryPhone.invalid": "Enter a valid phone number (digits, spaces, dashes, parentheses)",