@open-mercato/core 0.6.8-develop.7100.1.fbf66fca35 → 0.7.0

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

@@ -14,7 +14,6 @@ import {
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 import { useAppEvent } from '@open-mercato/ui/backend/injection/useAppEvent'
-import type { AppEventPayload } from '@open-mercato/shared/modules/widgets/injection'
 import type { SectionAction, TabEmptyStateConfig, Translator } from './types'
 import { CreatePersonDialog } from './CreatePersonDialog'
 import { PersonCard } from './PersonCard'
@@ -323,19 +322,13 @@ export function CompanyPeopleSection({
     void loadVisiblePeople()
   }, [loadVisiblePeople])
 
-  const reloadOnCompanyDetach = React.useCallback((event: AppEventPayload) => {
+  useAppEvent('customers.person_company_link.deleted', (event) => {
     const payload = event.payload as { companyEntityId?: string | null } | null | undefined
     if (payload && payload.companyEntityId === companyId) {
       void loadVisiblePeople()
     }
   }, [companyId, loadVisiblePeople])
 
-  useAppEvent('customers.person_company_link.deleted', reloadOnCompanyDetach, [reloadOnCompanyDetach])
-  // Legacy profile-only assignments have no link row, so their detach broadcasts this sibling
-  // event instead of `customers.person_company_link.deleted` (#5114). Without it, other viewers
-  // of the same company keep listing a person who is already gone.
-  useAppEvent('customers.person.company_assignment.detached', reloadOnCompanyDetach, [reloadOnCompanyDetach])
-
   React.useEffect(() => {
     setListPage(1)
   }, [searchQuery, sortMode])

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

@@ -102,12 +102,6 @@ type EntityMultiSelectProps = {
   fetchByIds: (ids: string[]) => Promise<EntityOption[]>
   disabled?: boolean
   autoFocus?: boolean
-  /**
-   * Minimum trimmed query length before a lookup request is issued. Defaults to
-   * `1`, so a blank input never queries the address book (issue #5118). Set `0`
-   * to opt back into prefetching an unfiltered first page on mount.
-   */
-  minQueryLength?: number
 }
 
 const DEAL_ENTITY_IDS = [E.customers.customer_deal]
@@ -359,7 +353,6 @@ function EntityMultiSelect({
   fetchByIds,
   disabled = false,
   autoFocus = false,
-  minQueryLength = 1,
 }: EntityMultiSelectProps) {
   const [input, setInput] = React.useState('')
   const [suggestions, setSuggestions] = React.useState<EntityOption[]>([])
@@ -408,18 +401,11 @@ function EntityMultiSelect({
       setLoading(false)
       return
     }
-    const term = input.trim()
-    if (term.length < minQueryLength) {
-      setSuggestions([])
-      setLoading(false)
-      setError(null)
-      return
-    }
     let cancelled = false
     const handler = window.setTimeout(async () => {
       setLoading(true)
       try {
-        const results = await search(term)
+        const results = await search(input.trim())
         if (cancelled) return
         setSuggestions(results)
         setCache((prev) => {
@@ -443,7 +429,7 @@ function EntityMultiSelect({
       cancelled = true
       window.clearTimeout(handler)
     }
-  }, [disabled, errorLabel, input, minQueryLength, search])
+  }, [disabled, errorLabel, input, search])
 
   const filteredSuggestions = React.useMemo(
     () => suggestions.filter((option) => !normalizedValue.includes(option.id)),
@@ -674,14 +660,12 @@ export function DealPeopleSelector({
   options = [],
   disabled = false,
   autoFocus = false,
-  minQueryLength,
 }: {
   value: string[]
   onChange: (next: string[]) => void
   options?: EntityOption[]
   disabled?: boolean
   autoFocus?: boolean
-  minQueryLength?: number
 }) {
   const t = useT()
   const { searchPeople, fetchPeopleByIds } = useDealAssociationLookups()
@@ -701,7 +685,6 @@ export function DealPeopleSelector({
       fetchByIds={fetchPeopleByIds}
       disabled={disabled}
       autoFocus={autoFocus}
-      minQueryLength={minQueryLength}
     />
   )
 }
@@ -711,13 +694,11 @@ export function DealCompaniesSelector({
   onChange,
   options = [],
   disabled = false,
-  minQueryLength,
 }: {
   value: string[]
   onChange: (next: string[]) => void
   options?: EntityOption[]
   disabled?: boolean
-  minQueryLength?: number
 }) {
   const t = useT()
   const { searchCompanies, fetchCompaniesByIds } = useDealAssociationLookups()
@@ -736,7 +717,6 @@ export function DealCompaniesSelector({
       search={searchCompanies}
       fetchByIds={fetchCompaniesByIds}
       disabled={disabled}
-      minQueryLength={minQueryLength}
     />
   )
 }

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

@@ -12,7 +12,7 @@ import { LinkEntityDialog } from '../linking/LinkEntityDialog'
 import { createDealLinkAdapter } from '../linking/adapters/dealAdapter'
 import { LoadingMessage, TabEmptyState } from '@open-mercato/ui/backend/detail'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
-import { useT, useLocale } from '@open-mercato/shared/lib/i18n/context'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { hasMoreFromPage } from '@open-mercato/shared/lib/pagination/load-more'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { E } from '#generated/entities.ids.generated'
@@ -275,14 +275,9 @@ function normalizeDeal(deal: Partial<DealSummary> & { id: string; title?: string
   }
 }
 
-function formatValueLabel(
-  amount: number | null,
-  currency: string | null,
-  emptyLabel: string,
-  locale?: string,
-): string {
+function formatValueLabel(amount: number | null, currency: string | null, emptyLabel: string): string {
   if (typeof amount === 'number') {
-    const formatter = new Intl.NumberFormat(locale, {
+    const formatter = new Intl.NumberFormat(undefined, {
       style: currency ? 'currency' : 'decimal',
       currency: currency ?? undefined,
       maximumFractionDigits: 2,
@@ -322,7 +317,6 @@ export function DealsSection({
   runGuardedMutation,
 }: DealsSectionProps) {
   const tHook = useT()
-  const locale = useLocale()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const fallbackTranslator = React.useMemo<Translator>(() => createTranslatorWithFallback(tHook), [tHook])
   const t: Translator = React.useMemo(() => translator ?? fallbackTranslator, [translator, fallbackTranslator])
@@ -969,8 +963,8 @@ export function DealsSection({
           ) : null}
           <div className="space-y-4">
             {sortedDeals.map((deal) => {
-          const valueLabel = formatValueLabel(deal.valueAmount, deal.valueCurrency ?? null, emptyLabel, locale)
-          const expectedLabel = deal.expectedCloseAt ? formatDate(deal.expectedCloseAt, locale) ?? emptyLabel : emptyLabel
+          const valueLabel = formatValueLabel(deal.valueAmount, deal.valueCurrency ?? null, emptyLabel)
+          const expectedLabel = deal.expectedCloseAt ? formatDate(deal.expectedCloseAt) ?? emptyLabel : emptyLabel
           const probabilityLabel =
             typeof deal.probability === 'number' ? `${deal.probability}%` : emptyLabel
           const isUnlinkPending = pendingAction?.kind === 'remove' && pendingAction.id === deal.id

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

@@ -6,7 +6,6 @@ import { EmptyState } from '@open-mercato/ui/primitives/empty-state'
 import { VisuallyHidden } from '@radix-ui/react-visually-hidden'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { cn, slugifyTagLabel } from '@open-mercato/shared/lib/utils'
-import { hasMoreFromPage } from '@open-mercato/shared/lib/pagination/load-more'
 import { apiCall, apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
@@ -389,19 +388,8 @@ export function EntityTagsDialog({
   const [creatingKind, setCreatingKind] = React.useState<string | null>(null)
   const [manageTagsOpen, setManageTagsOpen] = React.useState(false)
   const [activeCategoryPage, setActiveCategoryPage] = React.useState(1)
-  // Short-page termination instead of `page < totalPages` — see
-  // `hasMoreFromPage`. Like the page number it belongs to whichever category is
-  // active: the fetch effect below rewrites it on every category, search and
-  // page change, and the reset effect clears it alongside the page so a
-  // category with more entries never leaves the affordance behind on one
-  // without.
-  const [activeCategoryHasMore, setActiveCategoryHasMore] = React.useState(false)
+  const [activeCategoryTotalPages, setActiveCategoryTotalPages] = React.useState(1)
   const [activeCategoryLoading, setActiveCategoryLoading] = React.useState(false)
-  // A transport failure is not an end-of-list signal: it leaves the affordance
-  // in place and turns the next click into a retry of the page that failed,
-  // rather than advancing past it.
-  const [activeCategoryLoadFailed, setActiveCategoryLoadFailed] = React.useState(false)
-  const [activeCategoryReloadToken, setActiveCategoryReloadToken] = React.useState(0)
   const creationInFlightRef = React.useRef<string | null>(null)
   const mutationContextId = React.useMemo(
     () => `customer-tags:${entityType}:${entityId}`,
@@ -725,15 +713,12 @@ export function EntityTagsDialog({
   React.useEffect(() => {
     if (!open) return
     setActiveCategoryPage(1)
-    setActiveCategoryHasMore(false)
-    setActiveCategoryLoadFailed(false)
   }, [activeCategoryKind, open, searchValue])
 
   React.useEffect(() => {
     if (!open || !activeCategoryKindValue || (activeCategorySource !== 'tags' && activeCategorySource !== 'labels')) {
       setActiveCategoryLoading(false)
-      setActiveCategoryHasMore(false)
-      setActiveCategoryLoadFailed(false)
+      setActiveCategoryTotalPages(1)
       return
     }
 
@@ -767,36 +752,16 @@ export function EntityTagsDialog({
       }))
 
     setActiveCategoryLoading(true)
-    void apiCall<{ items?: Array<DictEntry | LabelItem>; page?: number }>(endpoint, {
+    void apiCall<{ items?: Array<DictEntry | LabelItem>; totalPages?: number }>(endpoint, {
       cache: 'no-store',
       headers: { 'x-om-unauthorized-redirect': '0' },
     })
       .then((response) => {
-        if (cancelled) return
-        if (!response.ok) {
-          setActiveCategoryLoadFailed(true)
-          return
-        }
-        setActiveCategoryLoadFailed(false)
-        const servedEntries = Array.isArray(response.result?.items) ? response.result.items : []
-        const fetchedEntries = mapEntries(servedEntries)
-        // The two sources paginate differently. `/api/customers/tags` is a
-        // query-engine list, so a page past the end comes back empty and the
-        // served count alone terminates the sequence. `/api/customers/labels`
-        // clamps the requested page to the last one and re-serves it in full
-        // forever, so short-page termination needs the second half of the
-        // helper's obligation 2: take an echoed page below the one asked for as
-        // the end of the list. Same guard as `AttachmentsSection`, whose
-        // endpoint clamps the same way.
-        const returnedPage =
-          typeof response.result?.page === 'number' ? response.result.page : activeCategoryPage
-        const servedRequestedPage = returnedPage >= activeCategoryPage
-        // Measured on what the endpoint served, before `mergeOptions` folds the
-        // page into the entries already on screen.
-        setActiveCategoryHasMore(
-          servedRequestedPage && hasMoreFromPage(servedEntries.length, REMOTE_CATEGORY_PAGE_SIZE),
+        if (!response.ok || cancelled) return
+        const fetchedEntries = mapEntries(Array.isArray(response.result?.items) ? response.result.items : [])
+        setActiveCategoryTotalPages(
+          typeof response.result?.totalPages === 'number' ? response.result.totalPages : 1,
         )
-        if (!servedRequestedPage) return
         updateCategoryEntries(activeCategoryKindValue, (currentEntries) =>
           activeCategoryPage <= 1
             ? mergeOptions(seedEntries, fetchedEntries)
@@ -805,10 +770,8 @@ export function EntityTagsDialog({
       })
       .catch(() => {
         if (cancelled) return
-        setActiveCategoryLoadFailed(true)
-        if (activeCategoryPage <= 1) {
-          updateCategoryEntries(activeCategoryKindValue, () => seedEntries)
-        }
+        setActiveCategoryTotalPages(1)
+        updateCategoryEntries(activeCategoryKindValue, () => seedEntries)
       })
       .finally(() => {
         if (!cancelled) {
@@ -822,7 +785,6 @@ export function EntityTagsDialog({
   }, [
     activeCategoryKindValue,
     activeCategoryPage,
-    activeCategoryReloadToken,
     activeCategorySource,
     entityId,
     entityOrganizationId,
@@ -1288,23 +1250,15 @@ export function EntityTagsDialog({
                               {t('customers.personTags.loading', 'Loading...')}
                             </div>
                           ) : null}
-                          {(activeCategory.source === 'tags' || activeCategory.source === 'labels') && activeCategoryHasMore ? (
+                          {(activeCategory.source === 'tags' || activeCategory.source === 'labels') && activeCategoryPage < activeCategoryTotalPages ? (
                             <Button
                               type="button"
                               variant="outline"
                               size="sm"
                               className="rounded-lg px-3 text-xs"
-                              onClick={() => {
-                                if (activeCategoryLoadFailed) {
-                                  setActiveCategoryReloadToken((current) => current + 1)
-                                  return
-                                }
-                                setActiveCategoryPage((current) => current + 1)
-                              }}
+                              onClick={() => setActiveCategoryPage((current) => current + 1)}
                             >
-                              {activeCategoryLoadFailed
-                                ? t('customers.personTags.retry', 'Retry')
-                                : t('customers.activities.loadMore', 'Load more')}
+                              {t('customers.activities.loadMore', 'Load more')}
                             </Button>
                           ) : null}
                         </div>

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

@@ -10,7 +10,6 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { useAppEvent } from '@open-mercato/ui/backend/injection/useAppEvent'
-import type { AppEventPayload } from '@open-mercato/shared/modules/widgets/injection'
 import { CompanyCard, type EnrichedCompanyData } from './CompanyCard'
 import { useCustomerDictionary } from './hooks/useCustomerDictionary'
 import { LinkEntityDialog, type LinkEntityOption } from '../linking/LinkEntityDialog'
@@ -370,19 +369,13 @@ export function PersonCompaniesSection({
     [_personName, confirm, loadData, onChanged, personId, runWriteMutation, t, unlinkingId],
   )
 
-  const reloadOnPersonDetach = React.useCallback((event: AppEventPayload) => {
+  useAppEvent('customers.person_company_link.deleted', (event) => {
     const payload = event.payload as { personEntityId?: string | null } | null | undefined
     if (payload && payload.personEntityId === personId) {
       void loadData({ showLoading: false })
     }
   }, [personId, loadData])
 
-  useAppEvent('customers.person_company_link.deleted', reloadOnPersonDetach, [reloadOnPersonDetach])
-  // Legacy profile-only assignments have no link row, so their detach broadcasts this sibling
-  // event instead of `customers.person_company_link.deleted` (#5114). Without it, other viewers
-  // of the same person keep listing a company that is already detached.
-  useAppEvent('customers.person.company_assignment.detached', reloadOnPersonDetach, [reloadOnPersonDetach])
-
   return (
     <>
       <div className="space-y-4">

package/src/modules/customers/components/detail/hooks/usePersonTasks.ts

@@ -7,7 +7,6 @@ import { resolveTodoApiPath } from '../utils'
 import type { TodoLinkSummary } from '../types'
 import { generateTempId } from '@open-mercato/core/modules/customers/lib/detailHelpers'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
-import { hasMoreFromPage } from '@open-mercato/shared/lib/pagination/load-more'
 import { CUSTOMER_INTERACTION_TASK_SOURCE } from '../../../lib/interactionCompatibility'
 
 const DEFAULT_TODO_SOURCE = CUSTOMER_INTERACTION_TASK_SOURCE
@@ -30,15 +29,12 @@ type CustomerTodoRow = {
   createdAt: string
 }
 
-// `/api/customers/todos` also reports `totalPages`, deliberately left out of
-// this type: the load-more affordance terminates on a short page instead — see
-// `hasMoreFromPage`. `total` stays because it feeds the section's count badge,
-// where an under-report is cosmetic rather than a way to strand rows.
 type CustomerTodosResponse = {
   items: CustomerTodoRow[]
   total: number
   page: number
   pageSize: number
+  totalPages: number
 }
 
 export type TaskFormPayload = {
@@ -176,9 +172,9 @@ export function usePersonTasks({
   pageSize = 20,
 }: UsePersonTasksOptions): UsePersonTasksResult {
   const [tasks, setTasks] = React.useState<TodoLinkSummary[]>(initialTasks)
-  const [pageInfo, setPageInfo] = React.useState<{ page: number; hasMore: boolean; total: number }>({
+  const [pageInfo, setPageInfo] = React.useState<{ page: number; totalPages: number; total: number }>({
     page: 1,
-    hasMore: false,
+    totalPages: 1,
     total: initialTasks.length,
   })
   const [isInitialLoading, setIsInitialLoading] = React.useState<boolean>(() => Boolean(entityId))
@@ -191,18 +187,12 @@ export function usePersonTasks({
     const mapped = Array.isArray(payload.items) ? payload.items.map(mapRowToSummary) : []
     setPageInfo({
       page: payload.page ?? 1,
-      // Short-page termination instead of `page < totalPages` — see
-      // `hasMoreFromPage`. `mapRowToSummary` is a 1:1 map and the `mergeUnique`
-      // dedupe happens after this, so `mapped.length` is what the server served.
-      // Measured against the page size the server echoed rather than the one
-      // requested, so a page size the endpoint narrows server-side cannot make a
-      // full page read as short and silently end the sequence.
-      hasMore: hasMoreFromPage(mapped.length, payload.pageSize ?? pageSize),
+      totalPages: payload.totalPages ?? 0,
       total: payload.total ?? mapped.length,
     })
     setError(null)
     return mapped
-  }, [pageSize])
+  }, [])
 
   const fetchPage = React.useCallback(
     async (page: number): Promise<CustomerTodosResponse> => {
@@ -212,6 +202,7 @@ export function usePersonTasks({
           total: 0,
           page: 1,
           pageSize,
+          totalPages: 1,
         }
       }
       const params = new URLSearchParams({
@@ -231,7 +222,7 @@ export function usePersonTasks({
   const refresh = React.useCallback(async () => {
     if (!entityId) {
       setTasks([])
-      setPageInfo({ page: 1, hasMore: false, total: 0 })
+      setPageInfo({ page: 1, totalPages: 1, total: 0 })
       return
     }
     setIsInitialLoading(true)
@@ -251,7 +242,7 @@ export function usePersonTasks({
   const loadMore = React.useCallback(async () => {
     if (!entityId) return
     if (isLoadingMore) return
-    if (!pageInfo.hasMore) return
+    if (pageInfo.page >= pageInfo.totalPages) return
     setIsLoadingMore(true)
     try {
       const payload = await fetchPage(pageInfo.page + 1)
@@ -264,12 +255,12 @@ export function usePersonTasks({
     } finally {
       setIsLoadingMore(false)
     }
-  }, [entityId, fetchPage, isLoadingMore, mapResponse, pageInfo.hasMore, pageInfo.page])
+  }, [entityId, fetchPage, isLoadingMore, mapResponse, pageInfo.page, pageInfo.totalPages])
 
   React.useEffect(() => {
     if (!entityId) {
       setTasks([])
-      setPageInfo({ page: 1, hasMore: false, total: 0 })
+      setPageInfo({ page: 1, totalPages: 1, total: 0 })
       setError(null)
       setIsInitialLoading(false)
       return
@@ -277,7 +268,7 @@ export function usePersonTasks({
     setTasks(initialTasks)
     setPageInfo({
       page: 1,
-      hasMore: false,
+      totalPages: 1,
       total: initialTasks.length,
     })
     setError(null)
@@ -351,7 +342,7 @@ export function usePersonTasks({
         setTasks((prev) => [newTask, ...prev])
         setPageInfo((prev) => ({
           page: 1,
-          hasMore: prev.hasMore,
+          totalPages: prev.totalPages,
           total: prev.total + 1,
         }))
         await refresh()
@@ -475,7 +466,7 @@ export function usePersonTasks({
         setTasks((prev) => prev.filter((item) => item.id !== task.id))
         setPageInfo((prev) => ({
           page: prev.page,
-          hasMore: prev.hasMore,
+          totalPages: prev.totalPages,
           total: Math.max(0, prev.total - 1),
         }))
       } finally {
@@ -485,7 +476,7 @@ export function usePersonTasks({
     [],
   )
 
-  const hasMore = entityId != null && pageInfo.hasMore
+  const hasMore = entityId != null && pageInfo.page < pageInfo.totalPages
 
   return {
     tasks,

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

@@ -173,7 +173,7 @@ interface ParticipantsFieldProps {
   activityType: ActivityType
   participants: Participant[]
   setParticipants: React.Dispatch<React.SetStateAction<Participant[]>>
-  removeParticipant: (index: number) => void
+  removeParticipant: (userId: string) => void
   guestPermissions: { canInviteOthers: boolean; canModify: boolean; canSeeList: boolean }
   setGuestPermissions: React.Dispatch<React.SetStateAction<{ canInviteOthers: boolean; canModify: boolean; canSeeList: boolean }>>
 }
@@ -205,19 +205,19 @@ export function ParticipantsField({
         {sectionLabel}
       </label>
       <div className="mt-2.5 flex flex-wrap content-center items-center gap-2 rounded-lg border border-border bg-background px-3 py-2.5">
-        {participants.map((p, index) => (
-          <div key={p.userId ?? p.email ?? index} className="inline-flex items-center gap-1.5 rounded-full border border-border bg-muted px-2.5 py-1.5">
+        {participants.map((p) => (
+          <div key={p.userId} className="inline-flex items-center gap-1.5 rounded-full border border-border bg-muted px-2.5 py-1.5">
             <span className={cn('inline-flex size-5 items-center justify-center rounded-full text-xs font-bold text-white', p.color ?? 'bg-primary')}>
               {p.name.charAt(0).toUpperCase()}
             </span>
             <span className="text-xs text-foreground">{p.name}</span>
-            <IconButton type="button" variant="ghost" size="sm" onClick={() => removeParticipant(index)} className="h-auto text-muted-foreground hover:text-foreground p-0" aria-label={t('customers.schedule.removeParticipant', 'Remove participant')}>
+            <IconButton type="button" variant="ghost" size="sm" onClick={() => removeParticipant(p.userId)} className="h-auto text-muted-foreground hover:text-foreground p-0" aria-label={t('customers.schedule.removeParticipant', 'Remove participant')}>
               <X className="size-3" />
             </IconButton>
           </div>
         ))}
         <ParticipantSearchPopover
-          existingIds={new Set(participants.map((p) => p.userId).filter((userId): userId is string => Boolean(userId)))}
+          existingIds={new Set(participants.map((p) => p.userId))}
           onAdd={(p) => setParticipants((prev) => [...prev, { ...p, status: 'pending' as RsvpStatus }])}
           onAddMany={(nextParticipants) => {
             setParticipants((prev) => [

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

@@ -4,7 +4,7 @@ import type { ActivityType } from './fieldConfig'
 export type RsvpStatus = 'pending' | 'accepted' | 'declined' | 'tentative'
 
 export type Participant = {
-  userId?: string
+  userId: string
   name: string
   email?: string
   color?: string
@@ -36,7 +36,7 @@ export type ScheduleActivityEditData = {
   allDay?: boolean | null
   recurrenceRule?: string | null
   recurrenceEnd?: string | null
-  participants?: Array<{ userId?: string; name?: string; email?: string; status?: string }> | null
+  participants?: Array<{ userId: string; name?: string; email?: string; status?: string }> | null
   reminderMinutes?: number | null
   visibility?: string | null
   linkedEntities?: Array<{ id: string; type: string; label: string }> | null
@@ -136,7 +136,7 @@ export function useScheduleFormState({ open, editData }: UseScheduleFormStatePar
           Array.isArray(editData.participants)
             ? editData.participants.map((p, i) => ({
                 userId: p.userId,
-                name: p.name ?? p.email ?? p.userId ?? '',
+                name: p.name ?? p.userId,
                 email: p.email,
                 color: PARTICIPANT_COLORS[i % PARTICIPANT_COLORS.length],
                 status: (p.status ?? 'pending') as RsvpStatus,
@@ -219,8 +219,8 @@ export function useScheduleFormState({ open, editData }: UseScheduleFormStatePar
     setReminderMinutes(DEFAULT_REMINDER_MINUTES[activityType])
   }, [activityType, editData, open])
 
-  const removeParticipant = React.useCallback((index: number) => {
-    setParticipants((prev) => prev.filter((_, i) => i !== index))
+  const removeParticipant = React.useCallback((userId: string) => {
+    setParticipants((prev) => prev.filter((p) => p.userId !== userId))
   }, [])
 
   const toggleRecurrenceDay = React.useCallback((index: number) => {

package/src/modules/customers/components/detail/types.ts

@@ -144,7 +144,7 @@ export type InteractionSummary = {
   authorEmail?: string | null
   dealTitle?: string | null
   customValues?: Record<string, unknown> | null
-  participants?: Array<{ userId?: string; name?: string; email?: string; status?: string }> | null
+  participants?: Array<{ userId: string; name?: string; email?: string; status?: string }> | null
   reminderMinutes?: number | null
   visibility?: string | null
   linkedEntities?: Array<{ id: string; type: string; label: string }> | null

package/src/modules/customers/components/detail/utils.ts

@@ -5,16 +5,11 @@ import type { CustomerDictionaryKind } from '../../lib/dictionaries'
 import { CUSTOMER_INTERACTION_TASK_SOURCE, CUSTOMER_INTERACTION_TASK_TYPE } from '../../lib/interactionCompatibility'
 
 
-/**
- * Pass `locale` to format in the application locale (`useLocale()` in client components).
- * Omitting it keeps the runtime default, which varies per machine and is therefore not
- * assertable in tests.
- */
-export function formatDate(value?: string | null, locale?: string): string | null {
+export function formatDate(value?: string | null): string | null {
   if (!value) return null
   const date = new Date(value)
   if (Number.isNaN(date.getTime())) return null
-  return date.toLocaleDateString(locale)
+  return date.toLocaleDateString()
 }
 
 export function formatTemplate(template: string, params?: Record<string, string | number>): string {
@@ -153,20 +148,15 @@ export function createDictionarySelectLabels(
   }
 }
 
-/**
- * Pass `locale` to format in the application locale (`useLocale()` in client components).
- * Omitting it keeps the runtime default, which varies per machine and is therefore not
- * assertable in tests.
- */
-export function formatCurrency(amount: number, currency?: string | null, locale?: string): string {
+export function formatCurrency(amount: number, currency?: string | null): string {
   try {
-    return new Intl.NumberFormat(locale, {
+    return new Intl.NumberFormat(undefined, {
       style: 'currency',
       currency: currency || 'PLN',
       maximumFractionDigits: 0,
     }).format(amount)
   } catch {
-    return `${amount.toLocaleString(locale)} ${currency || 'PLN'}`
+    return `${amount.toLocaleString()} ${currency || 'PLN'}`
   }
 }
 

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

@@ -650,7 +650,7 @@ export class CustomerInteraction {
   recurrenceEnd?: Date | null
 
   @Property({ name: 'participants', type: 'jsonb', nullable: true })
-  participants?: Array<{ userId?: string; name?: string; email?: string; status?: string }> | null
+  participants?: Array<{ userId: string; name?: string; email?: string; status?: string }> | null
 
   @Property({ name: 'reminder_minutes', type: 'int', nullable: true })
   reminderMinutes?: number | null