@spree/dashboard-core 1.0.0-rc.4 → 1.0.0-rc.6

package/src/components/table-toolbar.tsx

@@ -1,3 +1,4 @@
+import type { FilterPredicate } from '@spree/core'
 import {
   Button,
   Checkbox,
@@ -36,7 +37,7 @@ import {
   XIcon,
 } from '@spree/dashboard-ui/icons'
 import { useQuery } from '@tanstack/react-query'
-import { useCallback, useDeferredValue, useMemo, useState } from 'react'
+import { Fragment, useCallback, useDeferredValue, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { getApiClient } from '../api-client'
 import { useAuth } from '../hooks/use-auth'
@@ -55,6 +56,7 @@ import {
 } from '../lib/table-registry'
 import { useOptionalStore } from '../providers/store-provider'
 import { useTenantId } from '../providers/tenant-provider'
+import { LocaleLabel, useLocaleLabel } from './locale-select'
 import { StoreDatePicker } from './store-date-picker'
 
 interface TableToolbarProps {
@@ -81,7 +83,16 @@ interface TableToolbarProps {
 
 // Operator labels are stored as i18n keys (`admin.components.table_toolbar.operators.*`)
 // and resolved with `t()` at render time so they follow the active language.
-const operatorsByType: Record<string, { value: string; labelKey: string }[]> = {
+type OperatorOption = { value: FilterPredicate; labelKey: string }
+
+const storeCodeOperators: OperatorOption[] = [
+  { value: 'eq', labelKey: 'admin.components.table_toolbar.operators.is' },
+  { value: 'not_eq', labelKey: 'admin.components.table_toolbar.operators.is_not' },
+  { value: 'in', labelKey: 'admin.components.table_toolbar.operators.is_any_of' },
+  { value: 'not_in', labelKey: 'admin.components.table_toolbar.operators.is_none_of' },
+]
+
+const operatorsByType: Record<string, OperatorOption[]> = {
   string: [
     // `i_cont` (case-insensitive) rather than `cont` — an admin typing
     // "2 years" expects to match "2 Years".
@@ -125,13 +136,9 @@ const operatorsByType: Record<string, { value: string; labelKey: string }[]> = {
     { value: 'not_in', labelKey: 'admin.components.table_toolbar.operators.is_none_of' },
   ],
   // Same shape as `enum` — the value picker just sources its option list
-  // from the active store's `supported_currencies`.
-  currency: [
-    { value: 'eq', labelKey: 'admin.components.table_toolbar.operators.is' },
-    { value: 'not_eq', labelKey: 'admin.components.table_toolbar.operators.is_not' },
-    { value: 'in', labelKey: 'admin.components.table_toolbar.operators.is_any_of' },
-    { value: 'not_in', labelKey: 'admin.components.table_toolbar.operators.is_none_of' },
-  ],
+  // from the currencies / languages of the active store's markets.
+  currency: storeCodeOperators,
+  locale: storeCodeOperators,
 }
 
 function getOperators(type: string) {
@@ -155,7 +162,7 @@ const noValueOperators = ['present', 'blank']
 
 /** Stable empty list, so a panel with no store doesn't rebuild `items` (and
  *  re-emit Base UI Select state) on every render. */
-const noCurrencies: string[] = []
+const noCodes: string[] = []
 
 // ============================================================================
 // TableToolbar
@@ -489,6 +496,15 @@ function FilterChip({
               <ResourceFilterValue value={first.value} config={col.filterResource} />
             ) : col?.filterType === 'tags' ? (
               <span>{parseFilterIds(first.value).join(', ')}</span>
+            ) : col?.filterType === 'locale' ? (
+              <span>
+                {parseFilterIds(first.value).map((code, index) => (
+                  <Fragment key={code}>
+                    {index > 0 && ', '}
+                    <LocaleLabel code={code} />
+                  </Fragment>
+                ))}
+              </span>
             ) : col?.filterType === 'enum' && col.filterOptions ? (
               <span>
                 {parseFilterIds(first.value)
@@ -515,6 +531,25 @@ function FilterChip({
   )
 }
 
+/**
+ * The whole option list of a resource small enough to fetch once (`listAll`),
+ * cached under `[queryKey, tenant, 'all']` — the key the resource's own
+ * full-list hook uses, so filters and the rest of the dashboard share one
+ * fetch that the resource's writes invalidate.
+ */
+function useListAll(
+  config: ColumnDef['filterResource'],
+  tenantId: string | undefined,
+  enabled = true,
+) {
+  return useQuery({
+    queryKey: [config?.queryKey, tenantId, 'all'],
+    queryFn: () => config?.listAll?.() ?? Promise.resolve({ data: [] }),
+    enabled: enabled && Boolean(config?.listAll),
+    staleTime: config?.staleTime ?? 60_000,
+  })
+}
+
 /**
  * Hydrates the CSV id list in a resource filter into human labels. Reuses
  * the resource's `hydrate` callback so each chip benefits from React Query's
@@ -530,19 +565,21 @@ function ResourceFilterValue({
   const tenantId = useTenantId()
   const ids = useMemo(() => parseFilterIds(value), [value])
 
-  const { data } = useQuery({
+  const all = useListAll(config, tenantId, ids.length > 0)
+  const hydrated = useQuery({
     // Tenant-scope the cache key so chips don't resolve against another
     // tenant's hydrate results after a store or seller switch.
-    queryKey: ['filter-chip', config.queryKey, tenantId, ids],
+    queryKey: [config.queryKey, tenantId, 'filter-chip', ids],
     queryFn: () => config.hydrate(ids),
-    enabled: ids.length > 0,
-    staleTime: 60_000,
+    enabled: ids.length > 0 && !config.listAll,
+    staleTime: config.staleTime ?? 60_000,
   })
+  const records = config.listAll ? all.data?.data : hydrated.data?.data
 
   if (ids.length === 0) return null
 
   const labels = ids.map((id) => {
-    const record = data?.data.find((r) => r.id === id)
+    const record = records?.find((r) => r.id === id)
     return record ? config.getOptionLabel(record) : id
   })
 
@@ -768,12 +805,7 @@ function QuickResourceFilter({
     [existingValue],
   )
 
-  const { data } = useQuery({
-    queryKey: ['quick-filter-all', config.queryKey, tenantId],
-    queryFn: () => config.listAll?.() ?? Promise.resolve({ data: [] }),
-    enabled: !!config.listAll,
-    staleTime: 60_000,
-  })
+  const { data } = useListAll(config, tenantId)
   const options = useMemo(
     () =>
       (data?.data ?? []).map((item) => ({ value: item.id, label: config.getOptionLabel(item) })),
@@ -1101,10 +1133,15 @@ function InlineValueList({
   const tagsClient = getApiClient().tags
   const isTags = column.filterType === 'tags'
   const isCurrency = column.filterType === 'currency'
-  // `filterType: 'currency'` is only declared by tables in the operator's
-  // dashboard, which always has a store. Reading it optionally keeps the panel
-  // mountable in one that has none.
-  const currencies = useOptionalStore()?.currencies ?? noCurrencies
+  const isLocale = column.filterType === 'locale'
+  // Store codes are listed client-side from the store payload, never searched.
+  const isStoreCode = isCurrency || isLocale
+  // `filterType: 'currency'` / `'locale'` are only declared by tables in the
+  // operator's dashboard, which always has a store. Reading it optionally
+  // keeps the panel mountable in one that has none.
+  const store = useOptionalStore()
+  const storeCodes = (isCurrency ? store?.currencies : isLocale ? store?.locales : null) ?? noCodes
+  const localeLabel = useLocaleLabel()
 
   // Tags arrive as one list and are filtered client-side; resources are
   // searched server-side, since their vocabulary is unbounded.
@@ -1129,18 +1166,23 @@ function InlineValueList({
   // genuinely new query reaches the network.
   const deferredQuery = useDeferredValue(query)
 
+  // A resource listed whole is fetched once and narrowed here as the operator
+  // types; anything larger is searched server-side.
+  const listed = Boolean(column.filterResource?.listAll)
+  const all = useListAll(column.filterResource, tenantId, !isTags && !isStoreCode)
+
   const resources = useQuery({
     // Tenant-scoped so a store or seller switch cannot reuse the previous
     // tenant's results.
-    queryKey: ['panel-resource-filter', column.filterResource?.queryKey, tenantId, deferredQuery],
+    queryKey: [column.filterResource?.queryKey, tenantId, 'panel-resource-filter', deferredQuery],
     queryFn: () => column.filterResource?.search(deferredQuery),
-    enabled: !isTags && !isCurrency && Boolean(column.filterResource),
+    enabled: !isTags && !isStoreCode && !listed && Boolean(column.filterResource),
     // These lists are reference data an operator reopens repeatedly while
     // narrowing one list, and the result is small now that only the displayed
     // fields are requested. Holding it for the session keeps reopening the
     // panel instant; `gcTime` outlives the unmount between opens.
-    staleTime: 5 * 60_000,
-    gcTime: 30 * 60_000,
+    staleTime: column.filterResource?.staleTime ?? 5 * 60_000,
+    gcTime: Math.max(30 * 60_000, column.filterResource?.staleTime ?? 0),
     // Keeps the previous matches on screen while the next query resolves, so
     // the list does not blank on every keystroke.
     //
@@ -1149,7 +1191,7 @@ function InlineValueList({
     // drops them instead of briefly offering another tenant's records as
     // though they were this one's.
     placeholderData: (previous, previousQuery) => {
-      const [, previousResource, previousTenant] = (previousQuery?.queryKey ?? []) as unknown[]
+      const [previousResource, previousTenant] = (previousQuery?.queryKey ?? []) as unknown[]
       const sameScope =
         previousResource === column.filterResource?.queryKey && previousTenant === tenantId
       return sameScope ? previous : undefined
@@ -1157,11 +1199,14 @@ function InlineValueList({
   })
 
   const options = useMemo(() => {
-    if (isCurrency) {
+    if (isStoreCode) {
       const needle = query.trim().toLowerCase()
-      return currencies
-        .filter((code) => !needle || code.toLowerCase().includes(needle))
-        .map((code) => ({ value: code, label: code }))
+      return storeCodes
+        .map((code) => ({
+          value: code,
+          label: isLocale ? localeLabel(code) : code,
+        }))
+        .filter((option) => !needle || option.label.toLowerCase().includes(needle))
     }
     if (isTags) {
       const names = tags.data?.data?.map((tag) => tag.name) ?? []
@@ -1171,11 +1216,29 @@ function InlineValueList({
     }
     const config = column.filterResource
     if (!config) return []
-    return (resources.data?.data ?? []).map((record) => ({
+    const records = (listed ? all.data?.data : resources.data?.data) ?? []
+    const resourceOptions = records.map((record) => ({
       value: record.id,
       label: config.getOptionLabel(record),
     }))
-  }, [isCurrency, currencies, isTags, tags.data, resources.data, column.filterResource, query])
+    if (!listed) return resourceOptions
+    const needle = query.trim().toLowerCase()
+    return resourceOptions.filter(
+      (option) => !needle || option.label.toLowerCase().includes(needle),
+    )
+  }, [
+    listed,
+    all.data,
+    isStoreCode,
+    isLocale,
+    storeCodes,
+    localeLabel,
+    isTags,
+    tags.data,
+    resources.data,
+    column.filterResource,
+    query,
+  ])
 
   // Values already selected when the list opens ride at the top, so an active
   // filter is visible without scrolling. The set is frozen at mount: ticking a
@@ -1191,7 +1254,7 @@ function InlineValueList({
     return [...chosen, ...rest]
   }, [options, pinned])
 
-  if (!isCurrency && (tags.isLoading || resources.isLoading)) {
+  if (!isStoreCode && (tags.isLoading || resources.isLoading || all.isLoading)) {
     return (
       <p className="px-2 py-6 text-center text-muted-foreground">{t('admin.common.loading')}</p>
     )
@@ -1274,7 +1337,7 @@ function FilterPanel({
   // Types whose values are chosen from a list rather than typed. `multi` ones
   // accumulate a set and need an explicit Apply; the single ones commit on the
   // click that picks them.
-  const multi = type === 'tags' || type === 'resource' || type === 'currency'
+  const multi = type === 'tags' || type === 'resource' || type === 'currency' || type === 'locale'
   // Dates are their own shape: a list of relative presets, with the calendar
   // behind "custom". Same presets the quick filter offers, so a range means
   // the same thing wherever it was set.
@@ -1653,7 +1716,7 @@ function FilterPanel({
               </Select>
             ) : null}
 
-            {/* Everything picked from a list — currency, tags, resources — or
+            {/* Everything picked from a list — currency, locale, tags, resources — or
                 from a calendar is handled above; this branch is only the types
                 you type into. */}
             {!noValueOperators.includes(operator) && listOptions.length === 0 && (

package/src/hooks/use-display-name.ts

@@ -1,24 +1,7 @@
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 
-/**
- * Resolves a code to its display name via `Intl.DisplayNames`, localized to a
- * given UI language. Returns `undefined` when the runtime lacks coverage so
- * callers can apply their own fallback (usually the raw code).
- *
- * Standalone (non-hook) variant for module-level use outside React.
- */
-export function intlDisplayName(
-  type: Intl.DisplayNamesType,
-  locale: string,
-  code: string,
-): string | undefined {
-  try {
-    return new Intl.DisplayNames([locale, 'en'], { type }).of(code)
-  } catch {
-    return undefined
-  }
-}
+export { intlDisplayName } from '@spree/core'
 
 /**
  * Hook returning a memoized `code -> name` resolver for one `Intl.DisplayNames`

package/src/hooks/use-file-upload.ts

@@ -1,3 +1,4 @@
+import type { FileUploadVisibility } from '@spree/core'
 import { useMutation } from '@tanstack/react-query'
 import { getApiClient } from '../api-client'
 
@@ -31,7 +32,7 @@ interface FileUploadOptions {
    * (documents, imports, digital products). Attaching a file never moves it
    * between storage services, so this has to be decided up front.
    */
-  visibility?: 'public' | 'private'
+  visibility?: FileUploadVisibility
 }
 
 export function useFileUpload(options: FileUploadOptions = {}) {

package/src/hooks/use-import.ts

@@ -1,3 +1,4 @@
+import { IMPORT_STATUSES, subsetOf } from '@spree/core'
 import { toastManager } from '@spree/dashboard-ui'
 import {
   type QueryClient,
@@ -20,7 +21,7 @@ import { useTenantId } from '../providers/tenant-provider'
 import { useAuth } from './use-auth'
 
 /** Statuses the wizard polls through — row creation and processing. */
-const ACTIVE_STATUSES = new Set(['completed_mapping', 'processing'])
+const ACTIVE_STATUSES = subsetOf(IMPORT_STATUSES, ['completed_mapping', 'processing'])
 
 const IMPORT_POLL_INTERVAL_MS = 2000
 const ROWS_POLL_INTERVAL_MS = 5000
@@ -49,7 +50,7 @@ const IMPORT_TOUCHED_RESOURCES = [
 
 /** Whether the import's pipeline is still running (the poll's continue predicate). */
 export function isImportActive(status: string | undefined): boolean {
-  return !!status && ACTIVE_STATUSES.has(status)
+  return !!status && ACTIVE_STATUSES.includes(status)
 }
 
 /**

package/src/index.ts

@@ -11,6 +11,17 @@
 //     import { AuthProvider } from '@spree/dashboard-core/providers/auth-provider'
 //     import { useResourceMutation } from '@spree/dashboard-core/hooks/use-resource-mutation'
 
+// Money helpers from @spree/core, offered here as before for plugin authors
+export {
+  currencyParts,
+  fractionToPercent,
+  isPositiveMoney,
+  normalizeMoneyInput,
+  percentOf,
+  percentToFraction,
+  prorateMoney,
+  shiftDecimalPoint,
+} from '@spree/core'
 export * from './api-client'
 // ---------------------------------------------------------------------------
 // Admin SDK client (Vite-aware singleton; reads VITE_SPREE_API_URL at build)
@@ -23,6 +34,7 @@ export * from './components/bulk-action-bar'
 export * from './components/can'
 export * from './components/country-combobox'
 export * from './components/country-state-fields'
+export * from './components/currency-amounts-field'
 export * from './components/currency-select'
 export * from './components/export-button'
 export * from './components/file-upload-field'
@@ -77,11 +89,11 @@ export * from './hooks/use-switch-admin-locale'
 export * from './hooks/use-visual-viewport-offset'
 export * from './lib/cancel-order-form'
 export * from './lib/create-action-registry'
+export * from './lib/currency-amounts'
 // ---------------------------------------------------------------------------
 // Registries — pluggable extension points (nav, route, slot, table,
 // settings-nav, form fields, custom field components)
 // ---------------------------------------------------------------------------
-export * from './lib/currency-parts'
 export * from './lib/custom-field-components'
 export * from './lib/date-presets'
 export * from './lib/delivery-form'
@@ -103,9 +115,7 @@ export * from './lib/i18n'
 export * from './lib/import-types'
 export * from './lib/iso-codes'
 export * from './lib/label-upload-form'
-export * from './lib/money'
 export * from './lib/nav-registry'
-export * from './lib/normalize-money'
 export * from './lib/permissions'
 export * from './lib/progress'
 export * from './lib/query-client'
@@ -115,6 +125,7 @@ export * from './lib/route-registry'
 export * from './lib/search-registry'
 export * from './lib/settings-nav-registry'
 export * from './lib/slot-registry'
+export * from './lib/store-config'
 export * from './lib/table-registry'
 export { ensureTimestampColumns } from './lib/timestamp-columns'
 export * from './lib/type-labels'
@@ -125,12 +136,15 @@ export * from './pages/stock-locations'
 // Plugin facade — re-exported for convenience; same API as `/plugin` subpath
 // ---------------------------------------------------------------------------
 export * from './plugin'
+export * from './products/assignable-variants'
+export * from './products/digital-assets-card'
 export * from './products/normalize-customs'
 export * from './products/normalize-quantity'
 export * from './products/product-form-cards'
 export * from './products/product-form-mapping'
 export * from './products/product-schema'
 export * from './products/product-types'
+export type { SheetSaveHandler } from './products/sheet-save-handlers'
 export * from './products/use-product-form-data'
 export * from './products/variants-matrix'
 export * from './products/video-url'

package/src/lib/currencies.ts

@@ -1,34 +1,2 @@
-import { CurrencyCode } from '@spree/admin-sdk'
-
-// Replaced currencies Spree still accepts so orders priced in them stay
-// valid, but which no merchant should pick for new pricing.
-const RETIRED_CURRENCY_CODES: ReadonlySet<string> = new Set([
-  'BYR',
-  'CUC',
-  'EEK',
-  'HRK',
-  'LTL',
-  'LVL',
-  'MRO',
-  'MTL',
-  'SKK',
-  'SLL',
-  'STD',
-  'TMM',
-  'VEF',
-  'ZMK',
-  'ZWD',
-  'ZWL',
-  'ZWN',
-  'ZWR',
-])
-
-/**
- * Every currency Spree accepts that is still in use. Used for contexts where
- * the merchant can pick *any* currency (a market's currency) rather than one
- * the store already supports. The list ships with the SDK, so a currency a
- * newer server adds appears once the dashboard is upgraded with it.
- */
-export const ALL_CURRENCY_CODES: readonly CurrencyCode[] = Object.values(CurrencyCode).filter(
-  (code) => !RETIRED_CURRENCY_CODES.has(code),
-)
+/** @deprecated Import `ACTIVE_CURRENCY_CODES` from `@spree/core`. Removed in 6.1. */
+export { ACTIVE_CURRENCY_CODES as ALL_CURRENCY_CODES } from '@spree/core'

package/src/lib/currency-amounts.test.ts

@@ -0,0 +1,147 @@
+import { describe, expect, it } from 'vitest'
+import {
+  amountForCurrency,
+  applyCurrencyAmount,
+  hasCurrencyAmount,
+  listedAmounts,
+} from './currency-amounts'
+
+describe('listedAmounts', () => {
+  it('reads the legacy single amount as the store default currency', () => {
+    expect(listedAmounts({ amount: '5' }, 'USD')).toEqual([{ amount: '5', currency: 'USD' }])
+  })
+
+  it('attributes the legacy amount to its own currency preference', () => {
+    expect(listedAmounts({ amount: '7', currency: 'EUR' }, 'USD')).toEqual([
+      { amount: '7', currency: 'EUR' },
+    ])
+  })
+
+  it('reads a non-default currency from the amounts hash when the default is empty', () => {
+    expect(listedAmounts({ amounts: { EUR: '7' } }, 'USD')).toEqual([
+      { amount: '7', currency: 'EUR' },
+    ])
+  })
+
+  it('ignores the single amount once the hash holds an amount, as the server does', () => {
+    expect(listedAmounts({ amount: '0', amounts: { EUR: '11' } }, 'USD')).toEqual([
+      { amount: '11', currency: 'EUR' },
+    ])
+  })
+
+  it('keeps each hash amount against the currency it was entered in', () => {
+    expect(listedAmounts({ amounts: { GBP: '8', EUR: '7' } }, 'USD')).toEqual([
+      { amount: '7', currency: 'EUR' },
+      { amount: '8', currency: 'GBP' },
+    ])
+  })
+
+  it('lists the default-currency amount first', () => {
+    expect(listedAmounts({ amounts: { EUR: '7', USD: '5' } }, 'USD')).toEqual([
+      { amount: '5', currency: 'USD' },
+      { amount: '7', currency: 'EUR' },
+    ])
+  })
+
+  it('lets the amounts hash override the legacy amount for the same currency', () => {
+    expect(listedAmounts({ amount: '5', amounts: { USD: '6', EUR: '7' } }, 'USD')).toEqual([
+      { amount: '6', currency: 'USD' },
+      { amount: '7', currency: 'EUR' },
+    ])
+  })
+
+  it('ignores blank hash entries so an emptied currency is not offered', () => {
+    expect(listedAmounts({ amounts: { EUR: '', GBP: '8' } }, 'USD')).toEqual([
+      { amount: '8', currency: 'GBP' },
+    ])
+  })
+})
+
+describe('amountForCurrency', () => {
+  it('puts a pre-6.0 euro amount in the euro row, not the store default', () => {
+    const preferences = { amount: '7', currency: 'EUR' }
+    expect(amountForCurrency(preferences, 'EUR', 'USD')).toBe('7')
+    expect(amountForCurrency(preferences, 'USD', 'USD')).toBeNull()
+  })
+
+  it('reads only the amounts hash once it holds an amount, so the single amount is not a price', () => {
+    const preferences = { amount: '0', amounts: { EUR: '11' } }
+    expect(amountForCurrency(preferences, 'EUR', 'USD')).toBe('11')
+    expect(amountForCurrency(preferences, 'USD', 'USD')).toBeNull()
+  })
+
+  it('treats a blank currency preference as the store default', () => {
+    expect(amountForCurrency({ amount: '5' }, 'USD', 'USD')).toBe('5')
+    expect(amountForCurrency({ amount: '5' }, 'EUR', 'USD')).toBeNull()
+  })
+
+  it('trims surrounding space on the legacy currency preference', () => {
+    const preferences = { amount: '7', currency: ' EUR ' }
+    expect(amountForCurrency(preferences, 'EUR', 'USD')).toBe('7')
+    expect(amountForCurrency(preferences, 'USD', 'USD')).toBeNull()
+  })
+
+  it('reads a lowercase amounts-hash key as that currency', () => {
+    expect(amountForCurrency({ amounts: { eur: '7' } }, 'EUR', 'USD')).toBe('7')
+  })
+})
+
+describe('applyCurrencyAmount', () => {
+  it('moves a pre-6.0 euro price into the hash when the dollar row is edited', () => {
+    expect(applyCurrencyAmount({ amount: '7', currency: 'EUR' }, 'USD', '10', 'USD')).toEqual({
+      amount: null,
+      currency: 'EUR',
+      amounts: { EUR: '7', USD: '10' },
+    })
+  })
+
+  it('updates the named currency of a pre-6.0 method in the hash', () => {
+    expect(applyCurrencyAmount({ amount: '7', currency: 'EUR' }, 'EUR', '11', 'USD')).toEqual({
+      amount: null,
+      currency: 'EUR',
+      amounts: { EUR: '11' },
+    })
+  })
+
+  it('writes the store default into the hash like every other currency', () => {
+    expect(applyCurrencyAmount({ amount: '5', currency: 'USD' }, 'EUR', '11', 'USD')).toEqual({
+      amount: null,
+      currency: 'USD',
+      amounts: { USD: '5', EUR: '11' },
+    })
+    expect(applyCurrencyAmount({ amount: null }, 'USD', '9.99', 'USD')).toEqual({
+      amount: null,
+      amounts: { USD: '9.99' },
+    })
+  })
+
+  it('removes a cleared currency, the store default included, so the method is not offered in it', () => {
+    expect(applyCurrencyAmount({ amounts: { USD: '5', EUR: '7' } }, 'USD', '', 'USD')).toEqual({
+      amount: null,
+      amounts: { EUR: '7' },
+    })
+  })
+
+  it('updates and clears a lowercase stored hash key without leaving a stale entry', () => {
+    expect(applyCurrencyAmount({ amounts: { eur: '7' } }, 'EUR', '11', 'USD')).toEqual({
+      amount: null,
+      amounts: { EUR: '11' },
+    })
+    expect(applyCurrencyAmount({ amounts: { eur: '7' } }, 'EUR', '', 'USD')).toEqual({
+      amount: null,
+      amounts: {},
+    })
+  })
+})
+
+describe('hasCurrencyAmount', () => {
+  it('is true for an amount in the hash or a pre-6.0 single amount', () => {
+    expect(hasCurrencyAmount({ amounts: { EUR: '0' } })).toBe(true)
+    expect(hasCurrencyAmount({ amount: '5', amounts: {} })).toBe(true)
+  })
+
+  it('is false when no currency has an amount', () => {
+    expect(hasCurrencyAmount({ amount: null, amounts: { EUR: '' } })).toBe(false)
+    expect(hasCurrencyAmount({})).toBe(false)
+  })
+})