@open-mercato/core 0.6.4-develop.4382.1.6b4f656b77 → 0.6.4

package/src/modules/sales/components/channels/ChannelOfferForm.tsx

@@ -7,8 +7,11 @@ import { CrudForm, type CrudField, type CrudFormGroup, type CrudFormGroupCompone
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
 import { createCrud, updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { createCrudFormError, type CrudServerFieldErrors } from '@open-mercato/ui/backend/utils/serverErrors'
-import { readApiResultOrThrow, apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { readApiResultOrThrow, apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader, extractOptimisticLockConflict } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
+import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
 import {
@@ -41,6 +44,8 @@ type PriceOverrideDraft = {
   currencyCode?: string | null
   displayMode?: 'including-tax' | 'excluding-tax' | null
   amount?: string
+  /** The price row's version, for the per-price optimistic-lock header (#2332). */
+  updatedAt?: string | null
 }
 
 export type OfferFormValues = {
@@ -51,6 +56,7 @@ export type OfferFormValues = {
   defaultMediaId?: string | null
   isActive: boolean
   priceOverrides: PriceOverrideDraft[]
+  updatedAt?: string | null
 } & Record<string, unknown>
 
 type ChannelOfferFormProps = {
@@ -131,6 +137,7 @@ export function ChannelOfferForm({ channelId: lockedChannelId, offerId, mode }:
     : null)
   const [loading, setLoading] = React.useState(mode === 'edit')
   const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   const [priceKinds, setPriceKinds] = React.useState<PriceKindSummary[]>([])
   const [mediaOptions, setMediaOptions] = React.useState<MediaOption[]>([])
   const attachmentCache = React.useRef<Map<string, MediaOption[]>>(new Map())
@@ -141,13 +148,15 @@ export function ChannelOfferForm({ channelId: lockedChannelId, offerId, mode }:
   const variantMediaCache = React.useRef<Map<string, VariantThumbnailInfo>>(new Map())
   const [selectedChannelId, setSelectedChannelId] = React.useState<string | null>(lockedChannelId ?? null)
   const manualMediaSelections = React.useRef<Set<string>>(new Set())
-  const initialPriceIdsRef = React.useRef<Set<string>>(new Set())
+  // Map of the loaded price-override id → its `updatedAt`, so deletes during the
+  // offer save can send the price's own optimistic-lock version (#2332).
+  const initialPriceVersionsRef = React.useRef<Map<string, string | null>>(new Map())
   const [currentProductId, setCurrentProductId] = React.useState<string | null>(null)
   React.useEffect(() => {
     if (initialValues) {
-      initialPriceIdsRef.current = collectPriceIds(initialValues.priceOverrides)
+      initialPriceVersionsRef.current = collectPriceVersions(initialValues.priceOverrides)
     } else {
-      initialPriceIdsRef.current = new Set()
+      initialPriceVersionsRef.current = new Map()
     }
   }, [initialValues])
   const channelOffersHref = React.useMemo(
@@ -284,6 +293,7 @@ export function ChannelOfferForm({ channelId: lockedChannelId, offerId, mode }:
     async function loadOffer() {
       setLoading(true)
       setError(null)
+      setIsNotFound(false)
       try {
         const payload = await readApiResultOrThrow<OfferResponse>(
           `/api/catalog/offers?id=${encodeURIComponent(offerKey)}&pageSize=1`,
@@ -291,7 +301,10 @@ export function ChannelOfferForm({ channelId: lockedChannelId, offerId, mode }:
           { errorMessage: t('sales.channels.offers.errors.loadOffer', 'Failed to load offer.') },
         )
         const offer = Array.isArray(payload.items) ? payload.items[0] : null
-        if (!offer) throw new Error(t('sales.channels.offers.errors.notFound', 'Offer not found.'))
+        if (!offer) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         const values = mapOfferToFormValues(offer, lockedChannelId)
         const pricePayload = await readApiResultOrThrow<PriceResponse>(
           `/api/catalog/prices?offerId=${encodeURIComponent(offer.id as string)}&pageSize=${MAX_LIST_PAGE_SIZE}`,
@@ -438,12 +451,16 @@ export function ChannelOfferForm({ channelId: lockedChannelId, offerId, mode }:
     if (!priceId) return true
     if (mode !== 'edit') return true
     try {
-      await deleteCrud('catalog/prices', priceId, {
-        errorMessage: t('sales.channels.offers.errors.removePrice', 'Failed to remove price override.'),
-      })
-      initialPriceIdsRef.current.delete(priceId)
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(draft.updatedAt),
+        () => deleteCrud('catalog/prices', priceId, {
+          errorMessage: t('sales.channels.offers.errors.removePrice', 'Failed to remove price override.'),
+        }),
+      )
+      initialPriceVersionsRef.current.delete(priceId)
       return true
     } catch (err) {
+      if (surfaceRecordConflict(err, t)) return false
       console.error('sales.channels.pricing.remove', err)
       flash(t('sales.channels.offers.errors.removePrice', 'Failed to remove price override.'), 'error')
       return false
@@ -594,10 +611,11 @@ export function ChannelOfferForm({ channelId: lockedChannelId, offerId, mode }:
     }
     const submittedPriceIds = collectPriceIds(overrides)
     const deletedIdSet = new Set<string>()
-    initialPriceIdsRef.current.forEach((id) => {
+    initialPriceVersionsRef.current.forEach((_version, id) => {
       if (!submittedPriceIds.has(id)) deletedIdSet.add(id)
     })
     const deletedIds = Array.from(deletedIdSet)
+    const deletedVersions = new Map(deletedIds.map((id) => [id, initialPriceVersionsRef.current.get(id) ?? null]))
     let savedId = offerId ?? null
     try {
       if (mode === 'create') {
@@ -612,6 +630,13 @@ export function ChannelOfferForm({ channelId: lockedChannelId, offerId, mode }:
         savedId = offerId
       }
     } catch (err) {
+      // Let an optimistic-lock 409 propagate untouched so CrudForm's
+      // extractOptimisticLockConflict still sees the top-level `code` /
+      // `currentUpdatedAt` / `expectedUpdatedAt` and surfaces the unified
+      // conflict bar. Re-wrapping via createCrudFormError below would drop them.
+      if (extractOptimisticLockConflict(err)) {
+        throw err
+      }
       const details = (err as { details?: unknown })?.details
       const rawFieldErrors = (err as { fieldErrors?: unknown })?.fieldErrors
       const fieldErrors = rawFieldErrors && typeof rawFieldErrors === 'object'
@@ -634,15 +659,16 @@ export function ChannelOfferForm({ channelId: lockedChannelId, offerId, mode }:
       await syncPriceOverrides({
         overrides,
         deletedIds,
+        deletedVersions,
         offerId: savedId,
         channelId,
         productId,
       })
-      initialPriceIdsRef.current = submittedPriceIds
+      initialPriceVersionsRef.current = collectPriceVersions(overrides)
     }
     flash(t('sales.channels.offers.messages.saved', 'Offer saved.'), 'success')
     router.push(buildChannelOffersHref(channelId))
-  }, [attachmentCache, initialPriceIdsRef, lockedChannelId, mode, offerId, router, selectedChannelId, t])
+  }, [attachmentCache, lockedChannelId, mode, offerId, router, selectedChannelId, t])
 
   const handleDelete = React.useCallback(async () => {
     if (!offerId) return
@@ -654,13 +680,19 @@ export function ChannelOfferForm({ channelId: lockedChannelId, offerId, mode }:
     router.push(buildChannelOffersHref(targetChannel))
   }, [initialValues?.channelId, lockedChannelId, offerId, router, t])
 
+  if (isNotFound) {
+    return (
+      <RecordNotFoundState
+        label={t('sales.channels.offers.errors.notFound', 'Offer not found.')}
+        backHref={channelOffersHref}
+        backLabel={t('sales.channels.offers.actions.backToList', 'Back to offers')}
+      />
+    )
+  }
+
   return (
     <div>
-      {error ? (
-        <div className="mb-4 rounded border border-destructive/40 bg-destructive/10 px-4 py-3 text-sm text-destructive">
-          {error}
-        </div>
-      ) : null}
+      {error ? <ErrorMessage label={error} className="mb-4" /> : null}
       <CrudForm<OfferFormValues>
         title={mode === 'create'
           ? t('sales.channels.offers.form.createTitle', 'Create offer')
@@ -669,6 +701,7 @@ export function ChannelOfferForm({ channelId: lockedChannelId, offerId, mode }:
         fields={fields}
         groups={groups}
         initialValues={initialValues ?? undefined}
+        optimisticLockUpdatedAt={initialValues?.updatedAt}
         isLoading={loading}
         loadingMessage={t('sales.channels.offers.form.loading', 'Loading offer…')}
         submitLabel={mode === 'create'
@@ -706,6 +739,11 @@ function mapOfferToFormValues(item: Record<string, unknown>, lockedChannelId?: s
         : null,
     isActive: item.isActive === true || item.is_active === true,
     priceOverrides: [],
+    updatedAt: typeof item.updatedAt === 'string'
+      ? item.updatedAt
+      : typeof item.updated_at === 'string'
+        ? item.updated_at
+        : null,
   }
   mergeCustomFieldValues(values, item)
   return values
@@ -742,6 +780,11 @@ function mapPriceRow(row: Record<string, unknown>): PriceOverrideDraft {
           : typeof row.unit_price_gross === 'string'
             ? row.unit_price_gross
             : '',
+    updatedAt: typeof row.updatedAt === 'string'
+      ? row.updatedAt
+      : typeof row.updated_at === 'string'
+        ? row.updated_at
+        : null,
   }
 }
 
@@ -753,6 +796,17 @@ function collectPriceIds(source: PriceOverrideDraft[] | null | undefined): Set<s
   return new Set(ids)
 }
 
+function collectPriceVersions(source: PriceOverrideDraft[] | null | undefined): Map<string, string | null> {
+  const versions = new Map<string, string | null>()
+  if (!Array.isArray(source)) return versions
+  for (const entry of source) {
+    if (typeof entry?.priceId === 'string' && entry.priceId) {
+      versions.set(entry.priceId, typeof entry.updatedAt === 'string' ? entry.updatedAt : null)
+    }
+  }
+  return versions
+}
+
 function mergeCustomFieldValues(target: Record<string, unknown>, source: Record<string, unknown> | null | undefined) {
   Object.assign(target, extractCustomFieldEntries(source ?? {}))
 }
@@ -766,11 +820,12 @@ function buildChannelOffersHref(channelId?: string | null): string {
 async function syncPriceOverrides(params: {
   overrides: PriceOverrideDraft[]
   deletedIds: string[]
+  deletedVersions: Map<string, string | null>
   offerId: string
   channelId: string
   productId: string
 }) {
-  const { overrides, deletedIds, offerId, channelId, productId } = params
+  const { overrides, deletedIds, deletedVersions, offerId, channelId, productId } = params
   for (const draft of overrides) {
     if (!draft.priceKindId || !draft.amount) continue
     const amount = Number(draft.amount)
@@ -788,7 +843,14 @@ async function syncPriceOverrides(params: {
       payload.unitPriceNet = amount
     }
     if (draft.priceId) {
-      await updateCrud('catalog/prices', { id: draft.priceId, ...payload })
+      // Send the PRICE's own version, overriding the offer header the parent
+      // CrudForm submit scope put on the stack (otherwise the price guard would
+      // compare the offer's `updated_at` and 409 falsely). #2332.
+      const priceId = draft.priceId
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(draft.updatedAt),
+        () => updateCrud('catalog/prices', { id: priceId, ...payload }),
+      )
     } else {
       await createCrud('catalog/prices', payload)
     }
@@ -799,7 +861,10 @@ async function syncPriceOverrides(params: {
   for (const id of uniqueDeletedIds) {
     if (!id) continue
     try {
-      await deleteCrud('catalog/prices', id)
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(deletedVersions.get(id) ?? null),
+        () => deleteCrud('catalog/prices', id),
+      )
     } catch (err) {
       console.error('catalog.prices.delete', err)
     }

package/src/modules/sales/components/channels/SalesChannelOffersPanel.tsx

@@ -9,8 +9,10 @@ import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { mapOfferRow, renderOfferPriceSummary, type OfferRow } from './offerTableUtils'
 
@@ -123,13 +125,17 @@ export function SalesChannelOffersPanel({ channelId, channelName }: { channelId:
 
   const handleDelete = React.useCallback(async (row: OfferRow) => {
     try {
-      await deleteCrud('catalog/offers', row.id, {
-        errorMessage: t('sales.channels.offers.errors.delete', 'Failed to delete offer.'),
-      })
+      await withScopedApiRequestHeaders(buildOptimisticLockHeader(row.updatedAt), () =>
+        deleteCrud('catalog/offers', row.id, {
+          errorMessage: t('sales.channels.offers.errors.delete', 'Failed to delete offer.'),
+        }),
+      )
       flash(t('sales.channels.offers.messages.deleted', 'Offer deleted.'), 'success')
       setReloadToken((token) => token + 1)
     } catch (err) {
+      if (surfaceRecordConflict(err, t)) return
       console.error('sales.channels.offers.delete', err)
+      flash(t('sales.channels.offers.errors.delete', 'Failed to delete offer.'), 'error')
     }
   }, [t])
 

package/src/modules/sales/components/documents/AddressesSection.tsx

@@ -4,7 +4,8 @@
 
 import * as React from 'react'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { apiCall, apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, apiCallOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { createCrud } from '@open-mercato/ui/backend/utils/crud'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { ErrorMessage, LoadingMessage, TabEmptyState } from '@open-mercato/ui/backend/detail'
@@ -156,6 +157,12 @@ function mapApiAddress(item: Record<string, unknown>, format: AddressFormatStrat
   return { id, label, summary, value, name: name || null, purpose: purpose || null }
 }
 
+function mergeAddressOption(options: AddressOption[], selected: AddressOption | null): AddressOption[] {
+  if (!selected) return options
+  if (options.some((option) => option.id === selected.id)) return options
+  return [selected, ...options]
+}
+
 function draftFromDocumentAddress(entry: DocumentAddressAssignment): AddressEditorDraft {
   return {
     name: entry.name ?? '',
@@ -447,10 +454,43 @@ export function SalesDocumentAddressesSection({
     [addressFormat, t]
   )
 
+  const loadAddressOptionById = React.useCallback(
+    async (addressId: string): Promise<AddressOption | null> => {
+      const call = await apiCall<{ items?: Array<Record<string, unknown>> }>(
+        `/api/customers/addresses?id=${encodeURIComponent(addressId)}&pageSize=1`
+      )
+      const items = Array.isArray(call.result?.items) ? call.result.items : []
+      return (
+        items
+          .map((item) => mapApiAddress(item, addressFormat))
+          .find((entry): entry is AddressOption => entry?.id === addressId) ?? null
+      )
+    },
+    [addressFormat]
+  )
+
   React.useEffect(() => {
     loadAddresses(customerId).catch(() => {})
   }, [customerId, loadAddresses])
 
+  React.useEffect(() => {
+    const selectedIds = [shippingAddressIdState, billingAddressIdState].filter(
+      (id): id is string => typeof id === 'string' && id.length > 0
+    )
+    const missingIds = selectedIds.filter((id) => !addressOptions.some((option) => option.id === id))
+    if (!missingIds.length) return
+    Promise.all(missingIds.map((id) => loadAddressOptionById(id).catch(() => null)))
+      .then((selectedOptions) => {
+        setAddressOptions((current) =>
+          selectedOptions.reduce(
+            (next, selected) => mergeAddressOption(next, selected),
+            current
+          )
+        )
+      })
+      .catch(() => {})
+  }, [addressOptions, billingAddressIdState, loadAddressOptionById, shippingAddressIdState])
+
   const guardLocked = React.useCallback(() => {
     if (!locked) return false
     if (lockedReason) {
@@ -691,14 +731,17 @@ export function SalesDocumentAddressesSection({
       }
       await runGuardedMutation(
         () =>
-          apiCallOrThrow(
-            '/api/sales/document-addresses',
-            {
-              method: 'PUT',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify(payload),
-            },
-            { errorMessage: t('sales.documents.detail.addresses.saveError', 'Failed to update addresses.') },
+          // TODO(#2373-C): thread document updatedAt
+          withScopedApiRequestHeaders(buildOptimisticLockHeader(undefined), () =>
+            apiCallOrThrow(
+              '/api/sales/document-addresses',
+              {
+                method: 'PUT',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(payload),
+              },
+              { errorMessage: t('sales.documents.detail.addresses.saveError', 'Failed to update addresses.') },
+            ),
           ),
         payload,
       )
@@ -750,14 +793,17 @@ export function SalesDocumentAddressesSection({
         const payload = { id, documentId, documentKind: kind }
         await runGuardedMutation(
           () =>
-            apiCallOrThrow(
-              '/api/sales/document-addresses',
-              {
-                method: 'DELETE',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify(payload),
-              },
-              { errorMessage: t('sales.documents.detail.addresses.deleteError', 'Failed to remove address.') },
+            // TODO(#2373-C): thread document updatedAt
+            withScopedApiRequestHeaders(buildOptimisticLockHeader(undefined), () =>
+              apiCallOrThrow(
+                '/api/sales/document-addresses',
+                {
+                  method: 'DELETE',
+                  headers: { 'Content-Type': 'application/json' },
+                  body: JSON.stringify(payload),
+                },
+                { errorMessage: t('sales.documents.detail.addresses.deleteError', 'Failed to remove address.') },
+              ),
             ),
           payload,
         )
@@ -849,14 +895,17 @@ export function SalesDocumentAddressesSection({
       const endpoint = kind === 'order' ? '/api/sales/orders' : '/api/sales/quotes'
       const call = await runGuardedMutation(
         () =>
-          apiCallOrThrow<Record<string, unknown>>(
-            endpoint,
-            {
-              method: 'PUT',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify(payload),
-            },
-            { errorMessage: t('sales.documents.detail.updateError', 'Failed to update document.') },
+          // TODO(#2373-C): thread document updatedAt
+          withScopedApiRequestHeaders(buildOptimisticLockHeader(undefined), () =>
+            apiCallOrThrow<Record<string, unknown>>(
+              endpoint,
+              {
+                method: 'PUT',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(payload),
+              },
+              { errorMessage: t('sales.documents.detail.updateError', 'Failed to update document.') },
+            ),
           ),
         payload,
       )
@@ -909,29 +958,48 @@ export function SalesDocumentAddressesSection({
     options: AddressOption[],
     onChange: (next: string | null) => void,
     disabled: boolean
-  ) => (
-    <Select value={value || undefined} onValueChange={(next) => onChange(next || null)} disabled={disabled}>
-      <SelectTrigger>
-        <SelectValue
-          placeholder={
-            addressesLoading
-              ? t('sales.documents.form.address.loading', 'Loading addresses…')
-              : t('sales.documents.form.address.placeholder', 'Select address')
-          }
-        />
-      </SelectTrigger>
-      <SelectContent>
-        {options.map((addr) => {
-          const optionLabel = addr.summary ? `${addr.label} — ${addr.summary}` : addr.label
-          return (
-            <SelectItem key={addr.id} value={addr.id}>
-              {optionLabel}
-            </SelectItem>
-          )
-        })}
-      </SelectContent>
-    </Select>
-  )
+  ) => {
+    const selectedOption = options.find((addr) => addr.id === value) ?? null
+    const selectedLabel = selectedOption
+      ? selectedOption.summary
+        ? `${selectedOption.label} — ${selectedOption.summary}`
+        : selectedOption.label
+      : null
+    const optionsKey = options
+      .map((addr) => `${addr.id}:${addr.summary ? `${addr.label} — ${addr.summary}` : addr.label}`)
+      .join('\0')
+
+    return (
+      <Select
+        key={`address:${value}:${optionsKey}`}
+        value={value || undefined}
+        onValueChange={(next) => onChange(next || null)}
+        disabled={disabled}
+      >
+        <SelectTrigger>
+          <SelectValue
+            placeholder={
+              addressesLoading
+                ? t('sales.documents.form.address.loading', 'Loading addresses…')
+                : t('sales.documents.form.address.placeholder', 'Select address')
+            }
+          >
+            {selectedLabel ?? undefined}
+          </SelectValue>
+        </SelectTrigger>
+        <SelectContent>
+          {options.map((addr) => {
+            const optionLabel = addr.summary ? `${addr.label} — ${addr.summary}` : addr.label
+            return (
+              <SelectItem key={addr.id} value={addr.id}>
+                {optionLabel}
+              </SelectItem>
+            )
+          })}
+        </SelectContent>
+      </Select>
+    )
+  }
 
   return (
     <div className="space-y-4">

package/src/modules/sales/components/documents/AdjustmentDialog.tsx

@@ -120,6 +120,33 @@ const formatTaxRateLabel = (rate: TaxRateOption): string => {
   return `${rate.name} • ${extras.join(' · ')}`
 }
 
+const mapTaxRateOption = (item: Record<string, unknown>): TaxRateOption | null => {
+  const id = typeof item.id === 'string' ? item.id : null
+  const name =
+    typeof item.name === 'string' && item.name.trim().length
+      ? item.name.trim()
+      : typeof item.code === 'string'
+        ? item.code
+        : null
+  if (!id || !name) return null
+  const rate = normalizeNumber((item as any).rate)
+  const code =
+    typeof (item as any).code === 'string' && (item as any).code.trim().length
+      ? (item as any).code.trim()
+      : null
+  const isDefault = Boolean((item as any).isDefault ?? (item as any).is_default)
+  return { id, name, code, rate: Number.isFinite(rate) ? rate : null, isDefault }
+}
+
+const mergeTaxRateOptions = (
+  options: TaxRateOption[],
+  selected: TaxRateOption | null,
+): TaxRateOption[] => {
+  if (!selected) return options
+  if (options.some((option) => option.id === selected.id)) return options
+  return [selected, ...options]
+}
+
 const roundAmount = (value: number): number => Math.round((value + Number.EPSILON) * 100) / 100
 
 const resolveModeFromAdjustment = (adjustment?: AdjustmentRowData | null): 'rate' | 'amount' => {
@@ -214,23 +241,7 @@ export function AdjustmentDialog({
       )
       const items = Array.isArray(response.result?.items) ? response.result.items : []
       const parsed = items
-        .map<TaxRateOption | null>((item) => {
-          const id = typeof item.id === 'string' ? item.id : null
-          const name =
-            typeof item.name === 'string' && item.name.trim().length
-              ? item.name.trim()
-              : typeof item.code === 'string'
-                ? item.code
-                : null
-          if (!id || !name) return null
-          const rate = normalizeNumber((item as any).rate)
-          const code =
-            typeof (item as any).code === 'string' && (item as any).code.trim().length
-              ? (item as any).code.trim()
-              : null
-          const isDefault = Boolean((item as any).isDefault ?? (item as any).is_default)
-          return { id, name, code, rate: Number.isFinite(rate) ? rate : null, isDefault }
-        })
+        .map<TaxRateOption | null>((item) => mapTaxRateOption(item))
         .filter((entry): entry is TaxRateOption => Boolean(entry))
       taxRatesRef.current = parsed
       taxRatesLoadedRef.current = true
@@ -245,6 +256,34 @@ export function AdjustmentDialog({
     }
   }, [])
 
+  const loadTaxRateById = React.useCallback(async (taxRateId: string): Promise<TaxRateOption | null> => {
+    const response = await apiCall<{ items?: Array<Record<string, unknown>> }>(
+      `/api/sales/tax-rates?id=${encodeURIComponent(taxRateId)}&pageSize=1`,
+      undefined,
+      { fallback: { items: [] } },
+    )
+    const items = Array.isArray(response.result?.items) ? response.result.items : []
+    return (
+      items
+        .map<TaxRateOption | null>((item) => mapTaxRateOption(item))
+        .find((entry): entry is TaxRateOption => entry?.id === taxRateId) ?? null
+    )
+  }, [])
+
+  React.useEffect(() => {
+    const selectedId =
+      typeof initialValues.taxRateId === 'string' && initialValues.taxRateId.trim().length
+        ? initialValues.taxRateId.trim()
+        : null
+    if (!selectedId || taxRates.some((rate) => rate.id === selectedId)) return
+    loadTaxRateById(selectedId)
+      .then((selected) => {
+        taxRatesRef.current = mergeTaxRateOptions(taxRatesRef.current, selected)
+        setTaxRates((current) => mergeTaxRateOptions(current, selected))
+      })
+      .catch(() => {})
+  }, [initialValues.taxRateId, loadTaxRateById, taxRates])
+
   const applyOppositeAmount = React.useCallback(
     (
       source: 'net' | 'gross',
@@ -358,6 +397,7 @@ export function AdjustmentDialog({
             allowInlineCreate={false}
             manageHref="/backend/config/sales#adjustment-kinds"
             selectClassName="w-full"
+            sortOptions="none"
             labels={{
               placeholder: t('sales.documents.adjustments.kindSelect.placeholder', 'Select adjustment kind…'),
               addLabel: t('sales.config.adjustmentKinds.actions.add', 'Add adjustment kind'),
@@ -506,6 +546,7 @@ export function AdjustmentDialog({
               )
               return match?.id ?? null
             })()
+          const selectedTaxRate = rateId ? taxRateMap.get(rateId) ?? null : null
           const handleChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
             const nextId = event.target.value || null
             const option = nextId ? taxRateMap.get(nextId) ?? null : null
@@ -544,7 +585,9 @@ export function AdjustmentDialog({
                         ? t('sales.documents.adjustments.taxRate.placeholder', 'No tax class selected')
                         : t('sales.documents.adjustments.taxRate.empty', 'No tax classes available')
                     }
-                  />
+                  >
+                    {selectedTaxRate ? formatTaxRateLabel(selectedTaxRate) : undefined}
+                  </SelectValue>
                 </SelectTrigger>
                 <SelectContent>
                   {taxRates.map((rate) => (