@spree/dashboard-core 1.0.0-rc.1 → 1.0.0-rc.3

package/src/lib/route-registry.ts

@@ -3,22 +3,34 @@ import { useSyncExternalStore } from 'react'
 import type { SubjectName } from './permissions'
 
 /**
- * Dashboard route contributed by a plugin. Mounted under the dashboard's
- * `/_authenticated/$storeId/_plugins/$` catch-all, which reads this registry
- * at render time and dispatches based on the splat path.
+ * Where a registry route mounts:
+ *
+ * - `store` (default) — inside a store, under `/$storeId`, with the store's
+ *   sidebar and top bar.
+ * - `authenticated` — at the root, for signed-in users, outside any store
+ *   (account or onboarding pages). Signed-out visitors go to the login page.
+ * - `public` — at the root, with no sign-in required (a sign-up or terms page).
+ */
+export type RouteScope = 'store' | 'authenticated' | 'public'
+
+/**
+ * Dashboard route contributed by a plugin. Store routes mount under the
+ * dashboard's `/_authenticated/$storeId/$` catch-all, which reads this
+ * registry at render time and dispatches based on the splat path.
  *
  * Path patterns use TanStack-Router-style param tokens (`$brandId`) inside the
  * plugin's namespace. The dashboard strips the `/$storeId/` prefix before
  * matching, so a plugin pattern of `/brands/$brandId` matches the URL
  * `/store_xyz/brands/br_abc123` with `params: { brandId: 'br_abc123' }`.
  */
-export interface RouteEntry {
+export interface StoreRouteEntry {
   /**
    * Stable identifier — used for register/remove/update and as the React key.
    * Mirrors the slug a plugin would use in its `nav.add({ key })` call so the
    * sidebar entry and route stay paired.
    */
   key: string
+  scope?: 'store'
   /**
    * Path pattern relative to `/$storeId`. Examples: `/brands`,
    * `/brands/$brandId`, `/wishlists/$wishlistId/items`.
@@ -30,7 +42,7 @@ export interface RouteEntry {
    * The component to render. Receives:
    * - `params`: extracted path params (e.g. matching `/brands/$brandId`
    *   against `/brands/br_abc` yields `{ brandId: 'br_abc' }`)
-   * - `storeId`: the current store — every plugin route is implicitly scoped
+   * - `storeId`: the current store — every store route is implicitly scoped
    *   under `/$storeId/...`
    * - `searchParams`: the URL search-state object from TanStack Router. Use
    *   this with `<ResourceTable searchParams={searchParams} ... />` so
@@ -49,6 +61,27 @@ export interface RouteEntry {
   subject?: SubjectName
 }
 
+/**
+ * Route mounted at the dashboard's root, outside any store. Unlike store
+ * routes these become real router routes when `createDashboardRouter` runs,
+ * so they must be registered before it — `plugins.ts` and installed plugins
+ * always are.
+ */
+export interface RootRouteEntry {
+  key: string
+  scope: 'authenticated' | 'public'
+  /** Full URL path, e.g. `/sign-up` or `/account/$section`. Must start with `/`. */
+  path: string
+  component: ComponentType<{
+    params: Record<string, string>
+    searchParams: Record<string, unknown>
+  }>
+}
+
+export type RouteEntry = StoreRouteEntry | RootRouteEntry
+
+const ROUTE_SCOPES: readonly RouteScope[] = ['store', 'authenticated', 'public']
+
 const entries: RouteEntry[] = []
 const listeners = new Set<() => void>()
 
@@ -63,10 +96,6 @@ function subscribe(listener: () => void): () => void {
   }
 }
 
-function getSnapshot(): readonly RouteEntry[] {
-  return entries
-}
-
 interface RouteMutator {
   /** Register a route. Throws if `key` is already registered. */
   add(entry: RouteEntry): void
@@ -82,6 +111,11 @@ export const pluginRoutes: RouteMutator = {
     if (!entry.path.startsWith('/')) {
       throw new Error(`Plugin route "${entry.key}" path must start with "/", got "${entry.path}".`)
     }
+    if (entry.scope !== undefined && !ROUTE_SCOPES.includes(entry.scope)) {
+      throw new Error(
+        `Plugin route "${entry.key}" scope must be one of ${ROUTE_SCOPES.join(', ')}, got "${entry.scope}".`,
+      )
+    }
     entries.push(entry)
     notify()
   },
@@ -93,17 +127,22 @@ export const pluginRoutes: RouteMutator = {
   },
 }
 
+/** Every registered route, read outside React. */
+export function getPluginRoutes(): readonly RouteEntry[] {
+  return entries
+}
+
 /**
  * Subscribe to plugin route updates. Returns the full list of registered
  * routes; the catch-all renderer matches against this on every navigation.
  */
 export function usePluginRoutes(): readonly RouteEntry[] {
-  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot)
+  return useSyncExternalStore(subscribe, getPluginRoutes, getPluginRoutes)
 }
 
 /**
  * Match a URL splat (the bit after `/$storeId/`) against the registered
- * routes. Returns the matched entry plus the extracted path params, or
+ * store routes. Returns the matched entry plus the extracted path params, or
  * `null` if nothing matched.
  *
  * Path patterns support TanStack-style `$param` tokens. A pattern segment
@@ -117,12 +156,12 @@ export function usePluginRoutes(): readonly RouteEntry[] {
 export function matchPluginRoute(
   splat: string,
   routes: readonly RouteEntry[],
-): { entry: RouteEntry; params: Record<string, string> } | null {
+): { entry: StoreRouteEntry; params: Record<string, string> } | null {
   // Normalize: strip leading slash, drop empty trailing segments.
   const urlSegments = splat.replace(/^\/+/, '').split('/').filter(Boolean)
-  const bySpecificity = [...routes].sort(
-    (a, b) => countDynamicSegments(a.path) - countDynamicSegments(b.path),
-  )
+  const bySpecificity = routes
+    .filter(isStoreRoute)
+    .sort((a, b) => countDynamicSegments(a.path) - countDynamicSegments(b.path))
   for (const entry of bySpecificity) {
     const patternSegments = entry.path.replace(/^\/+/, '').split('/').filter(Boolean)
     if (patternSegments.length !== urlSegments.length) continue
@@ -144,6 +183,10 @@ export function matchPluginRoute(
   return null
 }
 
+function isStoreRoute(entry: RouteEntry): entry is StoreRouteEntry {
+  return entry.scope === undefined || entry.scope === 'store'
+}
+
 function countDynamicSegments(path: string): number {
   return path
     .replace(/^\/+/, '')

package/src/lib/slot-registry.ts

@@ -44,6 +44,16 @@ export interface NoStoreAccessSlotContext {
   signOut: () => Promise<void>
 }
 
+/**
+ * The page a signed-in user lands on at `/`, before entering a store. By
+ * default it opens their first store, or shows the `no_store_access` screen
+ * when they have none. Registering an entry replaces the whole page — for
+ * example with a list of stores to choose from and a way to create one.
+ */
+export const STORE_SELECTION_SLOT = 'store_selection'
+
+export type StoreSelectionSlotContext = NoStoreAccessSlotContext
+
 // ============================================================================
 // Registry — module-singleton keyed by slot name
 // ============================================================================

package/src/lib/storefront.ts

@@ -5,14 +5,14 @@ import type { Store } from '@spree/admin-sdk'
  * or `null` when no storefront URL is configured.
  *
  * The serialized `store.url` always resolves — the backend falls back to the
- * store's formatted URL — so gate on the explicit `preferred_storefront_url`
+ * store's formatted URL — so gate on the explicit `storefront_url`
  * preference: only return a link once a real storefront has been set.
  *
  * @param store the current store, or null/undefined while it loads
  * @returns an absolute URL, or null when the store has no configured storefront
  */
 export function storefrontHref(store: Store | null | undefined): string | null {
-  if (!store?.preferred_storefront_url) return null
+  if (!store?.storefront_url) return null
 
   // Best-effort: prefix with https if the URL is just a hostname.
   return /^https?:\/\//.test(store.url) ? store.url : `https://${store.url}`

package/src/locales/ar.json

@@ -1463,11 +1463,13 @@
         "seeded_report_read_only": "هذا تقرير مدمج ولا يمكن تغييره. احفظ نسخة بدلاً من ذلك.",
         "taken": "مستخدم بالفعل",
         "too_long": "طويل جدًا (الحد الأقصى {{count}} حرفًا)",
+        "too_many_decimals": "يحتوي على أكثر من {{count}} منازل عشرية",
         "too_short": "قصير جدًا (الحد الأدنى {{count}} حرفًا)",
         "wrong_length": "الطول غير صحيح (يجب أن يكون {{count}} حرفًا)"
       },
       "country_required": "البلد مطلوب",
       "currency_required": "العملة مطلوبة",
+      "locale_required": "اللغة مطلوبة",
       "first_name_required": "الاسم الأول مطلوب",
       "invalid_email": "أدخل بريدًا إلكترونيًا صالحًا",
       "invalid_email_or_password": "بريد إلكتروني أو كلمة مرور غير صالحة",
@@ -1479,7 +1481,8 @@
       "passwords_dont_match": "كلمتا المرور غير متطابقتين",
       "positive_number": "يجب أن يكون {{field}} أكبر من 0",
       "required": "{{field}} مطلوب",
-      "store_name_required": "اسم المتجر مطلوب"
+      "store_name_required": "اسم المتجر مطلوب",
+      "too_many_decimals": "يمكن أن يحتوي {{field}} على {{count}} منازل عشرية كحد أقصى"
     },
     "products": {
       "autocomplete": {

package/src/locales/de.json

@@ -1463,11 +1463,13 @@
         "seeded_report_read_only": "Dies ist ein integrierter Bericht und kann nicht geändert werden. Speichern Sie stattdessen eine Kopie.",
         "taken": "ist bereits vergeben",
         "too_long": "ist zu lang (maximal {{count}} Zeichen)",
+        "too_many_decimals": "hat mehr als {{count}} Nachkommastellen",
         "too_short": "ist zu kurz (mindestens {{count}} Zeichen)",
         "wrong_length": "hat die falsche Länge (sollte {{count}} Zeichen haben)"
       },
       "country_required": "Land ist erforderlich",
       "currency_required": "Währung ist erforderlich",
+      "locale_required": "Sprache ist erforderlich",
       "first_name_required": "Vorname ist erforderlich",
       "invalid_email": "Geben Sie eine gültige E-Mail-Adresse ein",
       "invalid_email_or_password": "Ungültige E-Mail-Adresse oder ungültiges Passwort",
@@ -1479,7 +1481,8 @@
       "passwords_dont_match": "Die Passwörter stimmen nicht überein",
       "positive_number": "{{field}} muss größer als 0 sein",
       "required": "{{field}} ist erforderlich",
-      "store_name_required": "Shopname ist erforderlich"
+      "store_name_required": "Shopname ist erforderlich",
+      "too_many_decimals": "{{field}} darf höchstens {{count}} Nachkommastellen haben"
     },
     "products": {
       "autocomplete": {

package/src/locales/en.json

@@ -1465,11 +1465,13 @@
         "seeded_report_read_only": "This is a built-in report and cannot be changed. Save a copy instead.",
         "taken": "has already been taken",
         "too_long": "is too long (maximum is {{count}} characters)",
+        "too_many_decimals": "has more than {{count}} decimal places",
         "too_short": "is too short (minimum is {{count}} characters)",
         "wrong_length": "is the wrong length (should be {{count}} characters)"
       },
       "country_required": "Country is required",
       "currency_required": "Currency is required",
+      "locale_required": "Language is required",
       "first_name_required": "First name is required",
       "invalid_email": "Enter a valid email",
       "invalid_email_or_password": "Invalid email or password",
@@ -1481,7 +1483,8 @@
       "passwords_dont_match": "Passwords do not match",
       "positive_number": "{{field}} must be greater than 0",
       "required": "{{field}} is required",
-      "store_name_required": "Store name is required"
+      "store_name_required": "Store name is required",
+      "too_many_decimals": "{{field}} can have at most {{count}} decimal places"
     },
     "products": {
       "autocomplete": {

package/src/locales/es.json

@@ -1608,11 +1608,13 @@
         "seeded_report_read_only": "Este es un reporte incorporado y no se puede modificar. Guardá una copia.",
         "taken": "ya está en uso",
         "too_long": "es demasiado largo (máximo {{count}} caracteres)",
+        "too_many_decimals": "tiene más de {{count}} decimales",
         "too_short": "es demasiado corto (mínimo {{count}} caracteres)",
         "wrong_length": "tiene un largo incorrecto (debería ser {{count}} caracteres)"
       },
       "country_required": "El país es obligatorio",
       "currency_required": "La moneda es obligatoria",
+      "locale_required": "El idioma es obligatorio",
       "first_name_required": "El nombre es obligatorio",
       "invalid_email": "Ingresá un email válido",
       "invalid_email_or_password": "Email o contraseña inválidos",
@@ -1624,7 +1626,8 @@
       "passwords_dont_match": "Las contraseñas no coinciden",
       "positive_number": "{{field}} debe ser mayor que 0",
       "required": "{{field}} es obligatorio",
-      "store_name_required": "El nombre de la tienda es obligatorio"
+      "store_name_required": "El nombre de la tienda es obligatorio",
+      "too_many_decimals": "{{field}} puede tener como máximo {{count}} decimales"
     },
     "common": {
       "active": "Activo",

package/src/locales/fr.json

@@ -1463,11 +1463,13 @@
         "seeded_report_read_only": "Ce rapport est intégré et ne peut pas être modifié. Enregistrez plutôt une copie.",
         "taken": "est déjà utilisé",
         "too_long": "est trop long ({{count}} caractères maximum)",
+        "too_many_decimals": "a plus de {{count}} décimales",
         "too_short": "est trop court ({{count}} caractères minimum)",
         "wrong_length": "n'a pas la bonne longueur ({{count}} caractères attendus)"
       },
       "country_required": "Le pays est requis",
       "currency_required": "La devise est requise",
+      "locale_required": "La langue est requise",
       "first_name_required": "Le prénom est obligatoire",
       "invalid_email": "Saisissez une adresse e-mail valide",
       "invalid_email_or_password": "E-mail ou mot de passe invalide",
@@ -1479,7 +1481,8 @@
       "passwords_dont_match": "Les mots de passe ne correspondent pas",
       "positive_number": "{{field}} doit être supérieur à 0",
       "required": "{{field}} est obligatoire",
-      "store_name_required": "Le nom de la boutique est requis"
+      "store_name_required": "Le nom de la boutique est requis",
+      "too_many_decimals": "{{field}} peut avoir au plus {{count}} décimales"
     },
     "products": {
       "autocomplete": {

package/src/locales/pl.json

@@ -1480,11 +1480,13 @@
         "seeded_report_read_only": "To raport wbudowany i nie można go zmienić. Zapisz zamiast tego kopię.",
         "taken": "jest już zajęte",
         "too_long": "jest za długie (maksymalnie {{count}} znaków)",
+        "too_many_decimals": "ma więcej niż {{count}} miejsca po przecinku",
         "too_short": "jest za krótkie (minimalnie {{count}} znaków)",
         "wrong_length": "ma nieprawidłową długość (powinno mieć {{count}} znaków)"
       },
       "country_required": "Kraj jest wymagany",
       "currency_required": "Waluta jest wymagana",
+      "locale_required": "Język jest wymagany",
       "first_name_required": "Imię jest wymagane",
       "invalid_email": "Wprowadź prawidłowy adres e-mail",
       "invalid_email_or_password": "Nieprawidłowy adres e-mail lub hasło",
@@ -1496,7 +1498,8 @@
       "passwords_dont_match": "Hasła nie są zgodne",
       "positive_number": "Pole {{field}} musi być większe niż 0",
       "required": "Pole {{field}} jest wymagane",
-      "store_name_required": "Nazwa sklepu jest wymagana"
+      "store_name_required": "Nazwa sklepu jest wymagana",
+      "too_many_decimals": "{{field}} może mieć najwyżej {{count}} miejsca po przecinku"
     },
     "products": {
       "autocomplete": {

package/src/locales/zh-CN.json

@@ -1463,11 +1463,13 @@
         "seeded_report_read_only": "这是内置报表，无法修改。请改为保存副本。",
         "taken": "已被占用",
         "too_long": "太长（最多 {{count}} 个字符）",
+        "too_many_decimals": "超过 {{count}} 位小数",
         "too_short": "太短（最少 {{count}} 个字符）",
         "wrong_length": "长度不正确（应为 {{count}} 个字符）"
       },
       "country_required": "请选择国家/地区",
       "currency_required": "请选择货币",
+      "locale_required": "请选择语言",
       "first_name_required": "名字为必填项",
       "invalid_email": "请输入有效的邮箱地址",
       "invalid_email_or_password": "邮箱或密码无效",
@@ -1479,7 +1481,8 @@
       "passwords_dont_match": "两次输入的密码不一致",
       "positive_number": "{{field}} 必须大于 0",
       "required": "{{field}} 为必填项",
-      "store_name_required": "商店名称为必填项"
+      "store_name_required": "商店名称为必填项",
+      "too_many_decimals": "{{field}}最多只能有 {{count}} 位小数"
     },
     "products": {
       "autocomplete": {

package/src/plugin.ts

@@ -106,11 +106,11 @@ export interface DashboardPluginConfig {
   /** Table mutations keyed by table key (see `defineTable`). */
   tables?: Record<string, TableMutations>
   /**
-   * Custom routes mounted under `/$storeId/`. Each entry's `path` is relative
-   * (e.g. `/brands`, `/brands/$brandId`). The dashboard's catch-all route at
-   * `/$storeId/*` dispatches based on the splat — your `component` renders
-   * exactly like any first-party route, including TanStack Router's
-   * `useParams()` for path params.
+   * Custom routes. By default mounted under `/$storeId/`, with a relative
+   * `path` (e.g. `/brands`, `/brands/$brandId`) — the dashboard's catch-all
+   * route at `/$storeId/*` dispatches based on the splat. Set `scope` to
+   * `'authenticated'` or `'public'` to mount a page at the root, outside any
+   * store.
    */
   routes?: RouteEntry[]
   /**

package/src/products/bulk-variants-dialog.tsx

@@ -63,7 +63,7 @@ export function BulkVariantsDialog({ form, open, onOpenChange }: Props) {
     () =>
       countries.map((country) => ({
         value: country.iso,
-        label: countryName({ iso: country.iso, iso3: country.iso3, name: country.name }),
+        label: countryName(country),
       })),
     [countries, countryName],
   )

package/src/products/product-bulk-price-editor.tsx

@@ -1,21 +1,20 @@
+import type { CurrencyCode } from '@spree/admin-sdk'
 import type { ProductFormValues, VariantPriceFormValues } from '@spree/dashboard-core'
 import { type BulkPriceRow, BulkPriceTable } from '@spree/dashboard-ui'
 import { useCallback, useMemo } from 'react'
 import { type UseFormReturn, useWatch } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
+import { useMoneyLocale } from '../hooks/use-money-locale'
+import { currencyParts } from '../lib/currency-parts'
+import { normalizeMoneyInput } from '../lib/normalize-money'
 import { composeOptionsText } from '../products/variants-matrix'
-import { currencyParts } from './currency-parts'
-import { normalizeMoneyInput } from './normalize-money'
-import {
-  useFormCurrencyLocale as useCurrencyLocale,
-  useFormOptionTypes as useOptionTypes,
-} from './use-product-form-data'
+import { useFormOptionTypes as useOptionTypes } from './use-product-form-data'
 
 interface Props {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   form: UseFormReturn<ProductFormValues, any, any>
   /** ISO currency code (e.g. "USD", "EUR"). */
-  currency: string
+  currency: CurrencyCode
   /** Display label for the product, used as the table's section header. */
   productName: string
 }
@@ -27,33 +26,23 @@ interface Props {
  * in form state the same way. No server fetch, no edit-tracking map: the
  * parent form's `isDirty` is the single source of truth for save gating.
  *
- * Amounts are STRINGS, not numbers. The merchant's raw input flows straight
- * through to the API; the backend's `Spree::LocalizedNumber.parse` handles
- * locale-aware parsing (comma decimals, grouped digits, etc.) so the
- * frontend doesn't have to reimplement it. Frontend coercion via `Number()`
- * would silently mangle inputs like `"1.234,56"` into `NaN` and drop the
- * price entirely.
+ * Amounts are STRINGS, not numbers: canonical `"1234.56"` in form state and
+ * on the wire, normalized from the admin's own number format as each cell
+ * commits. `Number()` coercion would lose precision and turn `"1.234,56"`
+ * into `NaN`.
  */
 export function ProductBulkPriceEditor({ form, currency, productName }: Props) {
   const { t } = useTranslation()
   const variants = useWatch({ control: form.control, name: 'variants' }) ?? []
   const { data: optionTypesData } = useOptionTypes()
   const optionTypes = useMemo(() => optionTypesData?.data ?? [], [optionTypesData])
-  const localeForCurrency = useCurrencyLocale()
-
-  // Format the grid in the currency's market locale (e.g. EUR → `de`, comma
-  // decimal). The same locale normalizes the merchant's input back to canonical
-  // form on commit (see `handleChange`), so form state — like the API value it
-  // hydrates from — is ALWAYS canonical `"1234.56"`. Untouched prices therefore
-  // never get re-normalized on save.
-  //
-  // Fall back to `en` (canonical period-decimal), NOT the UI language: money
-  // formatting/parsing must never depend on the dashboard's language, or a USD
-  // value under a German UI would be parsed as `40.00` → 4000.
-  const marketLocale = localeForCurrency(currency) || 'en'
+  // Shown and read in the person's own number format (see useMoneyLocale). Form
+  // state, like the API value it hydrates from, is always canonical "1234.56",
+  // so an untouched price is never re-read on save.
+  const moneyLocale = useMoneyLocale()
   const { symbol, decimal } = useMemo(
-    () => currencyParts(currency, marketLocale),
-    [currency, marketLocale],
+    () => currencyParts(currency, moneyLocale),
+    [currency, moneyLocale],
   )
 
   // Project the form's variants into BulkPriceRow[] for the picked currency.
@@ -95,7 +84,7 @@ export function ProductBulkPriceEditor({ form, currency, productName }: Props) {
       // whitespace, OR malformed input (normalizes to `''`) all mean "no value"
       // — never persist `''` as a real amount.
       const trimmed = next == null ? '' : next.trim()
-      const normalized = trimmed === '' ? '' : normalizeMoneyInput(trimmed, marketLocale)
+      const normalized = trimmed === '' ? '' : normalizeMoneyInput(trimmed, moneyLocale)
       const raw = normalized === '' ? null : normalized
 
       const nextPrices: VariantPriceFormValues[] = [...current]
@@ -132,7 +121,7 @@ export function ProductBulkPriceEditor({ form, currency, productName }: Props) {
         shouldDirty: true,
       })
     },
-    [form, currency, marketLocale],
+    [form, currency, moneyLocale],
   )
 
   return (

package/src/products/product-form-cards.tsx

@@ -13,6 +13,7 @@ import {
   useSortable,
 } from '@dnd-kit/sortable'
 import { CSS } from '@dnd-kit/utilities'
+import type { CurrencyCode } from '@spree/admin-sdk'
 import type { MediaType, ProductFormValues } from '@spree/dashboard-core'
 import {
   getApiClient,
@@ -20,7 +21,7 @@ import {
   parseVideoUrl,
   ResourceMultiAutocomplete,
   TagCombobox,
-  useDirectUpload,
+  useFileUpload,
   useOptionalStore,
 } from '@spree/dashboard-core'
 import {
@@ -198,8 +199,8 @@ export function PricesCard({
    * StoreProvider; a seller's tenant is a seller and the store is derived
    * server-side, so it passes the currencies its profile reports.
    */
-  currencies?: string[]
-  defaultCurrency?: string
+  currencies?: CurrencyCode[]
+  defaultCurrency?: CurrencyCode
 }) {
   const { t } = useTranslation()
   const store = useOptionalStore()
@@ -208,7 +209,7 @@ export function PricesCard({
   // Not `useState(defaultCurrency)` alone: the store (or the seller's profile)
   // arrives after the first render, so a state seeded from the fallback would
   // stick and price everything in the wrong currency.
-  const [selectedCurrency, setCurrency] = useState<string | null>(null)
+  const [selectedCurrency, setCurrency] = useState<CurrencyCode | null>(null)
   const currency = selectedCurrency ?? defaultCurrency
 
   // Until the real default arrives there is no currency to price in, and an
@@ -224,7 +225,10 @@ export function PricesCard({
           {t('admin.common.prices')}
         </CardTitle>
         {currencies.length > 1 && (
-          <Select value={currency} onValueChange={setCurrency}>
+          <Select
+            value={currency}
+            onValueChange={(next) => setCurrency(currencies.find((code) => code === next) ?? null)}
+          >
             <SelectTrigger size="sm" className="w-24">
               <SelectValue />
             </SelectTrigger>
@@ -296,7 +300,7 @@ export function MediaCard({
   form: UseFormReturn<ProductFormValues, any, any>
 }) {
   const { t } = useTranslation()
-  const directUpload = useDirectUpload()
+  const fileUpload = useFileUpload()
   const deleteMedia = useDeleteProductMedia(productId ?? '')
   const confirm = useConfirm()
   const [pending, setPending] = useState<PendingUpload[]>([])
@@ -349,7 +353,7 @@ export function MediaCard({
         const preview = URL.createObjectURL(file)
         setPending((prev) => [...prev, { id: uploadId, file, preview, progress: 'uploading' }])
         try {
-          const result = await directUpload.mutateAsync(file)
+          const result = await fileUpload.mutateAsync(file)
           const current = form.getValues('media') ?? []
           form.setValue(
             'media',
@@ -384,7 +388,7 @@ export function MediaCard({
         }
       }
     },
-    [directUpload, form, t],
+    [fileUpload, form, t],
   )
 
   const handleDrop = useCallback(

package/src/products/product-form-mapping.ts

@@ -46,17 +46,21 @@ export function variantToFormValues(variant: PanelVariant, position: number): Va
     tax_category_id: variant.tax_category_id ?? null,
     // Base prices only: this array is posted back as the variant's base
     // prices, so a price-list row taken in here returns as the shop price.
-    prices: (variant.prices ?? [])
-      .filter((p) => p.currency != null && p.price_list_id == null)
-      .map((p) => ({
-        currency: p.currency as string,
-        // Keep amounts as the canonical decimal strings the API returns.
-        // The bulk price editor displays them with the locale's decimal
-        // separator and ships the raw user input unchanged on submit;
-        // `Spree::LocalizedNumber.parse` handles locale-aware parsing.
-        amount: p.amount != null ? String(p.amount) : '',
-        compare_at_amount: p.compare_at_amount != null ? String(p.compare_at_amount) : null,
-      })),
+    prices: (variant.prices ?? []).flatMap(
+      ({ currency, price_list_id, amount, compare_at_amount }) =>
+        currency != null && price_list_id == null
+          ? [
+              {
+                currency,
+                // Keep amounts as the canonical decimal strings the API returns;
+                // the price editor shows them in the admin's number format and
+                // normalizes edits back before they reach the form.
+                amount: amount != null ? String(amount) : '',
+                compare_at_amount: compare_at_amount != null ? String(compare_at_amount) : null,
+              },
+            ]
+          : [],
+    ),
     stock_levels: (variant.stock_levels ?? []).map((si) => ({
       id: si.id,
       stock_location_id: si.stock_location_id ?? si.stock_location?.id ?? '',

package/src/products/product-schema.ts

@@ -1,6 +1,7 @@
 import { requiredMessage } from '@spree/dashboard-ui'
 import i18n from 'i18next'
 import { z } from 'zod/v4'
+import { countryCodeSchema, currencyCodeSchema } from '../lib/iso-codes'
 import { normalizeQuantityRule } from './normalize-quantity'
 import { isSupportedVideoUrl } from './video-url'
 
@@ -33,13 +34,10 @@ export const variantOptionPairSchema = z.object({
 
 export type VariantOptionPair = z.infer<typeof variantOptionPairSchema>
 
-// Form-side prices use raw STRING amounts (the merchant's typed input).
-// The backend's `Spree::LocalizedNumber.parse` handles locale-aware parsing
-// (comma decimals, grouped digits, etc.), so the frontend ships exactly what
-// the merchant typed — no `Number(...)` coercion that mangles `"1.234,56"`
-// into `NaN` and silently drops the price.
+// Form-side prices are canonical decimal STRINGS ("1234.56"), never numbers:
+// `Number(...)` coercion loses precision and turns `"1.234,56"` into `NaN`.
 export const variantPriceFormSchema = z.object({
-  currency: z.string(),
+  currency: currencyCodeSchema,
   amount: z.string(),
   compare_at_amount: z.string().nullable().optional(),
 })
@@ -61,7 +59,7 @@ export const variantFormSchema = z.object({
   weight_unit: z.string().nullable().optional(),
   dimensions_unit: z.string().nullable().optional(),
   hs_code: z.string().nullable().optional(),
-  country_of_origin: z.string().nullable().optional(),
+  country_of_origin: countryCodeSchema.nullable().optional(),
   customs_description: z.string().nullable().optional(),
   // Held as strings so an unusable entry can be reported rather than
   // silently coerced away: normalizing `0` straight to null would clear the
@@ -101,7 +99,7 @@ export const customFieldFormSchema = z.object({
 export type CustomFieldFormValues = z.infer<typeof customFieldFormSchema>
 
 // Media in form state. Persisted entries carry an `id`; pre-save entries carry
-// a `signed_id` (from a completed ActiveStorage direct upload) or a
+// a `signed_id` (from a completed upload) or a
 // `source_media_id` (a file picked from the library). All can hold edits to
 // alt, position, and variant_ids that the parent product PATCH/POST ships
 // inline. previewUrl + uploadId are UI-only; stripped at submit.