Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

UI improvements - added icons wrapper in dashboard-ui and other small improvements (#14540)

Damian Legawiecbd93edfaa45f
diff --git a/CLAUDE.md b/CLAUDE.md
index d4edac0751..15f6bce62d 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -5,6 +5,7 @@
All feature plans live in `docs/plans/` using the template at `docs/plans/_template.md`. Never create plans elsewhere.
When proposing significant architectural changes:
+
1. Check existing plans in `docs/plans/` for conflicts
2. Create or update a plan using the template before implementing
3. Pay special attention to "Constraints on Current Work" sections — these apply even when you're not implementing that plan directly
@@ -12,6 +13,7 @@ When proposing significant architectural changes:
Use `/project:create-plan` and `/project:update-plan` for plan management, and `/project:implement-plan <plan>` to deliver a plan end to end (open questions → implementation → reviews → running QA environment → pull request).
Active plans (6.0 target, work pending):
+
- `6.0-b2b-storefront-purchasing.md` — Storefront company self-service (account section: members, invitations, address book, company orders; the invitation acceptance page the mailer already links) + company-aware checkout (buying-for picker on cart **and** checkout, company address book replacing the personal one at the address step). **Implemented, in review 2026-08-27** (spree/spree#14498 + spree/storefront#214). **No polymorphic owner on Cart/Order** — a purchase keeps two buyer-side parties (`customer_id` + `company_id`), the industry dual axis; OSS ships plain machinery, the polished buyer portal is Enterprise. Backend grew past the planned one-guard widening: `Spree::HasAddressBook` lets an owner declare where its default slots live (a customer's `bill_address_id` vs a company's `default_bill_address_id`) so `Addresses::Create`/`Update` work for any owner — they silently dropped a company's default flag before; default flags are three-state (claim / give up / say nothing) and released by conditional UPDATE, never read-then-write; `Company#address_book` is the inherited reading list, and reads inherit while writes stay with the owning node. **Constraints now:** never branch on an address owner's class — ask the owner (`has_address_book`); a new owner declares its slots or its defaults silently no-op; nothing storefront-side may branch on a member's "role" (OSS has none — gate on standing).
- `6.0-catalog-agreement-rework.md` — Implementation of the one-question-per-entity catalog consequences (design finalized 2026-08-30; extracted from the `6.0-b2b-companies-and-catalogs.md` amendment block so its Implemented status stops hiding unbuilt work; **sequence Wave 1 — everything catalog-shaped builds on it**; **phases 1–3 implemented 2026-08-30** — schema inversion, resolver leak fix, rule supersession; phase 4 — inline `price_list` payload, agreement editor, products-with-prices view, wizard, detach warning — pending, Wave 2): the binding inversion (`spree_price_lists.catalog_id` replaces `spree_catalogs.price_list_id`; catalogs migration rewritten in place — unreleased edge; generic rule matching skips owned lists by FK in `PriceList.for_context`, closing the deactivated-catalog leak in `bound_price_list_ids`, which is deleted along with its `Spree::Current` memoization; the catalog↔list binding is applied in an `after_save`, never on assignment — a rejected save must not silently release a list store-wide); `PriceRules::CustomerGroupRule`/`UserRule` **grandfathered like `ChannelRule`** (revised 2026-08-30: kept working indefinitely, `superseded?` hides them from the rule picker — NO deprecation warning, NO removal date, NO data task; migrating who-gets-which-price automatically is a silent-price-change risk merchants gain nothing from). **Constraints now:** no new reads of `spree_catalogs.price_list_id` or `bound_price_list_ids`; no new features on the grandfathered price rules (audience targeting is catalog assignment, channel pricing is the default catalog); catalog-page features (terms, pricing card) mount on the agreement editor, never parallel surfaces.
- `6.0-b2b-wholesale-shipping.md` — Wholesale/freight shipping (design finalized 2026-08-30, nothing built): **`Spree::PackageType`** — store-scoped packaging vocabulary (`box|envelope|carton|pallet|container`, one default per store Channel-style) absorbing the four `default_package_*` store preferences (one-release bridges; deliberately NOT `Spree::Package` — `Stock::Package` is the in-memory packer); variant packing chain `carton_package_type_id` + `units_per_carton` + `carton_weight` + `cartons_per_pallet` (geometry on the shared carton row, packing facts on the variant; Unit → Carton → Pallet → CBM/weight); unit-aware `Spree::FreightSummary` (units/cartons/pallets/CBM/gross weight, `complete?` flag) built on the currently-unused `Stock::Package#volume` chain via a new `Spree::Measurement` conversion helper; shipment tiers = `DeliveryMethodRules::VolumeRule` (CBM min/max) + `CompanyRule` (`company_presence`) — **no new delivery profile kind** (the same product ships parcel retail and carton wholesale, and a product has one profile); **unpriced rates are first-class** (`unpriced` on Estimate + `spree_delivery_rates`, estimator skips markup, UIs render "quoted after review" — never a $0 rate that displays as Free) returned by `DeliveryRateProvider::Freight`, whose rate `metadata` snapshots the summary + deposit terms (frozen at completion — duties doctrine, never re-derived); **deposits are collected, not displayed**: deposit terms → `Cart#amount_due_at_checkout`, `Carts::Complete` validates payments against the deposit (base = order total at placement), order completes `partially_paid` with the existing `outstanding_balance` (2026-08-30 amendment: the method-level `deposit_percentage` is a *default source* feeding the order's `payment_terms` snapshot — see `6.0-6.1-b2b-payment-terms.md`); the forwarder's quote lands later as `Fee(kind: 'freight')` through `/admin/orders/:id/fees`. **Constraints now:** all volume/CBM math goes through the unit-aware helper (raw dimension-column multiplication is forbidden — the `WeightRule` raw-number shortcut does not extend to volume); no new readers of the `default_package_*` preferences; never model quote-later as a zero-cost priced rate; carton geometry never becomes variant columns; nothing may assume a completed order is paid in full (check `payment_status`/`outstanding_balance`); post-placement freight charges are Fees, never delivery-rate edits.
@@ -57,6 +59,7 @@ Active plans (6.0 target, work pending):
- `6.0-third-party-pricing-inventory.md` — ERP / PIM / DAM integration (**Phases 1–4 + settings UI implemented 2026-08-18/19**; remaining: reference connector gem, developer guides): **Spree is the system of record for what the shopper sees, the external system for what is true** — content, media references, prices and stock levels are SYNCED in; live third-party calls happen only at decision moments (pricing a line, add-to-cart, checkout hold, completion). Shipped: `Spree::ExternalReference` + `Spree::HasExternalReferences` (one polymorphic store-scoped table, unique both ways; `system` is a string key, never an FK; `external:<system>:<id>` member paths and `external_references` on admin writes, create-with-known-key upserts; `Company#external_id` column dropped), `Spree::PricingProvider`/`Spree::InventoryProvider` bases + `Internal` + registries + four Store preferences (`pricing_provider`, `inventory_provider`, `*_failure_policy` — `strict` for pricing, `fallback` for inventory), `Spree::Pricing::PriceResolution` dispatch (cache-keyed, `handles?` fallthrough), `Stock::Quantifier(stock_levels:)` injection, `Spree::Carts::PriceItems`/`CheckAvailability` called as `external_step`s, `line_items.price_source`, `POST /admin/stock_levels/bulk_upsert`, the store-settings provider card + `GET /admin/store/data_sources`, external-URL media (`Spree::Media` `external_image` + `external_media_url`, served through `hosted_still_url`; `external_video_url` stays separate — a parsed provider embed link, not an address for bytes). **Constraints now:** no new `external_id` columns (include `Spree::HasExternalReferences`); never call an external system from `Variant#in_stock?`/`purchasable?`, `ProductScopes` or a serializer — the inventory READ path is local; provider calls are `external_step`s through `Carts::PriceItems`/`CheckAvailability`, and no new call sites of `LineItem#recalculate_price`/`update_price`; a pricing stand-in line item must be built detached, never through `cart.line_items.new` (the line-item finder finds it and doubles quantities); connectors never write `count_on_hand` directly — go through the bulk upsert or `stock_location.adjust`; a feed value that is not a number is refused, never coerced (`"12,50".to_d` is a hundredfold overcharge).
Multi-version plans (some phases shipped, some pending):
+
- `6.0-6.1-split-adjustments.md` — Replace polymorphic Adjustment with TaxLine, Discount, Fee. **6.0 implementation fully shipped to main** (typed tables + models, `Spree::Adjusters::*` winner-only promotion adjuster, `Spree.tax_provider` seam, admin `/orders/:id/{tax_lines,discounts,fees}` API + SDK + dashboard cards, `spree:migrate_adjustments_to_typed_rows` in the upgrade manifest; legacy `Adjustment`/`AdjustmentSource` deleted). v6 developer docs shipped (`docs/v6/developer/` taxes-discounts-fees + promotions + custom-promotion). Remaining: 6.1 drops `spree_adjustments` + deprecated shells and adds `Promotion#combines_with` stacking.
- `5.4-store-api-naming-standardization.md` — Standardize API naming against industry (address fields, discounts, customer_note, label, brand/last4, etc.). 5.4 model/API aliases shipped; 6.0 column/table renames pending.
- `5.4-6.0-eu-legal-compliance.md` — GDPR (data export/anonymization, consent timestamps), Omnibus (PriceHistory, lowest-in-30-days), Consumer Rights (withdrawal period). 5.4 PriceHistory + `prior_price` shipped; GDPR endpoints + withdrawal period still pending.
@@ -71,6 +74,7 @@ Multi-version plans (some phases shipped, some pending):
- `5.6-dashboard-typed-plugin-routes.md` — Plugin file routes compiled into the host's TanStack route tree: `spree.dashboard.routes` marker + virtual-route-config composition in `@spree/dashboard/vite`, `createDashboardRouter` + `<Dashboard router>` ownership inversion, typed cast-free links, cross-package collision pre-flight with package-named errors. Runtime route registry stays for dynamic/in-app cases (catch-all is lowest priority). Implemented; published-tarball spike passed.
Pending design work (drafts, no implementation yet):
+
- `6.0-6.1-b2b-payment-terms.md` — Deposit-style payment terms + bank references (design finalized 2026-08-30; **collect-first OSS, ship-first Enterprise** — Net terms/credit/invoicing/dunning stay Enterprise roadmap): ONE frozen **`payment_terms` jsonb snapshot** on cart/order (`{kind: prepaid|deposit, deposit_percentage, balance_due_label, source}`) resolved quote/order override → company `payment_term_id` (→ `Spree::PaymentTerm` store-scoped presets, `kind` class_attribute Enterprise extends with `net`) → freight-method deposit prefs (demoted to default source — wholesale plan amended) → none; `Cart#amount_due_at_checkout` reads the snapshot; the **payment schedule** (due-now/deposit-state/balance+label) is derived on read — `Orders::UpdateStatuses` untouched; balance-due moment is a LABEL, real due dates are Enterprise. 6.1: `PaymentMethod::BankTransfer` (public-preference account details), stored generated **`reference` on every payment** (structured RF-style, unique, ransackable — the reconciliation identifier), storefront pay-balance route (`POST /store/orders/:id/payments`, capped by `max_amount`). 6.0 fixes: derived `R1001-P1` number removed from ransack whitelist + Stripe `find_by(number:)` corrected (NULL column). **Constraints now:** terms read from the snapshot, never re-resolved post-placement; nothing durable keys on derived payment numbers; no net-terms/credit/due-date machinery in OSS; payment-collecting surfaces respect `amount_due_at_checkout` + `max_amount`.
- `6.1-order-stages.md` — Merchant-composed order stages (design finalized 2026-08-30; **stages are data, statuses stay code** — the doctrine ruling): store-scoped `Spree::OrderStage` rows (acts_as_list, `customer_visible` flag, optional **auto-enter event binding** from the `Spree.order_stage_events` registry — event-driven labeling, never gating) composed visually in a dashboard settings page; `spree_orders.order_stage_id` (nullable) + `expected_ready_on` (order-level merchant promise — distinct from variant `preorder_ships_at` supply fact and fulfillment `estimated_delivery_at` carrier truth); `Orders::SetStage` is the single writer (manual select or binding subscriber), publishes `order.stage_changed` (automation rides events); store serializer shows the stage only when visible + a progress indicator over the visible ordered subset. **No transition graph ever; stages carry zero commerce semantics** — nothing in checkout/payments/stock/fulfillment may branch on `order_stage_id`; a needed GATE is a code status/workflow validation, never a stage; no per-store vocabularies on `has_status` models (statuses are process-global code); `Order` deliberately NOT migrated to `has_status`. No platform offers composed stages (nearest: display labels pinned to fixed states, or code-config state machines) — OSS first.
- `6.1-b2b-order-documents.md` — Order Documents area + logistics prints (design finalized 2026-08-30): `Spree::OrderDocument` (order-nested uploads, private storage + spoofing protection, per-document `customer_visible` default false, buyer uploads allowed, `po_document` keeps its dedicated semantic slot) + two client-side HTML prints extending the shipped packing-slip pattern — carton/pallet/CBM **packing list** off the frozen freight summary, **payment-instructions sheet** off the terms schedule + bank reference. **No invoice vocabulary in OSS** (no model/number/document named invoice, no PDF stack — numbered proforma/commercial docs are Enterprise invoicing); order-facing files go through `OrderDocument` or a dedicated semantic slot, never loose attachments; prints render `po_number` + payment reference when present.
@@ -86,6 +90,7 @@ Pending design work (drafts, no implementation yet):
- `6.1-exchange-rates.md` — `Spree::ExchangeRate` + `ExchangeRateProvider` (ECB feed as the credential-free default, registry copied from `tax_providers`/`delivery_rate_providers`, keyed providers via `Spree::Integration`). **Rates fill fields, they never price anything** — a merchant gets editable suggestions for the other currencies and what persists is a plain number they own; Spree's "one explicit amount per currency, no FX" stance is unchanged. Never at charge time: EU VAT Directive Art. 91 pins the rate to the instant VAT becomes chargeable, so a commission invoice's VAT figure must be frozen with its rate/date/source or the platform cannot reproduce its own filed documents (Shopify converts at capture and is the wrong pattern here; Vendure/Medusa/Saleor never convert in core). Rates are stored historically and looked up **most-recent-on-or-before**, never exact-date (the ECB skips weekends); cross-currency derives through the base per Art. 91, never stored as a third row; rate precision is NOT money's `decimal(_,2)`. **Constraints now:** never set `Money.default_bank` or call `exchange_to` (the empty rate store raising `UnknownRate` is correct); new money configuration is born per currency, never one amount + a currency column; no conversion endpoint on any API. Also records two live promotion bugs found while researching it — `Calculator::FlatRate` silently discounts **zero** on a currency mismatch, and `Promotion::Rules::ItemTotal` stores a bare threshold with no currency — both independent of this feature.
Shipped plans:
+
- `6.0-b2b-companies-and-catalogs.md` — B2B companies as a **multi-level organization tree** + Catalogs pulled into 6.0 (**implemented 2026-08-25**; replaced the unreleased Company→CompanyLocation→CompanyContact prototype outright — migrations rewritten in place, no bridges). One `spree_companies` table: self-referential `parent_id`, `kind` = `company` (legal entity) | `division`, depth capped at `MAX_DEPTH` (5), roots must be `company`; **`#legal_entity` (nearest self-or-ancestor company node) is the single tax anchor** — TaxIdentifier/TaxExemptionCertificate refuse division owners, and purchases read `company_legal_entity`, never the node. `CompanyAddress` (owned rows, labeled, one default per kind via Channel-style demotion + partial index), `CompanyMembership` (always customer-backed; standing = node + subtree, checked via `Customer#standing_for?`/`company_standing(store:)` — never node equality), `CompanyInvitation` (plaintext token, 30-day expiry, pending-scoped uniqueness; mail in `spree/emails`, acceptance via `CompanyInvitations::Accept` running `Customers::Create`; both member-adding surfaces converge on `Companies::AddMember` by email). Carts/orders carry `company_id` (any node; cart-side standing validation, sole-membership resolution in `resolved_company`, frozen at completion). **Catalogs:** `Catalog` (assortment + optional PriceList) + `CatalogProduct` (membership only — **no position**: a catalog decides what a buyer sees, never the order they see it in; category/collection membership stays positioned) + polymorphic `CatalogAssignment` (CustomerGroup|Company — buyer audiences only, company assignments cover the subtree; narrowed 2026-08-28 from the original four: Channel/Market were write-only — a channel's catalog is `spree_channels.default_catalog_id`, a market catalog returns only with a designed regional-assortment reader); visibility = `Products::ForContext` (union of effective catalogs, wired into the store products listing), pricing = catalog price lists nearest-node-first in `Pricing::Resolver` (catalog-bound lists excluded from generic rule matching — a rule-less list must not leak to everyone). Store API self-service (`/store/account/companies`, `/store/companies/*`, unauthenticated invitation lookup/accept, writable cart `company_id`) authorizes by **standing + `Storefront::AccessPolicy`** (company branch answers yes for any member — OSS has no company roles; Enterprise narrows via the policy class + checkout hooks). Dashboard: lazy tree list, node page (sub-units/members+invitations/address book; tax cards hidden on divisions), catalogs pages; slots renamed `company_membership.*`, `company.form_*` only. **Constraints:** never reference the deleted location/contact models; no governance fields on OSS models; `kind` stays the fixed two (divergence = STI, never a second table); catalog/company lookups store-scoped including incidental ids. **Amended 2026-08-30 (one-question-per-entity doctrine — decisions.md):** the Catalog is the **commercial agreement** — it grows commercial terms (catalog-level `minimum_order_quantity`/`order_multiple` columns + per-variant override rows + per-currency order minimums, owned by `6.0-b2b-quantity-rules.md`); the list binding **inverts** to `spree_price_lists.catalog_id` (a list is standalone or owned by ONE catalog; generic rule matching skips owned lists by FK — the shipped active-catalogs-only derived set leaked a deactivated catalog's rule-less list to the whole store); `PriceRules::CustomerGroupRule`/`UserRule` grandfathered alongside `PriceRules::ChannelRule` (all kept working, hidden from the picker, nothing new builds on them — forward path is catalog assignment, and for a channel its default catalog); dashboard goes catalog-first with one-go setup (inline `price_list` payload on catalog create/update, products-with-prices view). Implementation extracted to `6.0-catalog-agreement-rework.md` (Draft).
- `5.4-store-api-bridges.md` — Bridge 6.0 naming into 5.4 Store API (PR #13782)
- `5.4-spree-starter-and-create-spree-app.md` — Replace monorepo server/ with spree-starter template repo
@@ -102,7 +107,7 @@ Shipped plans:
## Monorepo Structure
| Directory | Description |
-|---|---|
+| --- | --- |
| `spree/core` | Ruby gem — models, services, business logic (`spree_core`) |
| `spree/api` | Ruby gem — Store & Admin REST APIs (`spree_api`) |
| `spree/emails` | Ruby gem — transactional emails (optional). Rebuilt + modernized in 5.6. The default email stack for installations without a storefront app (e.g. mobile apps); headless storefronts may instead own consumer emails via webhooks. |
@@ -148,7 +153,7 @@ It is deliberately **not** a member of this pnpm workspace — one lockfile and
One-time machine setup: Homebrew `postgresql@18` running on :5432 (with a `postgres` superuser role), `mailpit` (`brew services start mailpit` — one instance serves every worktree), Ruby per `server/.ruby-version` (mise or rbenv), Node ≥ 24 with `npm i -g portless` (start the proxy once with `portless proxy start`, accepting sudo for :443), worktrunk, then `pnpm wt:template`.
| What changed | What to run (inside the worktree) |
-|---|---|
+| --- | --- |
| Ruby code in `spree/*` gems | Nothing — path gems, reloads on next request |
| New migration in a gem | `cd server && bin/rails spree:install:migrations db:migrate`; then `pnpm wt:template` once so future worktrees inherit it |
| Deleted and re-cloned `server/` | `pnpm wt:template` — the 6.0 migrations still ship from the gems, so re-cloning renumbers them and the old template no longer matches. `wt:setup` refuses to provision from a mismatched template and rebuilds it automatically when it re-created `server/` itself |
@@ -397,6 +402,7 @@ Located in `api/app/serializers/spree/api/v3/`. Store and Admin APIs have separa
The Store API is a customer-facing surface. The Admin API is a back-office surface. Two rules govern which serializer an attribute belongs to:
**Store serializer (customer-visible):**
+
- Public product/category/cart/order data the customer sees in the storefront
- Computed display values (`display_total`, `purchasable`, `in_stock`)
- Customer-facing pricing (`price`, `compare_at_price`, `prior_price` for EU Omnibus)
@@ -404,6 +410,7 @@ The Store API is a customer-facing surface. The Admin API is a back-office surfa
- **No internal state** — never expose `cost_price`, internal status flags, soft-delete columns, audit logs, internal notes, `metadata`, or admin-only relations (sellers, fulfillment providers)
**Admin serializer (back-office):**
+
- Always include `created_at`, `updated_at`, and `deleted_at` (when paranoid)
- Cost price, margins, internal notes, `metadata`
- Internal status, audit fields (`approved_by_id`, `cancelled_by_id`)
@@ -466,6 +473,7 @@ Four credential types, each with its own header and authorization model:
- **Guest cart tokens** — `X-Spree-Token` header. Authorizes operations on a specific guest cart.
Admin API authorization summary:
+
- Secret API key + scopes → for apps and integrations (audit-friendly, fine-grained)
- JWT + CanCanCan → for human admin users (role-based)
@@ -548,12 +556,14 @@ pnpm format # Biome format-write
TypeScript SDK for the customer-facing Store API v3.
**Structure:**
+
- `src/client.ts` — `createClient()` factory, `ClientConfig` interface
- `src/store-client.ts` — all REST endpoints as resource classes (`client.products.list()`, `client.carts.create()`, etc.)
- `src/types/generated/` — auto-generated TypeScript types from Alba serializers
- `src/zod/generated/` — auto-generated Zod schemas for runtime validation
**Patterns:**
+
- Flat resource pattern: `client.products.list()`, `client.carts.items.create()`
- Auth modes: publishable key (guest), JWT (customer)
- Automatic retry with exponential backoff
@@ -579,6 +589,7 @@ Same patterns as `@spree/sdk` but for the Admin API. Supports both secret key (s
The Spree 6.0 admin dashboard — a Vite-built React SPA that replaces the legacy Rails `spree/admin` engine entirely. Tech stack: Vite, TanStack Router (file-based, type-safe), TanStack Query, React Hook Form + Zod, shadcn/ui + Base UI + Tailwind, Biome, Vitest. All API calls go through `@spree/admin-sdk`. See [`packages/dashboard/README.md`](packages/dashboard/README.md) and `docs/plans/6.0-admin-spa.md` for the full architecture (auth, permissions, multi-store, extension points, the three-package split).
**Package boundary rules** (see `docs/plans/6.0-admin-spa.md` → "Package Split"):
+
- `@spree/dashboard-ui` — primitives + headless compounds. Components accept data via props, never import providers or hooks.
- `@spree/dashboard-core` — registries, providers, generic infra hooks, admin SDK client singleton, `defineDashboardPlugin`.
- `@spree/dashboard` — routes, resource hooks (`use-orders`, `use-products`, …), Zod schemas, locales, app shell.
@@ -639,6 +650,7 @@ async function handleSubmit(values: FormValues) {
**Base UI `<Select>` does not auto-render labels.** Unlike Radix, Base UI's `<Select.Value />` renders the raw selected `value` (the slug, the ISO code, the prefixed ID) instead of the matching `<SelectItem>`'s children. Two fixes:
1. **Static option labels** — pass an `items` array; Base UI resolves the trigger label automatically:
+
```tsx
<Select items={KIND_OPTIONS} value={...} onValueChange={...}>
<SelectTrigger><SelectValue /></SelectTrigger>
@@ -647,7 +659,9 @@ async function handleSubmit(values: FormValues) {
</SelectContent>
</Select>
```
+
2. **Dynamic option labels** — use the children render-prop:
+
```tsx
<SelectValue>{(value) => roles.find((r) => r.id === value)?.name ?? (value as string)}</SelectValue>
```
@@ -668,12 +682,13 @@ Use `verticalListSortingStrategy` for rows/lists, `rectSortingStrategy` for grid
Wire through `<Controller>` in forms; pass `value`/`onChange` directly in filter panels. **Inside a `<Sheet>`, pass `inline`** — the default Popover path hits the portal bug below.
+When displaying amount or percentage fields please always use `<InputGroup>` with a suffix/prefix, showing `%` or currency signs. Also numeric fields should use `number` input type.
+
**Base UI `<Popover>` is unreliable inside a `<Sheet>`'s portal tree.** Symptom: the trigger gets `aria-expanded="true"` and `data-popup-open=""` on click, but no `[data-slot="popover-content"]` ever appears in the DOM. Happens in deeply-nested portal trees (Sheet → SortableContext → TableRow → Popover). Fix: render the panel inline with `absolute top-full left-0 z-50` + a `document.pointerdown` click-outside listener + Escape-to-close. A portal is only needed to escape an `overflow: hidden` ancestor; for table cells and form fields, inline is fine. Reference: `components/spree/color-picker.tsx`, plus `<StoreDatePicker inline>` above.
`Currency` should be always rendered as a dropdown using `currency-select.tsx` component, this also applies to Preferences fields representing currency
`Country` and `Countries` fields should always use `copuntry-combobox.tsx` component, this also applies to preferences fields representing a single country or multiple choices
-
### @spree/sdk-core — Shared HTTP Layer
Private package providing `createRequestFn()`, `SpreeError`, retry logic, and Ransack param transformation. Used internally by both SDKs.
@@ -736,6 +751,7 @@ bundle exec parallel_rspec -n 4 spec # with worker count
Re-run `parallel_setup` after schema changes.
**Test guidelines:**
+
- RSpec + Factory Bot
- Prefer `build` over `create` for speed, use `create_list` for creating multiple records
- Factories live in `lib/spree/testing_support/factories/`
@@ -780,12 +796,14 @@ await Promise.all([
```
The narrow exceptions where API-level waits are justified:
+
- **No UI feedback** — a mutation kicks off background work (e.g., a webhook fire-and-forget) and there's nothing visible to assert against.
- **Optimistic UI** — success state appears in the DOM before the API confirms; a UI-only assertion can't distinguish "rendered and persisted" from "rendered but later failed."
Both are rare in the admin SPA, which renders success states only after mutations resolve.
**Conventions:**
+
- Use `Date.now()` suffixes on names so leftover rows from earlier specs don't collide (the suite runs serially — `fullyParallel: false, workers: 1`).
- Disambiguate duplicate button names (e.g., a "Delete" in the sheet footer + another in a confirm dialog) by scoping: `page.getByRole('dialog').getByRole('button', { name: /^delete$/i })`.
- Reference: `e2e/option-types.spec.ts`, `e2e/invitation-acceptance.spec.ts`.
diff --git a/packages/dashboard-core/package.json b/packages/dashboard-core/package.json
index 1f922491f7..b891ba6943 100644
--- a/packages/dashboard-core/package.json
+++ b/packages/dashboard-core/package.json
@@ -2,7 +2,7 @@
"name": "@spree/dashboard-core",
"license": "MIT",
"version": "0.13.1",
- "description": "Spree Dashboard framework — registries (table, nav, slot, settings-nav), providers (auth, permission, store), admin SDK client, generic infra hooks, and the defineDashboardPlugin extension API. Developer Preview.",
+ "description": "Spree Dashboard framework \u2014 registries (table, nav, slot, settings-nav), providers (auth, permission, store), admin SDK client, generic infra hooks, and the defineDashboardPlugin extension API. Developer Preview.",
"author": "Vendo Connect Inc.",
"homepage": "https://spreecommerce.org",
"repository": {
@@ -60,9 +60,9 @@
"@spree/admin-sdk": ">=0.7.0 <2",
"@spree/dashboard-ui": ">=0.10.0 <2",
"@tanstack/react-hotkeys": "^0.10.0",
- "@tanstack/react-table": "^8.21.3",
"@tanstack/react-query": "^5.100.9",
"@tanstack/react-router": "^1.169.2",
+ "@tanstack/react-table": "^8.21.3",
"i18next": "^26.2.0",
"react": "^19.2.6",
"react-dom": "^19.2.6",
diff --git a/packages/dashboard-core/src/components/app-sidebar.tsx b/packages/dashboard-core/src/components/app-sidebar.tsx
index 99e7f26b57..3733158b21 100644
--- a/packages/dashboard-core/src/components/app-sidebar.tsx
+++ b/packages/dashboard-core/src/components/app-sidebar.tsx
@@ -1,6 +1,6 @@
import { Sidebar, SidebarContent, SidebarHeader } from '@spree/dashboard-ui'
+import { PackageIcon } from '@spree/dashboard-ui/icons'
import { useParams } from '@tanstack/react-router'
-import { PackageIcon } from 'lucide-react'
import type { ComponentProps, ReactNode } from 'react'
import { useAuth } from '../hooks/use-auth'
import { primarySidebarSide, useTranslation } from '../lib/i18n'
diff --git a/packages/dashboard-core/src/components/bulk-action-bar.tsx b/packages/dashboard-core/src/components/bulk-action-bar.tsx
index f47b0ab22f..b0d4afdf67 100644
--- a/packages/dashboard-core/src/components/bulk-action-bar.tsx
+++ b/packages/dashboard-core/src/components/bulk-action-bar.tsx
@@ -7,9 +7,9 @@ import {
toastManager,
useConfirm,
} from '@spree/dashboard-ui'
+import { EllipsisVerticalIcon } from '@spree/dashboard-ui/icons'
import type { QueryKey } from '@tanstack/react-query'
import { useQueryClient } from '@tanstack/react-query'
-import { EllipsisVerticalIcon } from 'lucide-react'
import type { ReactNode } from 'react'
import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard-core/src/components/export-button.tsx b/packages/dashboard-core/src/components/export-button.tsx
index 9b4c8c37e4..122c88d0d1 100644
--- a/packages/dashboard-core/src/components/export-button.tsx
+++ b/packages/dashboard-core/src/components/export-button.tsx
@@ -15,8 +15,8 @@ import {
RadioGroup,
RadioGroupItem,
} from '@spree/dashboard-ui'
+import { DownloadIcon, FilterIcon, GlobeIcon } from '@spree/dashboard-ui/icons'
import type { TFunction } from 'i18next'
-import { DownloadIcon, FilterIcon, GlobeIcon } from 'lucide-react'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useExport } from '../hooks/use-export'
diff --git a/packages/dashboard-core/src/components/file-upload-field.tsx b/packages/dashboard-core/src/components/file-upload-field.tsx
index 41411d256d..b6f223c1a1 100644
--- a/packages/dashboard-core/src/components/file-upload-field.tsx
+++ b/packages/dashboard-core/src/components/file-upload-field.tsx
@@ -12,7 +12,7 @@ import {
FieldLabel,
toastManager,
} from '@spree/dashboard-ui'
-import { FileIcon, UploadCloudIcon, XIcon } from 'lucide-react'
+import { FileIcon, UploadCloudIcon, XIcon } from '@spree/dashboard-ui/icons'
import { type ReactNode, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useDirectUpload } from '../hooks/use-direct-upload'
@@ -213,7 +213,7 @@ export function FileUploadField({
Enter/Space; the label paints a focus ring via has-[:focus-visible]. */}
<label
className={cn(
- 'flex cursor-pointer flex-col items-center justify-center gap-2 rounded-md border border-border border-dashed bg-muted/40 px-4 py-8 text-center transition-colors hover:bg-muted',
+ 'flex cursor-pointer flex-col items-center justify-center gap-2 rounded-md border border-border border-dashed bg-muted/40 px-4 py-8 text-center transition-colors hover:bg-accent/50',
'has-[:focus-visible]:border-ring has-[:focus-visible]:ring-[3px] has-[:focus-visible]:ring-ring/50',
(disabled || !!pending) && 'pointer-events-none opacity-60',
)}
@@ -228,7 +228,7 @@ export function FileUploadField({
<span className="text-muted-foreground text-sm">
{dropLabel ?? t('admin.components.file_upload.drop_label')}
</span>
- <span className="mt-1 inline-flex h-8 items-center rounded-md border border-border bg-background px-3 font-medium text-sm shadow-xs">
+ <span className="mt-1 inline-flex h-8 items-center rounded-md border border-border bg-background px-3 font-medium text-sm hover:bg-accent">
{browseLabel ?? t('admin.components.file_upload.browse')}
</span>
<input
diff --git a/packages/dashboard-core/src/components/import-button.tsx b/packages/dashboard-core/src/components/import-button.tsx
index 8e2077ee6c..c22ae557d9 100644
--- a/packages/dashboard-core/src/components/import-button.tsx
+++ b/packages/dashboard-core/src/components/import-button.tsx
@@ -15,7 +15,7 @@ import {
SheetTitle,
toastManager,
} from '@spree/dashboard-ui'
-import { DownloadIcon, FileSpreadsheetIcon, UploadIcon } from 'lucide-react'
+import { DownloadIcon, FileSpreadsheetIcon, UploadIcon } from '@spree/dashboard-ui/icons'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import type { PanelImport } from '../api-client'
diff --git a/packages/dashboard-core/src/components/import-wizard-dialog.tsx b/packages/dashboard-core/src/components/import-wizard-dialog.tsx
index f7fd976817..4ffab229b7 100644
--- a/packages/dashboard-core/src/components/import-wizard-dialog.tsx
+++ b/packages/dashboard-core/src/components/import-wizard-dialog.tsx
@@ -35,7 +35,7 @@ import {
DownloadIcon,
RotateCcwIcon,
XIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
import { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import type { PanelImport, PanelImportRow } from '../api-client'
diff --git a/packages/dashboard-core/src/components/media-picker-sheet.tsx b/packages/dashboard-core/src/components/media-picker-sheet.tsx
index 7806a2781e..892297424c 100644
--- a/packages/dashboard-core/src/components/media-picker-sheet.tsx
+++ b/packages/dashboard-core/src/components/media-picker-sheet.tsx
@@ -8,8 +8,8 @@ import {
SheetHeader,
SheetTitle,
} from '@spree/dashboard-ui'
+import { CheckIcon, ImageIcon, Loader2Icon, PlayIcon, UploadIcon } from '@spree/dashboard-ui/icons'
import { useQuery } from '@tanstack/react-query'
-import { CheckIcon, ImageIcon, Loader2Icon, PlayIcon, UploadIcon } from 'lucide-react'
import { useDeferredValue, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useTenantId } from '../providers/tenant-provider'
diff --git a/packages/dashboard-core/src/components/page-header.tsx b/packages/dashboard-core/src/components/page-header.tsx
index eb4a568d45..31ddfbde8c 100644
--- a/packages/dashboard-core/src/components/page-header.tsx
+++ b/packages/dashboard-core/src/components/page-header.tsx
@@ -10,8 +10,14 @@ import {
useCopyToClipboard,
useScrolled,
} from '@spree/dashboard-ui'
+import {
+ BracesIcon,
+ CheckIcon,
+ CopyIcon,
+ EllipsisVerticalIcon,
+ TrashIcon,
+} from '@spree/dashboard-ui/icons'
import type { JsonPreviewDrawerProps } from '@spree/dashboard-ui/spree/json-preview-drawer'
-import { BracesIcon, CheckIcon, CopyIcon, EllipsisVerticalIcon, TrashIcon } from 'lucide-react'
import { lazy, type ReactNode, Suspense, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useRegisterPageHeader } from '../providers/sticky-header-provider'
diff --git a/packages/dashboard-core/src/components/preferences-form.tsx b/packages/dashboard-core/src/components/preferences-form.tsx
index f758372001..1cb275e332 100644
--- a/packages/dashboard-core/src/components/preferences-form.tsx
+++ b/packages/dashboard-core/src/components/preferences-form.tsx
@@ -9,7 +9,7 @@ import {
Switch,
Textarea,
} from '@spree/dashboard-ui'
-import { PlusIcon, TrashIcon } from 'lucide-react'
+import { PlusIcon, TrashIcon } from '@spree/dashboard-ui/icons'
import { useId, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { CurrencySelect } from './currency-select'
diff --git a/packages/dashboard-core/src/components/resource-picker-sheet.tsx b/packages/dashboard-core/src/components/resource-picker-sheet.tsx
index a209f54ef9..9ef1b1837a 100644
--- a/packages/dashboard-core/src/components/resource-picker-sheet.tsx
+++ b/packages/dashboard-core/src/components/resource-picker-sheet.tsx
@@ -10,8 +10,8 @@ import {
SheetTitle,
Thumbnail,
} from '@spree/dashboard-ui'
+import { Loader2Icon } from '@spree/dashboard-ui/icons'
import { useQuery } from '@tanstack/react-query'
-import { Loader2Icon } from 'lucide-react'
import { useDeferredValue, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard-core/src/components/settings-sidebar.tsx b/packages/dashboard-core/src/components/settings-sidebar.tsx
index dbb4623a68..961f359001 100644
--- a/packages/dashboard-core/src/components/settings-sidebar.tsx
+++ b/packages/dashboard-core/src/components/settings-sidebar.tsx
@@ -14,8 +14,8 @@ import {
SidebarMenuButton,
SidebarMenuItem,
} from '@spree/dashboard-ui'
+import { ArrowLeftIcon, PackageIcon } from '@spree/dashboard-ui/icons'
import { Link, useParams, useRouterState } from '@tanstack/react-router'
-import { ArrowLeftIcon, PackageIcon } from 'lucide-react'
import { useEffect, useMemo, useState, useSyncExternalStore } from 'react'
import { useTranslation } from 'react-i18next'
import { isPathWithin, resolveNavLabel } from '../lib/nav-registry'
diff --git a/packages/dashboard-core/src/components/store-switcher.tsx b/packages/dashboard-core/src/components/store-switcher.tsx
index 4e3626ab30..86c4824605 100644
--- a/packages/dashboard-core/src/components/store-switcher.tsx
+++ b/packages/dashboard-core/src/components/store-switcher.tsx
@@ -11,8 +11,8 @@ import {
Skeleton,
useSidebar,
} from '@spree/dashboard-ui'
+import { CheckIcon, ChevronsUpDownIcon } from '@spree/dashboard-ui/icons'
import { Link } from '@tanstack/react-router'
-import { CheckIcon, ChevronsUpDownIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { useAuth } from '../hooks/use-auth'
import { useStore } from '../providers/store-provider'
diff --git a/packages/dashboard-core/src/components/table-toolbar.tsx b/packages/dashboard-core/src/components/table-toolbar.tsx
index eacab2a2c3..a4481aa357 100644
--- a/packages/dashboard-core/src/components/table-toolbar.tsx
+++ b/packages/dashboard-core/src/components/table-toolbar.tsx
@@ -25,7 +25,6 @@ import {
TooltipContent,
TooltipTrigger,
} from '@spree/dashboard-ui'
-import { useQuery } from '@tanstack/react-query'
import {
ArrowUpDownIcon,
CheckIcon,
@@ -34,7 +33,8 @@ import {
Columns3Icon,
ListFilter,
XIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
+import { useQuery } from '@tanstack/react-query'
import { useCallback, useDeferredValue, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { getApiClient } from '../api-client'
diff --git a/packages/dashboard-core/src/components/top-bar-breadcrumbs.tsx b/packages/dashboard-core/src/components/top-bar-breadcrumbs.tsx
index 32705c2882..abb043494b 100644
--- a/packages/dashboard-core/src/components/top-bar-breadcrumbs.tsx
+++ b/packages/dashboard-core/src/components/top-bar-breadcrumbs.tsx
@@ -6,8 +6,8 @@ import {
BreadcrumbPage,
BreadcrumbSeparator,
} from '@spree/dashboard-ui'
+import { MenuIcon } from '@spree/dashboard-ui/icons'
import { Link, useParams, useRouterState } from '@tanstack/react-router'
-import { MenuIcon } from 'lucide-react'
import { Fragment, type ReactNode, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { isPathWithin, type NavEntry, resolveNavLabel, useNavEntries } from '../lib/nav-registry'
diff --git a/packages/dashboard-core/src/components/top-bar.tsx b/packages/dashboard-core/src/components/top-bar.tsx
index d21dfb7a23..20a3529bc6 100644
--- a/packages/dashboard-core/src/components/top-bar.tsx
+++ b/packages/dashboard-core/src/components/top-bar.tsx
@@ -24,7 +24,7 @@ import {
MessageCircleIcon,
SearchIcon,
UserIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
import { useAuth } from '../hooks/use-auth'
import { useCommandPalette } from '../hooks/use-command-palette'
@@ -79,7 +79,7 @@ export function TopBar({
return (
<header
className={cn(
- 'sticky top-0 z-40 flex h-header-height shrink-0 items-center gap-3 bg-background/90 px-4 border-b border-border/75 backdrop-blur supports-[backdrop-filter]:bg-background/75',
+ 'sticky top-0 z-40 flex h-header-height shrink-0 items-center gap-3 bg-background/90 px-4 border-b border-sidebar-border backdrop-blur supports-[backdrop-filter]:bg-background/75',
'transition-transform duration-200 ease-out motion-reduce:transition-none',
hidden && '-translate-y-full',
)}
diff --git a/packages/dashboard-core/src/pages/stock-locations.tsx b/packages/dashboard-core/src/pages/stock-locations.tsx
index f3474b6043..136ddb094b 100644
--- a/packages/dashboard-core/src/pages/stock-locations.tsx
+++ b/packages/dashboard-core/src/pages/stock-locations.tsx
@@ -23,8 +23,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { type ComponentType, useEffect } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard-core/src/products/inventory-section.tsx b/packages/dashboard-core/src/products/inventory-section.tsx
index af7a6facc5..f5f3e54f42 100644
--- a/packages/dashboard-core/src/products/inventory-section.tsx
+++ b/packages/dashboard-core/src/products/inventory-section.tsx
@@ -7,8 +7,8 @@ import {
ReadOnlyCell,
SwitchCell,
} from '@spree/dashboard-ui'
+import { ExternalLinkIcon } from '@spree/dashboard-ui/icons'
import type { ColumnDef } from '@tanstack/react-table'
-import { ExternalLinkIcon } from 'lucide-react'
import { useCallback, useMemo } from 'react'
import { type UseFormReturn, useWatch } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard-core/src/products/media-edit-sheet.tsx b/packages/dashboard-core/src/products/media-edit-sheet.tsx
index 14cd047ca1..ebbc940602 100644
--- a/packages/dashboard-core/src/products/media-edit-sheet.tsx
+++ b/packages/dashboard-core/src/products/media-edit-sheet.tsx
@@ -13,8 +13,8 @@ import {
SheetHeader,
SheetTitle,
} from '@spree/dashboard-ui'
+import { CheckIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { CheckIcon } from 'lucide-react'
import { useCallback, useEffect, useRef } from 'react'
import type { UseFormReturn } from 'react-hook-form'
import type { PanelVariant as Variant } from './product-types'
diff --git a/packages/dashboard-core/src/products/product-form-cards.tsx b/packages/dashboard-core/src/products/product-form-cards.tsx
index 3dec297d22..886ea74d5e 100644
--- a/packages/dashboard-core/src/products/product-form-cards.tsx
+++ b/packages/dashboard-core/src/products/product-form-cards.tsx
@@ -59,7 +59,7 @@ import {
PencilIcon,
PlayIcon,
TrashIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { type Control, Controller, type UseFormReturn, useWatch } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard-core/src/products/variants-options-builder.tsx b/packages/dashboard-core/src/products/variants-options-builder.tsx
index 9724d38fad..7fc1d4aa32 100644
--- a/packages/dashboard-core/src/products/variants-options-builder.tsx
+++ b/packages/dashboard-core/src/products/variants-options-builder.tsx
@@ -11,7 +11,7 @@ import {
SelectValue,
toastManager,
} from '@spree/dashboard-ui'
-import { CheckIcon, PencilIcon, PlusIcon, XIcon } from 'lucide-react'
+import { CheckIcon, PencilIcon, PlusIcon, XIcon } from '@spree/dashboard-ui/icons'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { getApiClient, type PanelOptionType as OptionType } from '../api-client'
diff --git a/packages/dashboard-core/src/products/variants-section.tsx b/packages/dashboard-core/src/products/variants-section.tsx
index 25d7cc8063..3825292e9a 100644
--- a/packages/dashboard-core/src/products/variants-section.tsx
+++ b/packages/dashboard-core/src/products/variants-section.tsx
@@ -31,7 +31,7 @@ import {
TableHeader,
TableRow,
} from '@spree/dashboard-ui'
-import { PencilIcon, XIcon } from 'lucide-react'
+import { PencilIcon, XIcon } from '@spree/dashboard-ui/icons'
import { type CSSProperties, useEffect, useMemo, useState } from 'react'
import { type UseFormReturn, useFieldArray, useWatch } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard-core/src/tables/stock-locations.tsx b/packages/dashboard-core/src/tables/stock-locations.tsx
index 538411690d..924946a014 100644
--- a/packages/dashboard-core/src/tables/stock-locations.tsx
+++ b/packages/dashboard-core/src/tables/stock-locations.tsx
@@ -1,6 +1,6 @@
import { ActiveBadge, ResourceNameCell } from '@spree/dashboard-ui'
+import { WarehouseIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { WarehouseIcon } from 'lucide-react'
import type { PanelStockLocation } from '../api-client'
import { defineTable } from '../lib/table-registry'
diff --git a/packages/dashboard-plugin-example/src/pages/brands-list.tsx b/packages/dashboard-plugin-example/src/pages/brands-list.tsx
index ec4d5f9d0c..4616c25144 100644
--- a/packages/dashboard-plugin-example/src/pages/brands-list.tsx
+++ b/packages/dashboard-plugin-example/src/pages/brands-list.tsx
@@ -1,6 +1,6 @@
import { type ResourceSearch, ResourceTable } from '@spree/dashboard-core'
import { Button } from '@spree/dashboard-ui'
-import { PlusIcon } from 'lucide-react'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
import { type BrandsListParams, brandsClient } from '../client'
import type { Brand } from '../types'
diff --git a/packages/dashboard-ui/package.json b/packages/dashboard-ui/package.json
index e057a94bdf..3fd8941f9e 100644
--- a/packages/dashboard-ui/package.json
+++ b/packages/dashboard-ui/package.json
@@ -24,6 +24,7 @@
"types": "./src/index.ts",
"exports": {
".": "./src/index.ts",
+ "./icons": "./src/spree/icons.ts",
"./styles.css": "./src/styles.css",
"./ui/*": "./src/ui/*.tsx",
"./spree/*": "./src/spree/*.tsx",
diff --git a/packages/dashboard-ui/src/spree/address-book-row.tsx b/packages/dashboard-ui/src/spree/address-book-row.tsx
index 11fe4b9ca4..111102e3c0 100644
--- a/packages/dashboard-ui/src/spree/address-book-row.tsx
+++ b/packages/dashboard-ui/src/spree/address-book-row.tsx
@@ -1,4 +1,3 @@
-import { EllipsisVerticalIcon, PencilIcon, TrashIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { Badge } from '../ui/badge'
import { Button } from '../ui/button'
@@ -9,6 +8,7 @@ import {
DropdownMenuTrigger,
} from '../ui/dropdown-menu'
import { AddressBlock, type AddressBlockValue } from './address-block'
+import { EllipsisVerticalIcon, PencilIcon, TrashIcon } from './icons'
/** What every address book row needs, whoever owns the book. */
export interface AddressBookEntry extends AddressBlockValue {
diff --git a/packages/dashboard-ui/src/spree/back-button.tsx b/packages/dashboard-ui/src/spree/back-button.tsx
index 2abe08aa89..cf570da206 100644
--- a/packages/dashboard-ui/src/spree/back-button.tsx
+++ b/packages/dashboard-ui/src/spree/back-button.tsx
@@ -1,6 +1,6 @@
import { useParams, useRouter } from '@tanstack/react-router'
-import { ArrowLeftIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
+import { ArrowLeftIcon } from './icons'
interface BackButtonProps {
/**
diff --git a/packages/dashboard-ui/src/spree/copy-to-clipboard-button.tsx b/packages/dashboard-ui/src/spree/copy-to-clipboard-button.tsx
index 1d0ab10c88..ba9e0f9365 100644
--- a/packages/dashboard-ui/src/spree/copy-to-clipboard-button.tsx
+++ b/packages/dashboard-ui/src/spree/copy-to-clipboard-button.tsx
@@ -1,8 +1,8 @@
-import { CheckIcon, CopyIcon } from 'lucide-react'
import type { ComponentProps, ReactNode } from 'react'
import { useCopyToClipboard } from '../hooks/use-copy-to-clipboard'
import { cn } from '../lib/utils'
import { Button } from '../ui/button'
+import { CheckIcon, CopyIcon } from './icons'
type ButtonProps = ComponentProps<typeof Button>
diff --git a/packages/dashboard-ui/src/spree/drag-handle.tsx b/packages/dashboard-ui/src/spree/drag-handle.tsx
index 3d2a78f0d2..974cc24bae 100644
--- a/packages/dashboard-ui/src/spree/drag-handle.tsx
+++ b/packages/dashboard-ui/src/spree/drag-handle.tsx
@@ -1,8 +1,8 @@
import type { DraggableAttributes, DraggableSyntheticListeners } from '@dnd-kit/core'
-import { GripVerticalIcon } from 'lucide-react'
import type { ComponentProps } from 'react'
import { useTranslation } from 'react-i18next'
import { cn } from '../lib/utils'
+import { GripVerticalIcon } from './icons'
interface DragHandleProps extends Omit<ComponentProps<'button'>, 'type'> {
/** `attributes` from `useSortable` / `useDraggable`. */
diff --git a/packages/dashboard-ui/src/spree/file-type-icon.tsx b/packages/dashboard-ui/src/spree/file-type-icon.tsx
index b45200264b..0dff19b0ac 100644
--- a/packages/dashboard-ui/src/spree/file-type-icon.tsx
+++ b/packages/dashboard-ui/src/spree/file-type-icon.tsx
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react'
import {
FileArchiveIcon,
FileAudioIcon,
@@ -7,8 +8,7 @@ import {
FileSpreadsheetIcon,
FileTextIcon,
FileVideoIcon,
-} from 'lucide-react'
-import type { ComponentType } from 'react'
+} from './icons'
type IconComponent = ComponentType<{ className?: string }>
diff --git a/packages/dashboard-ui/src/spree/form-actions.tsx b/packages/dashboard-ui/src/spree/form-actions.tsx
index 42d7ca9a94..584d4f0a6c 100644
--- a/packages/dashboard-ui/src/spree/form-actions.tsx
+++ b/packages/dashboard-ui/src/spree/form-actions.tsx
@@ -1,9 +1,9 @@
import { useHotkey } from '@tanstack/react-hotkeys'
-import { Loader2Icon } from 'lucide-react'
import { useEffect } from 'react'
import { type FieldValues, type UseFormReturn, useFormState } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { Button } from '../ui/button'
+import { Loader2Icon } from './icons'
/**
* Submit button wired to a `react-hook-form` instance. Always rendered,
diff --git a/packages/dashboard-ui/src/spree/icons.ts b/packages/dashboard-ui/src/spree/icons.ts
new file mode 100644
index 0000000000..f5133efd16
--- /dev/null
+++ b/packages/dashboard-ui/src/spree/icons.ts
@@ -0,0 +1,162 @@
+/**
+ * The dashboard's icon set.
+ *
+ * Every icon the dashboard renders is re-exported from here rather than
+ * imported from `lucide-react` directly, so the icon set is swappable in one
+ * file instead of across hundreds. Adding an icon means adding a line here.
+ *
+ * `LucideIcon` is the icon *type* the nav registries and the plugin API are
+ * written against; it still comes straight from `lucide-react`.
+ */
+export {
+ AlertTriangleIcon,
+ ArchiveIcon,
+ ArrowLeftIcon,
+ ArrowLeftRightIcon,
+ ArrowUpDownIcon,
+ BadgeCheckIcon,
+ BanIcon,
+ BanknoteIcon,
+ BarChart3Icon as AnalyticsIcon,
+ BoldIcon,
+ BookOpenIcon,
+ BoxesIcon,
+ BracesIcon,
+ Building2Icon,
+ CalendarIcon,
+ CalendarOffIcon,
+ CheckCircle2Icon,
+ CheckCircleIcon,
+ CheckIcon,
+ ChevronDownIcon,
+ ChevronLeftIcon,
+ ChevronRightIcon,
+ ChevronsLeftIcon,
+ ChevronsRightIcon,
+ ChevronsUpDownIcon,
+ CircleCheckIcon,
+ CircleIcon,
+ ClipboardCheckIcon,
+ ClockIcon,
+ Columns3Icon,
+ CommandIcon,
+ CopyIcon,
+ CornerDownLeftIcon,
+ CreditCardIcon,
+ DownloadIcon,
+ EllipsisVerticalIcon,
+ ExternalLinkIcon,
+ EyeIcon,
+ EyeOffIcon,
+ FileArchiveIcon,
+ FileAudioIcon,
+ FileCodeIcon,
+ FileIcon,
+ FileImageIcon,
+ FileSpreadsheetIcon,
+ FileTextIcon,
+ FileVideoIcon,
+ FilmIcon,
+ FilterIcon,
+ FolderMinusIcon,
+ FolderPlusIcon,
+ FolderTreeIcon,
+ GiftIcon,
+ GlobeIcon,
+ GlobeLockIcon,
+ GripVerticalIcon,
+ HandCoinsIcon,
+ HomeIcon,
+ ImageIcon,
+ ImagePlusIcon,
+ InboxIcon,
+ InfoIcon,
+ ItalicIcon,
+ KeyRoundIcon,
+ LanguagesIcon,
+ LayersIcon,
+ LibraryIcon,
+ LinkIcon,
+ ListChecksIcon,
+ ListFilter,
+ ListIcon,
+ ListOrderedIcon,
+ Loader2,
+ Loader2Icon,
+ Locate,
+ LockIcon,
+ LogOutIcon,
+ MailIcon,
+ MapIcon,
+ MapPinIcon,
+ Maximize,
+ MenuIcon,
+ MessageCircleIcon,
+ Minus,
+ MinusIcon,
+ MonitorIcon,
+ MoonStarIcon,
+ MoreHorizontalIcon,
+ MoveDownIcon,
+ MoveUpIcon,
+ OctagonXIcon,
+ PackageCheckIcon,
+ PackageIcon,
+ PanelLeftIcon,
+ PaperclipIcon,
+ PauseIcon,
+ PencilIcon,
+ PercentIcon,
+ PhoneIcon,
+ PlayIcon,
+ PlugIcon,
+ Plus,
+ PlusIcon,
+ PrinterIcon,
+ QuoteIcon,
+ RadioTowerIcon,
+ ReceiptTextIcon,
+ RedoIcon,
+ RepeatIcon,
+ RotateCcwIcon,
+ RotateCcwIcon as ReturnRequestIcon,
+ ScrollTextIcon,
+ SearchIcon,
+ SendIcon,
+ SettingsIcon,
+ ShapesIcon,
+ ShieldAlertIcon,
+ ShieldCheckIcon,
+ ShieldIcon,
+ ShoppingCartIcon,
+ SlidersHorizontalIcon,
+ SparklesIcon,
+ SplitIcon,
+ StarIcon,
+ StoreIcon,
+ StrikethroughIcon,
+ SunIcon,
+ TableIcon,
+ TagIcon,
+ TagsIcon,
+ TicketPercentIcon,
+ Trash2Icon,
+ TrashIcon,
+ TriangleAlertIcon,
+ TruckIcon,
+ Undo2Icon,
+ UndoIcon,
+ UploadCloudIcon,
+ UploadIcon,
+ UserIcon,
+ UserMinusIcon,
+ UserPlusIcon,
+ UsersIcon,
+ UsersRoundIcon,
+ WarehouseIcon,
+ WebhookIcon,
+ X,
+ XCircleIcon,
+ XIcon,
+ ZapIcon,
+} from 'lucide-react'
diff --git a/packages/dashboard-ui/src/spree/json-preview-drawer.tsx b/packages/dashboard-ui/src/spree/json-preview-drawer.tsx
index 30c17d975e..7e1ad39fd8 100644
--- a/packages/dashboard-ui/src/spree/json-preview-drawer.tsx
+++ b/packages/dashboard-ui/src/spree/json-preview-drawer.tsx
@@ -8,6 +8,9 @@ import {
SheetTitle,
useCopyToClipboard,
} from '@spree/dashboard-ui'
+import type { ComponentProps } from 'react'
+import { useEffect, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
import {
CheckIcon,
ChevronDownIcon,
@@ -17,10 +20,7 @@ import {
Loader2Icon,
RotateCcwIcon,
XIcon,
-} from 'lucide-react'
-import type { ComponentProps } from 'react'
-import { useEffect, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
+} from './icons'
import { type JsonValueLinkResolver, JsonValueView } from './json-value-view'
// Re-export so existing imports of `JsonValueLinkResolver` from this module
diff --git a/packages/dashboard-ui/src/spree/language-menu-items.tsx b/packages/dashboard-ui/src/spree/language-menu-items.tsx
index 67dfdebf0b..d820eeb5a7 100644
--- a/packages/dashboard-ui/src/spree/language-menu-items.tsx
+++ b/packages/dashboard-ui/src/spree/language-menu-items.tsx
@@ -1,4 +1,4 @@
-import { ChevronsUpDownIcon } from 'lucide-react'
+import { ChevronsUpDownIcon } from './icons'
interface LanguageMenuItemsProps {
/** Translated "Language" label for the row (passed by the app). */
diff --git a/packages/dashboard-ui/src/spree/metadata/metadata-card.tsx b/packages/dashboard-ui/src/spree/metadata/metadata-card.tsx
index 2ad572b921..75e0bfe610 100644
--- a/packages/dashboard-ui/src/spree/metadata/metadata-card.tsx
+++ b/packages/dashboard-ui/src/spree/metadata/metadata-card.tsx
@@ -1,7 +1,7 @@
-import { BracesIcon } from 'lucide-react'
import { Fragment } from 'react'
import { Card, CardContent, CardHeader, CardTitle } from '../../ui/card'
import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '../../ui/empty'
+import { BracesIcon } from '../icons'
interface MetadataCardProps {
/**
diff --git a/packages/dashboard-ui/src/spree/product-membership-list.tsx b/packages/dashboard-ui/src/spree/product-membership-list.tsx
index 5af73a0105..a4432cf825 100644
--- a/packages/dashboard-ui/src/spree/product-membership-list.tsx
+++ b/packages/dashboard-ui/src/spree/product-membership-list.tsx
@@ -15,7 +15,6 @@ import {
verticalListSortingStrategy,
} from '@dnd-kit/sortable'
import { CSS } from '@dnd-kit/utilities'
-import { Undo2Icon, XIcon } from 'lucide-react'
import { type ReactNode, useEffect, useMemo, useState } from 'react'
import { cn } from '../lib/utils'
import { Badge } from '../ui/badge'
@@ -25,6 +24,7 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '.
import { Pagination, type PaginationMeta } from '../ui/pagination'
import { Thumbnail } from '../ui/thumbnail'
import { DragHandle } from './drag-handle'
+import { Undo2Icon, XIcon } from './icons'
import { SearchInput } from './search-input'
/** One product row in a membership list. */
diff --git a/packages/dashboard-ui/src/spree/route-error-boundary.tsx b/packages/dashboard-ui/src/spree/route-error-boundary.tsx
index b4d63498b3..7007157d9a 100644
--- a/packages/dashboard-ui/src/spree/route-error-boundary.tsx
+++ b/packages/dashboard-ui/src/spree/route-error-boundary.tsx
@@ -1,4 +1,3 @@
-import { AlertTriangleIcon, RotateCcwIcon } from 'lucide-react'
import { Component, type ReactNode } from 'react'
import { useTranslation } from 'react-i18next'
import { Button } from '../ui/button'
@@ -10,6 +9,7 @@ import {
EmptyMedia,
EmptyTitle,
} from '../ui/empty'
+import { AlertTriangleIcon, RotateCcwIcon } from './icons'
interface ErrorStateProps {
/** Headline. Defaults to "Something went wrong". */
diff --git a/packages/dashboard-ui/src/spree/row-actions.tsx b/packages/dashboard-ui/src/spree/row-actions.tsx
index 570fe403aa..50d7934226 100644
--- a/packages/dashboard-ui/src/spree/row-actions.tsx
+++ b/packages/dashboard-ui/src/spree/row-actions.tsx
@@ -1,4 +1,3 @@
-import { CopyIcon, EllipsisVerticalIcon, EyeIcon, PencilIcon, Trash2Icon } from 'lucide-react'
import type { ReactNode } from 'react'
import { useTranslation } from 'react-i18next'
import { Button } from '../ui/button'
@@ -8,6 +7,7 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from '../ui/dropdown-menu'
+import { CopyIcon, EllipsisVerticalIcon, EyeIcon, PencilIcon, Trash2Icon } from './icons'
export interface RowAction {
/** Stable key for React reconciliation. Doubles as the i18n action slug
diff --git a/packages/dashboard-ui/src/spree/search-input.tsx b/packages/dashboard-ui/src/spree/search-input.tsx
index 11c4d3f539..b917c0ecd7 100644
--- a/packages/dashboard-ui/src/spree/search-input.tsx
+++ b/packages/dashboard-ui/src/spree/search-input.tsx
@@ -1,8 +1,8 @@
-import { SearchIcon, XIcon } from 'lucide-react'
import type * as React from 'react'
import { useRef } from 'react'
import { cn } from '../lib/utils'
import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from '../ui/input-group'
+import { SearchIcon, XIcon } from './icons'
/**
* Search box with a leading magnifier and our own clear button.
diff --git a/packages/dashboard-ui/src/spree/secret-input.tsx b/packages/dashboard-ui/src/spree/secret-input.tsx
index dff8544819..457d44ba0c 100644
--- a/packages/dashboard-ui/src/spree/secret-input.tsx
+++ b/packages/dashboard-ui/src/spree/secret-input.tsx
@@ -65,7 +65,7 @@ export function SecretInput({
<Field>
<FieldLabel htmlFor={id}>{label}</FieldLabel>
<div className="flex items-center gap-2">
- <div className="flex min-h-8 w-full min-w-0 items-center rounded-lg border border-border bg-muted/40 px-2.5 py-1.5 shadow-xs">
+ <div className="flex min-h-8 w-full min-w-0 items-center rounded-lg border border-border bg-muted/40 px-2.5 py-1.5">
<span className="font-mono text-sm tabular-nums text-muted-foreground" id={id}>
{storedMask}
</span>
diff --git a/packages/dashboard-ui/src/spree/tax-identifiers-card.tsx b/packages/dashboard-ui/src/spree/tax-identifiers-card.tsx
index 280926e623..b53f4c9359 100644
--- a/packages/dashboard-ui/src/spree/tax-identifiers-card.tsx
+++ b/packages/dashboard-ui/src/spree/tax-identifiers-card.tsx
@@ -1,4 +1,3 @@
-import { BadgeCheckIcon, EllipsisVerticalIcon, PencilIcon, PlusIcon, TrashIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
import { Controller, type UseFormSetError, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
@@ -36,6 +35,7 @@ import {
StatusBadge,
useConfirm,
} from '../index'
+import { BadgeCheckIcon, EllipsisVerticalIcon, PencilIcon, PlusIcon, TrashIcon } from './icons'
/** One selectable registration kind. */
interface KindOption {
diff --git a/packages/dashboard-ui/src/spree/theme-toggle.tsx b/packages/dashboard-ui/src/spree/theme-toggle.tsx
index 5dd5d0f565..64fbc2839d 100644
--- a/packages/dashboard-ui/src/spree/theme-toggle.tsx
+++ b/packages/dashboard-ui/src/spree/theme-toggle.tsx
@@ -1,6 +1,6 @@
-import { MonitorIcon, MoonStarIcon, SunIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { cn } from '../lib/utils'
+import { MonitorIcon, MoonStarIcon, SunIcon } from './icons'
import { useTheme } from './theme-provider'
const OPTIONS = [
diff --git a/packages/dashboard-ui/src/styles.css b/packages/dashboard-ui/src/styles.css
index b392dc2705..1b2102a990 100644
--- a/packages/dashboard-ui/src/styles.css
+++ b/packages/dashboard-ui/src/styles.css
@@ -52,7 +52,7 @@
--background: oklch(98.5% 0.001 106.423); /* stone-50 */
--foreground: oklch(0.145 0.0039 49.25); /* stone-950 */
- --card: oklch(1 0 0); /* white cards, one step above the page */
+ --card: oklch(1 0 0); /* white, one step above the page */
--card-foreground: oklch(0.145 0.0039 49.25);
--popover: oklch(1 0 0);
--popover-foreground: oklch(0.145 0.0039 49.25);
@@ -94,15 +94,19 @@
--chart-5: oklch(0.3358 0.118 257.1);
--radius: 0.75rem;
- /* Sidebar — one step off the page, so it reads as its own surface. */
- --sidebar: oklch(97% 0.001 106.424); /* stone-100 */
- --sidebar-foreground: oklch(37.1% 0.0099 67.558);
- --sidebar-primary: oklch(0.145 0.0039 49.25);
- --sidebar-primary-foreground: oklch(1 0 0);
- --sidebar-accent: oklch(0.922 0.003 48.717); /* stone-200 */
- --sidebar-accent-foreground: oklch(0.145 0.0039 49.25);
- --sidebar-border: oklch(0.9 0.0039 48.717);
- --sidebar-ring: var(--brand-blue);
+ /* Sidebar — the same surface as the page, not a band beside it. Every value
+ points at the page token it matches rather than repeating it, so the two
+ cannot drift apart. */
+ --sidebar: var(--background);
+ --sidebar-foreground: var(--foreground);
+ --sidebar-primary: var(--primary);
+ --sidebar-primary-foreground: var(--primary-foreground);
+ --sidebar-accent: var(--accent);
+ --sidebar-accent-foreground: var(--accent-foreground);
+ /* Matches the rule the top bar draws, so every edge framing the shell —
+ the sidebar's, the top bar's, the settings header's — is one weight. */
+ --sidebar-border: color-mix(in srgb, var(--border) 75%, transparent);
+ --sidebar-ring: var(--ring);
/* Status ramps, following Vercel's Geist colour system.
*
@@ -145,11 +149,11 @@
.dark {
/* Vercel-style "true black" base, with surfaces stepping up in lightness. */
- --background: oklch(0 0 0); /* #000000 */
+ --background: oklch(0.1913 0 0);
--foreground: oklch(0.95 0.0019 106.424); /* stone-100-ish */
- --card: oklch(0.145 0.0039 49.25); /* stone-950 — surface */
+ --card: oklch(0.209 0 0);
--card-foreground: oklch(0.95 0.0019 106.424);
- --popover: oklch(0.145 0.0039 49.25);
+ --popover: oklch(0.209 0 0);
--popover-foreground: oklch(0.95 0.0019 106.424);
/* Mirrors the light theme's primary: there a navy fill carries white text,
so here the two swap rather than the button taking on its own colour. */
@@ -164,7 +168,7 @@
--secondary-foreground: oklch(0.95 0.0019 106.424);
--muted: oklch(0.185 0.0051 56.043);
--muted-foreground: oklch(0.62 0.0117 58.071); /* stone-500-ish */
- --accent: oklch(0.225 0.0062 56.043); /* hover surface, a step above --muted */
+ --accent: oklch(0.2645 0 0);
--accent-foreground: oklch(0.95 0.0019 106.424);
--destructive: oklch(0.704 0.191 22.216);
--border: oklch(1 0 0 / 12%);
@@ -176,14 +180,16 @@
--chart-3: oklch(0.546 0.245 262.881);
--chart-4: oklch(0.488 0.243 264.376);
--chart-5: oklch(0.424 0.199 265.638);
- --sidebar: oklch(0.145 0.0039 49.25); /* stone-950 — slightly elevated from background */
- --sidebar-foreground: oklch(0.95 0.0019 106.424);
- --sidebar-primary: oklch(0.95 0.0019 106.424);
- --sidebar-primary-foreground: oklch(0.145 0.0039 49.25);
- --sidebar-accent: oklch(0.27 0.0071 34.298);
- --sidebar-accent-foreground: oklch(0.95 0.0019 106.424);
- --sidebar-border: oklch(1 0 0 / 10%);
- --sidebar-ring: oklch(0.708 0.01 56.259);
+ --sidebar: var(--background);
+ --sidebar-foreground: var(--foreground);
+ --sidebar-primary: var(--primary);
+ --sidebar-primary-foreground: var(--primary-foreground);
+ --sidebar-accent: var(--accent);
+ --sidebar-accent-foreground: var(--accent-foreground);
+ /* Matches the rule the top bar draws, so every edge framing the shell —
+ the sidebar's, the top bar's, the settings header's — is one weight. */
+ --sidebar-border: color-mix(in srgb, var(--border) 75%, transparent);
+ --sidebar-ring: var(--ring);
/* Geist's dark ramps are not the light ones dimmed — the fill becomes a deep
shade of the hue and the text becomes brighter than its light-mode
@@ -227,17 +233,9 @@
--text-3xl: 1.75rem;
--text-4xl: 2rem;
- /* Shadows are retired rather than removed. A card already carries its own
- border, so the extra 1px of depth under it added no information — it just
- softened an edge the border was drawing cleanly. The tokens stay defined,
- at effectively nothing, so the components still carrying `shadow-xs`
- flatten with the rest instead of each needing to be found and edited.
- Floating surfaces are the exception and set their own shadow: a menu or
- dialog genuinely is above the page, and that is the one place depth is
- telling the truth. */
- --shadow-xs: 0 0 0 0 transparent;
- --shadow-sm: 0 0 0 0 transparent;
- --shadow-nav: 0 0 0 1px var(--border);
+ --shadow-xs: rgba(43, 34, 51, 0.05) 0px 1px 1px;
+ --shadow-sm: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+ --shadow-nav: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0.04) 0px 0px 0px 1px, rgba(0, 0, 0, 0.04) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;
/* Floating surfaces — menus, popovers, dialogs, sheets. Wide and faint
rather than tight and dark: the job is to say "this is above the page",
diff --git a/packages/dashboard-ui/src/ui/accordion.tsx b/packages/dashboard-ui/src/ui/accordion.tsx
index 879b67b82c..0c5c2a9092 100644
--- a/packages/dashboard-ui/src/ui/accordion.tsx
+++ b/packages/dashboard-ui/src/ui/accordion.tsx
@@ -1,7 +1,7 @@
import { Accordion as AccordionPrimitive } from '@base-ui/react/accordion'
-import { ChevronDownIcon } from 'lucide-react'
import type * as React from 'react'
import { cn } from '../lib/utils'
+import { ChevronDownIcon } from '../spree/icons'
/**
* Vertically stacked, expandable sections sharing one frame.
@@ -25,7 +25,7 @@ function AccordionItem({
data-slot="accordion-item"
// Rules between items rather than around each: the group is one object,
// so the last item closes on the container's own edge.
- className={cn('border-border border-b last:border-b-0', className)}
+ className={cn('border-border-subtle border-b last:border-b-0', className)}
{...props}
/>
)
@@ -45,7 +45,7 @@ function AccordionTrigger({
<AccordionPrimitive.Trigger
data-slot="accordion-trigger"
className={cn(
- 'group/accordion-trigger flex flex-1 cursor-pointer items-center gap-3 px-4 py-3.5 text-left text-base font-medium transition-colors outline-none hover:bg-accent focus-visible:bg-accent',
+ 'group/accordion-trigger flex flex-1 cursor-pointer items-center gap-3 px-4 py-3.5 text-left text-base font-medium transition-colors outline-none hover:bg-accent/50 focus-visible:bg-accent',
className,
)}
{...props}
diff --git a/packages/dashboard-ui/src/ui/breadcrumb.tsx b/packages/dashboard-ui/src/ui/breadcrumb.tsx
index a8721f9850..aa0c15e4b4 100644
--- a/packages/dashboard-ui/src/ui/breadcrumb.tsx
+++ b/packages/dashboard-ui/src/ui/breadcrumb.tsx
@@ -1,7 +1,7 @@
import i18n from 'i18next'
-import { ChevronRightIcon, MoreHorizontalIcon } from 'lucide-react'
import type * as React from 'react'
import { cn } from '../lib/utils'
+import { ChevronRightIcon, MoreHorizontalIcon } from '../spree/icons'
import { Slot } from './slot'
function Breadcrumb({ className, ...props }: React.ComponentProps<'nav'>) {
diff --git a/packages/dashboard-ui/src/ui/calendar.tsx b/packages/dashboard-ui/src/ui/calendar.tsx
index 0ae0d94873..a759ad1d31 100644
--- a/packages/dashboard-ui/src/ui/calendar.tsx
+++ b/packages/dashboard-ui/src/ui/calendar.tsx
@@ -1,8 +1,8 @@
-import { ChevronLeftIcon, ChevronRightIcon } from 'lucide-react'
import type * as React from 'react'
import { DayPicker } from 'react-day-picker'
import { activeDateLocale } from '../lib/date-locale'
import { cn } from '../lib/utils'
+import { ChevronLeftIcon, ChevronRightIcon } from '../spree/icons'
function Calendar({
className,
diff --git a/packages/dashboard-ui/src/ui/checkbox.tsx b/packages/dashboard-ui/src/ui/checkbox.tsx
index 2b2f8291dc..ea4da184ce 100644
--- a/packages/dashboard-ui/src/ui/checkbox.tsx
+++ b/packages/dashboard-ui/src/ui/checkbox.tsx
@@ -1,7 +1,7 @@
import { Checkbox as CheckboxPrimitive } from '@base-ui/react/checkbox'
-import { CheckIcon, MinusIcon } from 'lucide-react'
import type * as React from 'react'
import { cn } from '../lib/utils'
+import { CheckIcon, MinusIcon } from '../spree/icons'
function Checkbox({
className,
diff --git a/packages/dashboard-ui/src/ui/combobox.tsx b/packages/dashboard-ui/src/ui/combobox.tsx
index e7eb8246d7..81302e7617 100644
--- a/packages/dashboard-ui/src/ui/combobox.tsx
+++ b/packages/dashboard-ui/src/ui/combobox.tsx
@@ -2,9 +2,9 @@
import { Combobox as ComboboxPrimitive } from '@base-ui/react'
import i18n from 'i18next'
-import { CheckIcon, ChevronDownIcon, XIcon } from 'lucide-react'
import * as React from 'react'
import { cn } from '../lib/utils'
+import { CheckIcon, ChevronDownIcon, XIcon } from '../spree/icons'
import { Button } from './button'
import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from './input-group'
@@ -48,7 +48,7 @@ function ComboboxButtonTrigger({ className, children, ...props }: ComboboxPrimit
<ComboboxPrimitive.Trigger
data-slot="combobox-button-trigger"
className={cn(
- "flex w-full min-h-8.5 cursor-pointer items-center justify-between gap-1.5 rounded-lg border border-border bg-card py-1.5 pr-2 pl-2.5 text-base font-normal leading-normal text-foreground shadow-xs transition-all duration-100 ease-in-out outline-none select-none focus:border-blue-500 focus:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)] disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:border-border disabled:text-muted-foreground disabled:shadow-none aria-invalid:border-destructive [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "flex w-full min-h-8.5 cursor-pointer items-center justify-between gap-1.5 rounded-lg border border-border bg-card py-1.5 pr-2 pl-2.5 text-base font-normal leading-normal text-foreground transition-all duration-100 ease-in-out outline-none select-none focus:border-blue-500 focus:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)] disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:border-border disabled:text-muted-foreground disabled:shadow-none aria-invalid:border-destructive [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
className,
)}
{...props}
@@ -286,7 +286,7 @@ function ComboboxChips({
// resize lets the positioner follow the anchor smoothly; making it
// instant jumps the open popup out from under the pointer, so the next
// option click lands on nothing.
- 'flex flex-wrap items-center gap-1.5 rounded-lg border border-border bg-card text-foreground shadow-xs px-2.5 py-1.5 text-base transition-all duration-100 ease-out focus-within:border-blue-500 focus-within:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)] has-aria-invalid:border-destructive has-data-[slot=combobox-chip]:p-1.5',
+ 'flex flex-wrap items-center gap-1.5 rounded-lg border border-border bg-card text-foreground px-2.5 py-1.5 text-base transition-all duration-100 ease-out focus-within:border-blue-500 focus-within:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)] has-aria-invalid:border-destructive has-data-[slot=combobox-chip]:p-1.5',
className,
)}
{...props}
diff --git a/packages/dashboard-ui/src/ui/command.tsx b/packages/dashboard-ui/src/ui/command.tsx
index 734c75cd53..f259b4c764 100644
--- a/packages/dashboard-ui/src/ui/command.tsx
+++ b/packages/dashboard-ui/src/ui/command.tsx
@@ -1,5 +1,7 @@
import { Command as CommandPrimitive } from 'cmdk'
import i18n from 'i18next'
+import * as React from 'react'
+import { cn } from '../lib/utils'
import {
CheckIcon,
CornerDownLeftIcon,
@@ -7,9 +9,7 @@ import {
MoveDownIcon,
MoveUpIcon,
SearchIcon,
-} from 'lucide-react'
-import * as React from 'react'
-import { cn } from '../lib/utils'
+} from '../spree/icons'
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from './dialog'
function Command({ className, ...props }: React.ComponentProps<typeof CommandPrimitive>) {
diff --git a/packages/dashboard-ui/src/ui/date-picker.tsx b/packages/dashboard-ui/src/ui/date-picker.tsx
index 0d786b7fd0..0cba0005ce 100644
--- a/packages/dashboard-ui/src/ui/date-picker.tsx
+++ b/packages/dashboard-ui/src/ui/date-picker.tsx
@@ -1,10 +1,10 @@
import { format, parse, parseISO } from 'date-fns'
import { formatInTimeZone, fromZonedTime, toZonedTime } from 'date-fns-tz'
import i18n from 'i18next'
-import { CalendarIcon, XIcon } from 'lucide-react'
import { useEffect, useMemo, useRef, useState } from 'react'
import { activeDateLocale } from '../lib/date-locale'
import { cn } from '../lib/utils'
+import { CalendarIcon, XIcon } from '../spree/icons'
import { Button } from './button'
import { Calendar } from './calendar'
import { Input } from './input'
diff --git a/packages/dashboard-ui/src/ui/date-range-picker.tsx b/packages/dashboard-ui/src/ui/date-range-picker.tsx
index 83504499c0..5e70c9c53e 100644
--- a/packages/dashboard-ui/src/ui/date-range-picker.tsx
+++ b/packages/dashboard-ui/src/ui/date-range-picker.tsx
@@ -1,10 +1,10 @@
import { format, startOfMonth, startOfYear, subDays } from 'date-fns'
-import { CalendarIcon, ChevronDownIcon } from 'lucide-react'
import { useState } from 'react'
import type { DateRange as DayPickerDateRange } from 'react-day-picker'
import { useTranslation } from 'react-i18next'
import { activeDateLocale } from '../lib/date-locale'
import { cn } from '../lib/utils'
+import { CalendarIcon, ChevronDownIcon } from '../spree/icons'
import { Button } from './button'
import { Calendar } from './calendar'
import { Popover, PopoverContent, PopoverTrigger } from './popover'
diff --git a/packages/dashboard-ui/src/ui/dialog.tsx b/packages/dashboard-ui/src/ui/dialog.tsx
index 54af72471b..5169e87ec2 100644
--- a/packages/dashboard-ui/src/ui/dialog.tsx
+++ b/packages/dashboard-ui/src/ui/dialog.tsx
@@ -1,8 +1,8 @@
import { Dialog as DialogPrimitive } from '@base-ui/react/dialog'
import i18n from 'i18next'
-import { XIcon } from 'lucide-react'
import * as React from 'react'
import { cn } from '../lib/utils'
+import { XIcon } from '../spree/icons'
import { Button } from './button'
function Dialog({
diff --git a/packages/dashboard-ui/src/ui/dropdown-menu.tsx b/packages/dashboard-ui/src/ui/dropdown-menu.tsx
index 608e445842..ff27015fc8 100644
--- a/packages/dashboard-ui/src/ui/dropdown-menu.tsx
+++ b/packages/dashboard-ui/src/ui/dropdown-menu.tsx
@@ -1,9 +1,9 @@
'use client'
import { Menu as MenuPrimitive } from '@base-ui/react/menu'
-import { CheckIcon, ChevronRightIcon } from 'lucide-react'
import * as React from 'react'
import { cn } from '../lib/utils'
+import { CheckIcon, ChevronRightIcon } from '../spree/icons'
function DropdownMenu({
children,
diff --git a/packages/dashboard-ui/src/ui/input-group.tsx b/packages/dashboard-ui/src/ui/input-group.tsx
index d48d594f34..d082016ded 100644
--- a/packages/dashboard-ui/src/ui/input-group.tsx
+++ b/packages/dashboard-ui/src/ui/input-group.tsx
@@ -11,7 +11,7 @@ function InputGroup({ className, ...props }: React.ComponentProps<'div'>) {
data-slot="input-group"
role="group"
className={cn(
- 'group/input-group relative flex w-full min-w-0 items-center rounded-lg border border-border bg-card text-foreground shadow-xs transition-[color,background-color,border-color,box-shadow] duration-100 ease-out outline-none in-data-[slot=combobox-content]:focus-within:border-inherit in-data-[slot=combobox-content]:focus-within:shadow-none has-disabled:bg-muted has-disabled:border-border has-disabled:opacity-50 has-disabled:shadow-none has-[[data-slot=input-group-control]:focus-visible]:border-blue-500 has-[[data-slot=input-group-control]:focus-visible]:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)] has-[[data-slot][aria-invalid=true]]:border-destructive has-[>[data-align=block-end]]:h-auto has-[>[data-align=block-end]]:flex-col has-[>[data-align=block-start]]:h-auto has-[>[data-align=block-start]]:flex-col has-[>textarea]:h-auto has-[>[data-align=block-end]]:[&>input]:pt-3 has-[>[data-align=block-start]]:[&>input]:pb-3 has-[>[data-align=inline-end]]:[&>input]:pr-1.5 has-[>[data-align=inline-start]]:[&>input]:pl-1.5',
+ 'group/input-group relative flex w-full min-w-0 items-center rounded-lg border border-border bg-card text-foreground transition-[color,background-color,border-color,box-shadow] duration-100 ease-out outline-none in-data-[slot=combobox-content]:focus-within:border-inherit in-data-[slot=combobox-content]:focus-within:shadow-none has-disabled:bg-muted has-disabled:border-border has-disabled:opacity-50 has-disabled:shadow-none has-[[data-slot=input-group-control]:focus-visible]:border-blue-500 has-[[data-slot=input-group-control]:focus-visible]:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)] has-[[data-slot][aria-invalid=true]]:border-destructive has-[>[data-align=block-end]]:h-auto has-[>[data-align=block-end]]:flex-col has-[>[data-align=block-start]]:h-auto has-[>[data-align=block-start]]:flex-col has-[>textarea]:h-auto has-[>[data-align=block-end]]:[&>input]:pt-3 has-[>[data-align=block-start]]:[&>input]:pb-3 has-[>[data-align=inline-end]]:[&>input]:pr-1.5 has-[>[data-align=inline-start]]:[&>input]:pl-1.5',
className,
)}
{...props}
diff --git a/packages/dashboard-ui/src/ui/map.tsx b/packages/dashboard-ui/src/ui/map.tsx
index 1cb8449e24..ee4a256191 100644
--- a/packages/dashboard-ui/src/ui/map.tsx
+++ b/packages/dashboard-ui/src/ui/map.tsx
@@ -5,7 +5,6 @@ import * as MapLibreGL from 'maplibre-gl'
import 'maplibre-gl/dist/maplibre-gl.css'
import type * as GeoJSON from 'geojson'
-import { Loader2, Locate, Maximize, Minus, Plus, X } from 'lucide-react'
// `?worker&url` hands the file to the bundler, which emits it as its own chunk
// with the shared code it needs and gives back a same-origin URL.
import workerUrl from 'maplibre-gl/dist/maplibre-gl-worker.mjs?worker&url'
@@ -24,6 +23,7 @@ import {
} from 'react'
import { createPortal } from 'react-dom'
import { cn } from '../lib/utils'
+import { Loader2, Locate, Maximize, Minus, Plus, X } from '../spree/icons'
// The worker ships in the package, so it is bundled and served from this
// origin. The registry's default fetches it from unpkg at runtime, which means
diff --git a/packages/dashboard-ui/src/ui/media-preview.tsx b/packages/dashboard-ui/src/ui/media-preview.tsx
index 856c9b7822..f101f3f49a 100644
--- a/packages/dashboard-ui/src/ui/media-preview.tsx
+++ b/packages/dashboard-ui/src/ui/media-preview.tsx
@@ -1,7 +1,7 @@
-import { FilmIcon, ImagePlusIcon } from 'lucide-react'
import type * as React from 'react'
import { useTranslation } from 'react-i18next'
import { cn } from '../lib/utils'
+import { FilmIcon, ImagePlusIcon } from '../spree/icons'
export interface MediaPreviewProps {
mediaType?: 'image' | 'video' | 'external_video' | string
diff --git a/packages/dashboard-ui/src/ui/pagination.tsx b/packages/dashboard-ui/src/ui/pagination.tsx
index 9f578dea54..11d5e2a8c1 100644
--- a/packages/dashboard-ui/src/ui/pagination.tsx
+++ b/packages/dashboard-ui/src/ui/pagination.tsx
@@ -1,10 +1,10 @@
+import { useTranslation } from 'react-i18next'
import {
ChevronLeftIcon,
ChevronRightIcon,
ChevronsLeftIcon,
ChevronsRightIcon,
-} from 'lucide-react'
-import { useTranslation } from 'react-i18next'
+} from '../spree/icons'
import { Button } from './button'
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './select'
diff --git a/packages/dashboard-ui/src/ui/rich-text-editor.tsx b/packages/dashboard-ui/src/ui/rich-text-editor.tsx
index 0e310f4eb1..41e9eeaf20 100644
--- a/packages/dashboard-ui/src/ui/rich-text-editor.tsx
+++ b/packages/dashboard-ui/src/ui/rich-text-editor.tsx
@@ -4,6 +4,9 @@ import Placeholder from '@tiptap/extension-placeholder'
import type { Editor } from '@tiptap/react'
import { EditorContent, useEditor, useEditorState } from '@tiptap/react'
import StarterKit from '@tiptap/starter-kit'
+import { useCallback, useEffect, useRef } from 'react'
+import { useTranslation } from 'react-i18next'
+import { cn } from '../lib/utils'
import {
BoldIcon,
ImageIcon,
@@ -15,10 +18,7 @@ import {
RedoIcon,
StrikethroughIcon,
UndoIcon,
-} from 'lucide-react'
-import { useCallback, useEffect, useRef } from 'react'
-import { useTranslation } from 'react-i18next'
-import { cn } from '../lib/utils'
+} from '../spree/icons'
export interface RichTextEditorProps {
value?: string
@@ -170,7 +170,7 @@ export function RichTextEditor({
ref={wrapperRef}
data-slot="rich-text-editor"
className={cn(
- 'rounded-lg border border-border bg-card text-foreground shadow-xs transition-[color,background-color,border-color,box-shadow] duration-100 ease-out focus-within:border-blue-500 focus-within:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)]',
+ 'rounded-lg border border-border bg-card text-foreground transition-[color,background-color,border-color,box-shadow] duration-100 ease-out focus-within:border-blue-500 focus-within:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)]',
disabled && 'pointer-events-none bg-muted border-border',
className,
)}
diff --git a/packages/dashboard-ui/src/ui/select.tsx b/packages/dashboard-ui/src/ui/select.tsx
index 2d6fab751f..34a3e653b8 100644
--- a/packages/dashboard-ui/src/ui/select.tsx
+++ b/packages/dashboard-ui/src/ui/select.tsx
@@ -1,7 +1,7 @@
import { Select as SelectPrimitive } from '@base-ui/react/select'
-import { CheckIcon, ChevronDownIcon } from 'lucide-react'
import type * as React from 'react'
import { cn } from '../lib/utils'
+import { CheckIcon, ChevronDownIcon } from '../spree/icons'
function Select({
children,
@@ -59,7 +59,7 @@ function SelectTrigger({
// doesn't collapse to chevron-height when the SelectValue render-prop
// returns an empty string (e.g., when value is unset and the
// placeholder isn't surfaced through the render-prop).
- "flex w-full min-h-8.5 cursor-pointer items-center justify-between gap-1.5 rounded-lg border border-border bg-card py-1.5 pr-2 pl-2.5 text-base font-normal leading-normal text-foreground shadow-xs transition-all duration-100 ease-in-out outline-none select-none focus:border-blue-500 focus:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)] disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:border-border disabled:text-muted-foreground disabled:shadow-none aria-invalid:border-destructive data-[placeholder]:text-muted-foreground data-[size=sm]:py-1 data-[size=sm]:px-2 data-[size=sm]:text-sm data-[size=sm]:min-h-[1.9375rem] *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-1.5 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "flex w-full min-h-8.5 cursor-pointer items-center justify-between gap-1.5 rounded-lg border border-border bg-card py-1.5 pr-2 pl-2.5 text-base font-normal leading-normal text-foreground transition-all duration-100 ease-in-out outline-none select-none focus:border-blue-500 focus:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)] disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:border-border disabled:text-muted-foreground disabled:shadow-none aria-invalid:border-destructive data-[placeholder]:text-muted-foreground data-[size=sm]:py-1 data-[size=sm]:px-2 data-[size=sm]:text-sm data-[size=sm]:min-h-[1.9375rem] *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-1.5 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
className,
)}
{...props}
diff --git a/packages/dashboard-ui/src/ui/sheet.tsx b/packages/dashboard-ui/src/ui/sheet.tsx
index a5707ccd59..08035e99bb 100644
--- a/packages/dashboard-ui/src/ui/sheet.tsx
+++ b/packages/dashboard-ui/src/ui/sheet.tsx
@@ -2,9 +2,9 @@
import { Dialog as SheetPrimitive } from '@base-ui/react/dialog'
import i18n from 'i18next'
-import { XIcon } from 'lucide-react'
import * as React from 'react'
import { cn } from '../lib/utils'
+import { XIcon } from '../spree/icons'
import { Button } from './button'
function Sheet({
diff --git a/packages/dashboard-ui/src/ui/sidebar.tsx b/packages/dashboard-ui/src/ui/sidebar.tsx
index effccf9720..939104b467 100644
--- a/packages/dashboard-ui/src/ui/sidebar.tsx
+++ b/packages/dashboard-ui/src/ui/sidebar.tsx
@@ -1,9 +1,9 @@
import { cva, type VariantProps } from 'class-variance-authority'
import i18n from 'i18next'
-import { PanelLeftIcon } from 'lucide-react'
import * as React from 'react'
import { useIsMobile } from '../hooks/use-mobile'
import { cn } from '../lib/utils'
+import { PanelLeftIcon } from '../spree/icons'
import { Button } from './button'
import { Input } from './input'
import { Separator } from './separator'
@@ -281,7 +281,7 @@ function Sidebar({
<div
data-sidebar="sidebar"
data-slot="sidebar-inner"
- className="flex size-full flex-col bg-sidebar border-e group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:shadow-sm group-data-[variant=floating]:ring-1 group-data-[variant=floating]:ring-sidebar-border"
+ className="flex size-full flex-col bg-sidebar border-e border-sidebar-border group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:shadow-sm group-data-[variant=floating]:ring-1 group-data-[variant=floating]:ring-sidebar-border"
>
{children}
</div>
diff --git a/packages/dashboard-ui/src/ui/textarea.tsx b/packages/dashboard-ui/src/ui/textarea.tsx
index 51f89f5072..4d9bebe858 100644
--- a/packages/dashboard-ui/src/ui/textarea.tsx
+++ b/packages/dashboard-ui/src/ui/textarea.tsx
@@ -7,7 +7,7 @@ function Textarea({ className, ...props }: React.ComponentProps<'textarea'>) {
<textarea
data-slot="textarea"
className={cn(
- 'flex field-sizing-content min-h-16 w-full rounded-lg border border-border bg-card px-2.5 py-1.5 text-base font-normal leading-normal text-foreground shadow-xs transition-[color,background-color,border-color,box-shadow] duration-100 ease-out outline-none placeholder:text-muted-foreground focus:border-blue-500 focus:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)] disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:border-border disabled:text-muted-foreground disabled:shadow-none aria-invalid:border-destructive',
+ 'flex field-sizing-content min-h-16 w-full rounded-lg border border-border bg-card px-2.5 py-1.5 text-base font-normal leading-normal text-foreground transition-[color,background-color,border-color,box-shadow] duration-100 ease-out outline-none placeholder:text-muted-foreground focus:border-blue-500 focus:shadow-[0_0_0_3px_color-mix(in_srgb,var(--ring)_15%,transparent)] disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:border-border disabled:text-muted-foreground disabled:shadow-none aria-invalid:border-destructive',
className,
)}
{...props}
diff --git a/packages/dashboard-ui/src/ui/thumbnail.tsx b/packages/dashboard-ui/src/ui/thumbnail.tsx
index cb7bf34c3b..5198cef08a 100644
--- a/packages/dashboard-ui/src/ui/thumbnail.tsx
+++ b/packages/dashboard-ui/src/ui/thumbnail.tsx
@@ -1,8 +1,7 @@
import { cva, type VariantProps } from 'class-variance-authority'
-import { ImageIcon } from 'lucide-react'
import type * as React from 'react'
-
import { cn } from '../lib/utils'
+import { ImageIcon } from '../spree/icons'
const thumbnailVariants = cva(
// The wrapper always renders, so a record without an image keeps the same
diff --git a/packages/dashboard-ui/src/ui/toast.tsx b/packages/dashboard-ui/src/ui/toast.tsx
index af021eda9c..bf22889d56 100644
--- a/packages/dashboard-ui/src/ui/toast.tsx
+++ b/packages/dashboard-ui/src/ui/toast.tsx
@@ -2,6 +2,8 @@
import { Toast as ToastPrimitive } from '@base-ui/react/toast'
import i18n from 'i18next'
+import type * as React from 'react'
+import { cn } from '../lib/utils'
import {
CircleCheckIcon,
InfoIcon,
@@ -9,9 +11,7 @@ import {
OctagonXIcon,
TriangleAlertIcon,
XIcon,
-} from 'lucide-react'
-import type * as React from 'react'
-import { cn } from '../lib/utils'
+} from '../spree/icons'
/**
* App-wide toast manager. Created outside React so a toast can be raised from
diff --git a/packages/dashboard/src/components/spree/api-keys/api-key-table.tsx b/packages/dashboard/src/components/spree/api-keys/api-key-table.tsx
index 46570ba7cb..d197bec3cb 100644
--- a/packages/dashboard/src/components/spree/api-keys/api-key-table.tsx
+++ b/packages/dashboard/src/components/spree/api-keys/api-key-table.tsx
@@ -29,7 +29,7 @@ import {
useConfirm,
useCopyToClipboard,
} from '@spree/dashboard-ui'
-import { BanIcon, CheckIcon, CopyIcon, KeyRoundIcon, PencilIcon } from 'lucide-react'
+import { BanIcon, CheckIcon, CopyIcon, KeyRoundIcon, PencilIcon } from '@spree/dashboard-ui/icons'
import type { ReactNode } from 'react'
import { useTranslation } from 'react-i18next'
import { useDeleteApiKey, useRevokeApiKey } from '../../../hooks/use-api-keys'
diff --git a/packages/dashboard/src/components/spree/api-keys/api-key-token-reveal-dialog.tsx b/packages/dashboard/src/components/spree/api-keys/api-key-token-reveal-dialog.tsx
index 5b34523c7d..5741b67ea6 100644
--- a/packages/dashboard/src/components/spree/api-keys/api-key-token-reveal-dialog.tsx
+++ b/packages/dashboard/src/components/spree/api-keys/api-key-token-reveal-dialog.tsx
@@ -10,7 +10,7 @@ import {
DialogTitle,
useCopyToClipboard,
} from '@spree/dashboard-ui'
-import { AlertTriangleIcon, CheckIcon, CopyIcon } from 'lucide-react'
+import { AlertTriangleIcon, CheckIcon, CopyIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
/** One-shot reveal of a freshly created secret token. */
diff --git a/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor-dialog.tsx b/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor-dialog.tsx
index 7079ef1c60..21cb681e0c 100644
--- a/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor-dialog.tsx
+++ b/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor-dialog.tsx
@@ -14,7 +14,7 @@ import {
SelectValue,
useConfirm,
} from '@spree/dashboard-ui'
-import { XIcon } from 'lucide-react'
+import { XIcon } from '@spree/dashboard-ui/icons'
import { useCallback, useEffect, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { BulkPriceEditor, type BulkPriceEditorState } from './bulk-price-editor'
diff --git a/packages/dashboard/src/components/spree/catalog-pricing-fields.tsx b/packages/dashboard/src/components/spree/catalog-pricing-fields.tsx
index 2fe260d0be..d92e774b07 100644
--- a/packages/dashboard/src/components/spree/catalog-pricing-fields.tsx
+++ b/packages/dashboard/src/components/spree/catalog-pricing-fields.tsx
@@ -17,7 +17,7 @@ import {
SelectValue,
Switch,
} from '@spree/dashboard-ui'
-import { TableIcon } from 'lucide-react'
+import { TableIcon } from '@spree/dashboard-ui/icons'
import { useState } from 'react'
import { Controller, type UseFormReturn } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/components/spree/catalog-terms-card.tsx b/packages/dashboard/src/components/spree/catalog-terms-card.tsx
index 1aab1b2f75..6bd8aaa260 100644
--- a/packages/dashboard/src/components/spree/catalog-terms-card.tsx
+++ b/packages/dashboard/src/components/spree/catalog-terms-card.tsx
@@ -17,7 +17,7 @@ import {
TooltipContent,
TooltipTrigger,
} from '@spree/dashboard-ui'
-import { InfoIcon, PlusIcon, XIcon } from 'lucide-react'
+import { InfoIcon, PlusIcon, XIcon } from '@spree/dashboard-ui/icons'
import type { UseFormReturn } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import type {
diff --git a/packages/dashboard/src/components/spree/categories/category-list.tsx b/packages/dashboard/src/components/spree/categories/category-list.tsx
index b939dcd1ef..1de89a86a0 100644
--- a/packages/dashboard/src/components/spree/categories/category-list.tsx
+++ b/packages/dashboard/src/components/spree/categories/category-list.tsx
@@ -10,7 +10,7 @@ import {
TableHeader,
TableRow,
} from '@spree/dashboard-ui'
-import { TagIcon } from 'lucide-react'
+import { TagIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
interface CategoryListProps {
diff --git a/packages/dashboard/src/components/spree/categories/category-tree.tsx b/packages/dashboard/src/components/spree/categories/category-tree.tsx
index d419e8f45e..af347dd5dc 100644
--- a/packages/dashboard/src/components/spree/categories/category-tree.tsx
+++ b/packages/dashboard/src/components/spree/categories/category-tree.tsx
@@ -27,7 +27,7 @@ import {
TableHeader,
TableRow,
} from '@spree/dashboard-ui'
-import { ChevronDownIcon, ChevronRightIcon, LanguagesIcon } from 'lucide-react'
+import { ChevronDownIcon, ChevronRightIcon, LanguagesIcon } from '@spree/dashboard-ui/icons'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import {
diff --git a/packages/dashboard/src/components/spree/collections/collection-rules-card.tsx b/packages/dashboard/src/components/spree/collections/collection-rules-card.tsx
index 7f7e128ccc..e1f423971c 100644
--- a/packages/dashboard/src/components/spree/collections/collection-rules-card.tsx
+++ b/packages/dashboard/src/components/spree/collections/collection-rules-card.tsx
@@ -16,7 +16,7 @@ import {
SelectValue,
Switch,
} from '@spree/dashboard-ui'
-import { PlusIcon, Trash2Icon } from 'lucide-react'
+import { PlusIcon, Trash2Icon } from '@spree/dashboard-ui/icons'
import { Controller, type UseFormReturn, useFieldArray } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { useCollectionRuleTypes } from '../../../hooks/use-collections'
diff --git a/packages/dashboard/src/components/spree/command-palette/command-palette.tsx b/packages/dashboard/src/components/spree/command-palette/command-palette.tsx
index 85eb676f12..cd3e881cb3 100644
--- a/packages/dashboard/src/components/spree/command-palette/command-palette.tsx
+++ b/packages/dashboard/src/components/spree/command-palette/command-palette.tsx
@@ -28,8 +28,9 @@ import {
DialogHeader,
DialogTitle,
} from '@spree/dashboard-ui'
+import { LogOutIcon, PackageIcon, PlusIcon, SettingsIcon } from '@spree/dashboard-ui/icons'
import { useNavigate, useParams } from '@tanstack/react-router'
-import { LogOutIcon, type LucideIcon, PackageIcon, PlusIcon, SettingsIcon } from 'lucide-react'
+import type { LucideIcon } from 'lucide-react'
import { type ReactNode, useMemo, useState } from 'react'
export function CommandPalette() {
diff --git a/packages/dashboard/src/components/spree/custom-fields/custom-fields-inline.tsx b/packages/dashboard/src/components/spree/custom-fields/custom-fields-inline.tsx
index 3c54ddf7f3..66b3d9f27b 100644
--- a/packages/dashboard/src/components/spree/custom-fields/custom-fields-inline.tsx
+++ b/packages/dashboard/src/components/spree/custom-fields/custom-fields-inline.tsx
@@ -60,8 +60,8 @@ import {
Textarea,
toastManager,
} from '@spree/dashboard-ui'
+import { Loader2Icon, PencilIcon, PlusIcon, TagIcon } from '@spree/dashboard-ui/icons'
import { Link, useParams } from '@tanstack/react-router'
-import { Loader2Icon, PencilIcon, PlusIcon, TagIcon } from 'lucide-react'
import { createContext, type ReactNode, useCallback, useContext, useMemo, useState } from 'react'
import { type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/components/spree/customers/customer-addresses-card.tsx b/packages/dashboard/src/components/spree/customers/customer-addresses-card.tsx
index 8c6421f837..d1a91fdd28 100644
--- a/packages/dashboard/src/components/spree/customers/customer-addresses-card.tsx
+++ b/packages/dashboard/src/components/spree/customers/customer-addresses-card.tsx
@@ -11,7 +11,7 @@ import {
CardTitle,
useConfirm,
} from '@spree/dashboard-ui'
-import { PlusIcon } from 'lucide-react'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import {
diff --git a/packages/dashboard/src/components/spree/customers/customer-groups-card.tsx b/packages/dashboard/src/components/spree/customers/customer-groups-card.tsx
index 0157fb00be..8318037463 100644
--- a/packages/dashboard/src/components/spree/customers/customer-groups-card.tsx
+++ b/packages/dashboard/src/components/spree/customers/customer-groups-card.tsx
@@ -17,7 +17,7 @@ import {
SheetHeader,
SheetTitle,
} from '@spree/dashboard-ui'
-import { PencilIcon, UsersIcon } from 'lucide-react'
+import { PencilIcon, UsersIcon } from '@spree/dashboard-ui/icons'
import { useEffect, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import {
diff --git a/packages/dashboard/src/components/spree/customers/customer-internal-note-card.tsx b/packages/dashboard/src/components/spree/customers/customer-internal-note-card.tsx
index 0f25939da1..77bd7773dd 100644
--- a/packages/dashboard/src/components/spree/customers/customer-internal-note-card.tsx
+++ b/packages/dashboard/src/components/spree/customers/customer-internal-note-card.tsx
@@ -8,7 +8,7 @@ import {
CardTitle,
RichTextEditor,
} from '@spree/dashboard-ui'
-import { PencilIcon } from 'lucide-react'
+import { PencilIcon } from '@spree/dashboard-ui/icons'
import { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useUpdateCustomer } from '../../../hooks/use-customers'
diff --git a/packages/dashboard/src/components/spree/customers/customer-profile-card.tsx b/packages/dashboard/src/components/spree/customers/customer-profile-card.tsx
index d7805b5428..831b0ef3a6 100644
--- a/packages/dashboard/src/components/spree/customers/customer-profile-card.tsx
+++ b/packages/dashboard/src/components/spree/customers/customer-profile-card.tsx
@@ -22,7 +22,7 @@ import {
SheetHeader,
SheetTitle,
} from '@spree/dashboard-ui'
-import { MailIcon, PencilIcon, PhoneIcon, StarIcon } from 'lucide-react'
+import { MailIcon, PencilIcon, PhoneIcon, StarIcon } from '@spree/dashboard-ui/icons'
import { useState } from 'react'
import { Controller, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/components/spree/customers/customer-store-credits-card.tsx b/packages/dashboard/src/components/spree/customers/customer-store-credits-card.tsx
index 960802c325..e0a57afa4f 100644
--- a/packages/dashboard/src/components/spree/customers/customer-store-credits-card.tsx
+++ b/packages/dashboard/src/components/spree/customers/customer-store-credits-card.tsx
@@ -30,7 +30,10 @@ import {
FieldError,
FieldGroup,
FieldLabel,
- Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ InputGroupText,
Table,
TableBody,
TableCell,
@@ -40,7 +43,7 @@ import {
Textarea,
useConfirm,
} from '@spree/dashboard-ui'
-import { EllipsisVerticalIcon, PencilIcon, PlusIcon, TrashIcon } from 'lucide-react'
+import { EllipsisVerticalIcon, PencilIcon, PlusIcon, TrashIcon } from '@spree/dashboard-ui/icons'
import { useEffect, useState } from 'react'
import { Controller, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
@@ -192,7 +195,7 @@ function EditStoreCreditDialog({
// canonical. Displaying in the same locale we normalize from keeps an
// untouched amount from being mangled on save.
const creditLocale = localeForCurrency(credit.currency) || 'en'
- const { decimal } = currencyParts(credit.currency, creditLocale)
+ const { decimal, symbol } = currencyParts(credit.currency, creditLocale)
const form = useForm<EditStoreCreditFormValues>({
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -250,14 +253,19 @@ function EditStoreCreditDialog({
<FieldLabel htmlFor="edit-sc-amount">
{t('admin.fields.store_credit.amount.label')}
</FieldLabel>
- <Input
- id="edit-sc-amount"
- type="text"
- inputMode="decimal"
- disabled={amountLocked}
- aria-invalid={!!errors.amount || undefined}
- {...form.register('amount')}
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <InputGroupText>{symbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
+ id="edit-sc-amount"
+ type="text"
+ inputMode="decimal"
+ disabled={amountLocked}
+ aria-invalid={!!errors.amount || undefined}
+ {...form.register('amount')}
+ />
+ </InputGroup>
<FieldError errors={[errors.amount]} />
</Field>
<Field>
@@ -324,6 +332,8 @@ function IssueStoreCreditDialog({
const mutation = useCreateCustomerStoreCredit(customerId)
const localeForCurrency = useCurrencyLocale()
+ const selectedCurrency = form.watch('currency')
+ const { symbol } = currencyParts(selectedCurrency, localeForCurrency(selectedCurrency) || 'en')
// Clear any prior submission state when the dialog re-opens so a fresh form
// is presented (otherwise stale "Issue $20" values linger across opens).
@@ -390,14 +400,19 @@ function IssueStoreCreditDialog({
<FieldLabel htmlFor="sc-amount">
{t('admin.fields.store_credit.amount.label')}
</FieldLabel>
- <Input
- id="sc-amount"
- type="text"
- inputMode="decimal"
- required
- aria-invalid={!!errors.amount || undefined}
- {...form.register('amount')}
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <InputGroupText>{symbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
+ id="sc-amount"
+ type="text"
+ inputMode="decimal"
+ required
+ aria-invalid={!!errors.amount || undefined}
+ {...form.register('amount')}
+ />
+ </InputGroup>
<FieldError errors={[errors.amount]} />
</Field>
<Field>
diff --git a/packages/dashboard/src/components/spree/deferred-product-membership-card.tsx b/packages/dashboard/src/components/spree/deferred-product-membership-card.tsx
index a5f297b644..67f90e5101 100644
--- a/packages/dashboard/src/components/spree/deferred-product-membership-card.tsx
+++ b/packages/dashboard/src/components/spree/deferred-product-membership-card.tsx
@@ -11,8 +11,8 @@ import {
type ProductMembershipListProps,
type ProductMembershipRow,
} from '@spree/dashboard-ui'
+import { PlusIcon, Trash2Icon } from '@spree/dashboard-ui/icons'
import { Link } from '@tanstack/react-router'
-import { PlusIcon, Trash2Icon } from 'lucide-react'
import { useEffect, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useProductMembershipStaging } from './product-membership-staging'
diff --git a/packages/dashboard/src/components/spree/enterprise-upsell.tsx b/packages/dashboard/src/components/spree/enterprise-upsell.tsx
index c42d515ccd..6be91308dc 100644
--- a/packages/dashboard/src/components/spree/enterprise-upsell.tsx
+++ b/packages/dashboard/src/components/spree/enterprise-upsell.tsx
@@ -1,5 +1,5 @@
import { Alert, AlertDescription, AlertTitle } from '@spree/dashboard-ui'
-import { ExternalLinkIcon, SparklesIcon } from 'lucide-react'
+import { ExternalLinkIcon, SparklesIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
export const SPREE_ENTERPRISE_URL = 'https://spreecommerce.org/enterprise/'
diff --git a/packages/dashboard/src/components/spree/order-digital-links-card.tsx b/packages/dashboard/src/components/spree/order-digital-links-card.tsx
index 177702fc79..ce80c24ea0 100644
--- a/packages/dashboard/src/components/spree/order-digital-links-card.tsx
+++ b/packages/dashboard/src/components/spree/order-digital-links-card.tsx
@@ -16,7 +16,7 @@ import {
TableRow,
useConfirm,
} from '@spree/dashboard-ui'
-import { MailIcon, RotateCcwIcon } from 'lucide-react'
+import { MailIcon, RotateCcwIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
import { useResendDigitalLinks, useResetDigitalLink } from '../../hooks/use-digital-assets'
diff --git a/packages/dashboard/src/components/spree/order-post-sale-cards.tsx b/packages/dashboard/src/components/spree/order-post-sale-cards.tsx
index 41295ce7b4..359731409e 100644
--- a/packages/dashboard/src/components/spree/order-post-sale-cards.tsx
+++ b/packages/dashboard/src/components/spree/order-post-sale-cards.tsx
@@ -25,7 +25,7 @@ import {
ShieldAlertIcon,
TruckIcon,
XCircleIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import {
diff --git a/packages/dashboard/src/components/spree/order-returns-card.tsx b/packages/dashboard/src/components/spree/order-returns-card.tsx
index b01920baf1..c39fef45ea 100644
--- a/packages/dashboard/src/components/spree/order-returns-card.tsx
+++ b/packages/dashboard/src/components/spree/order-returns-card.tsx
@@ -1,4 +1,5 @@
import type { Order, Return, ReturnLineItem } from '@spree/admin-sdk'
+import { currencyParts, useStore } from '@spree/dashboard-core'
import {
Badge,
Button,
@@ -21,6 +22,10 @@ import {
Field,
FieldLabel,
Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ InputGroupText,
Select,
SelectContent,
SelectItem,
@@ -38,7 +43,8 @@ import {
PlusIcon,
RotateCcwIcon,
XCircleIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
+import i18n from 'i18next'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useOrderReturns, useReturnActions } from '../../hooks/use-returns'
@@ -363,6 +369,8 @@ function RefundDialog({
'original_payment',
)
const [amount, setAmount] = useState(returnRecord.refundable_total)
+ const { defaultCurrency } = useStore()
+ const { symbol: currencySymbol } = currencyParts(defaultCurrency, i18n.language)
const methodOptions = [
{
@@ -386,11 +394,19 @@ function RefundDialog({
<FieldLabel htmlFor="refund-amount">
{t('admin.pages.orders.detail.returns.refund_amount')}
</FieldLabel>
- <Input
- id="refund-amount"
- value={amount}
- onChange={(event) => setAmount(event.target.value)}
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <InputGroupText>{currencySymbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
+ id="refund-amount"
+ type="number"
+ step="0.01"
+ min="0"
+ value={amount}
+ onChange={(event) => setAmount(event.target.value)}
+ />
+ </InputGroup>
</Field>
<Field>
<FieldLabel htmlFor="refund-method">
diff --git a/packages/dashboard/src/components/spree/order-routing-rules-section.tsx b/packages/dashboard/src/components/spree/order-routing-rules-section.tsx
index 9627801605..379ff499b4 100644
--- a/packages/dashboard/src/components/spree/order-routing-rules-section.tsx
+++ b/packages/dashboard/src/components/spree/order-routing-rules-section.tsx
@@ -24,8 +24,8 @@ import {
useResourceKeyBuilder,
} from '@spree/dashboard-core'
import { Button, DragHandle, Switch, useConfirm } from '@spree/dashboard-ui'
+import { PlusIcon, SlidersHorizontalIcon, Trash2Icon } from '@spree/dashboard-ui/icons'
import { useQueryClient } from '@tanstack/react-query'
-import { PlusIcon, SlidersHorizontalIcon, Trash2Icon } from 'lucide-react'
import { type CSSProperties, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import {
diff --git a/packages/dashboard/src/components/spree/orders/fulfillment-fulfill-form.tsx b/packages/dashboard/src/components/spree/orders/fulfillment-fulfill-form.tsx
index 7c2386b343..a07b3dd271 100644
--- a/packages/dashboard/src/components/spree/orders/fulfillment-fulfill-form.tsx
+++ b/packages/dashboard/src/components/spree/orders/fulfillment-fulfill-form.tsx
@@ -17,7 +17,7 @@ import {
SelectValue,
Thumbnail,
} from '@spree/dashboard-ui'
-import { PackageIcon, TriangleAlertIcon } from 'lucide-react'
+import { PackageIcon, TriangleAlertIcon } from '@spree/dashboard-ui/icons'
import { useEffect, useRef } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/components/spree/orders/fulfillment-item-list.tsx b/packages/dashboard/src/components/spree/orders/fulfillment-item-list.tsx
index 00fce690fc..9ac2f8b214 100644
--- a/packages/dashboard/src/components/spree/orders/fulfillment-item-list.tsx
+++ b/packages/dashboard/src/components/spree/orders/fulfillment-item-list.tsx
@@ -1,5 +1,5 @@
import { Thumbnail } from '@spree/dashboard-ui'
-import { PackageIcon } from 'lucide-react'
+import { PackageIcon } from '@spree/dashboard-ui/icons'
import type { FulfillmentItemRow } from '../../../lib/fulfillment-items'
/**
diff --git a/packages/dashboard/src/components/spree/orders/fulfillments-card.tsx b/packages/dashboard/src/components/spree/orders/fulfillments-card.tsx
index e78317424a..f948ab5660 100644
--- a/packages/dashboard/src/components/spree/orders/fulfillments-card.tsx
+++ b/packages/dashboard/src/components/spree/orders/fulfillments-card.tsx
@@ -47,7 +47,7 @@ import {
TagIcon,
TruckIcon,
XCircleIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useFulfillmentActions } from '../../../hooks/use-fulfillments'
diff --git a/packages/dashboard/src/components/spree/orders/line-item-dialogs.tsx b/packages/dashboard/src/components/spree/orders/line-item-dialogs.tsx
index 538a31a015..c7cb0c5c7a 100644
--- a/packages/dashboard/src/components/spree/orders/line-item-dialogs.tsx
+++ b/packages/dashboard/src/components/spree/orders/line-item-dialogs.tsx
@@ -13,8 +13,8 @@ import {
SheetHeader,
SheetTitle,
} from '@spree/dashboard-ui'
+import { XCircleIcon } from '@spree/dashboard-ui/icons'
import { useQuery } from '@tanstack/react-query'
-import { XCircleIcon } from 'lucide-react'
import { type FormEvent, useState } from 'react'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/components/spree/orders/order-adjustments-cards.tsx b/packages/dashboard/src/components/spree/orders/order-adjustments-cards.tsx
index 0ca945c6a2..05641640a7 100644
--- a/packages/dashboard/src/components/spree/orders/order-adjustments-cards.tsx
+++ b/packages/dashboard/src/components/spree/orders/order-adjustments-cards.tsx
@@ -1,5 +1,5 @@
import type { Discount, Fee, Order } from '@spree/admin-sdk'
-import { adminClient, formatPrice } from '@spree/dashboard-core'
+import { adminClient, currencyParts, formatPrice } from '@spree/dashboard-core'
import {
Badge,
Button,
@@ -23,6 +23,10 @@ import {
FieldGroup,
FieldLabel,
Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ InputGroupText,
Select,
SelectContent,
SelectItem,
@@ -36,8 +40,15 @@ import {
TableRow,
useConfirm,
} from '@spree/dashboard-ui'
+import {
+ BanknoteIcon,
+ EllipsisVerticalIcon,
+ PlusIcon,
+ ReceiptTextIcon,
+ TagIcon,
+ TrashIcon,
+} from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { EllipsisVerticalIcon, PlusIcon, TrashIcon } from 'lucide-react'
import { type FormEvent, useState } from 'react'
import { useTranslation } from 'react-i18next'
import {
@@ -132,7 +143,10 @@ export function TaxLinesCard({ order }: { order: Order }) {
return (
<Card>
<CardHeader>
- <CardTitle>{t('admin.orders.detail.adjustment_lines.taxes')}</CardTitle>
+ <CardTitle>
+ <ReceiptTextIcon className="size-4" />
+ {t('admin.orders.detail.adjustment_lines.taxes')}
+ </CardTitle>
</CardHeader>
{taxGroups.length === 0 ? (
@@ -216,7 +230,10 @@ export function OrderDiscountsCard({ order }: { order: Order }) {
return (
<Card>
<CardHeader>
- <CardTitle>{t('admin.orders.detail.adjustment_lines.discounts')}</CardTitle>
+ <CardTitle>
+ <TagIcon className="size-4" />
+ {t('admin.orders.detail.adjustment_lines.discounts')}
+ </CardTitle>
<CardAction>
<Button variant="outline" size="sm" onClick={() => setAddDiscountOpen(true)}>
<PlusIcon className="size-4" />
@@ -300,7 +317,10 @@ export function FeesCard({ order }: { order: Order }) {
return (
<Card>
<CardHeader>
- <CardTitle>{t('admin.orders.detail.adjustment_lines.fees')}</CardTitle>
+ <CardTitle>
+ <BanknoteIcon className="size-4" />
+ {t('admin.orders.detail.adjustment_lines.fees')}
+ </CardTitle>
<CardAction>
<Button variant="outline" size="sm" onClick={() => setAddFeeOpen(true)}>
<PlusIcon className="size-4" />
@@ -383,6 +403,7 @@ function AddDiscountDialog({
{ value: 'flat', label: t('admin.orders.detail.adjustment_lines.value_type_flat') },
{ value: 'percent', label: t('admin.orders.detail.adjustment_lines.value_type_percent') },
]
+ const { symbol: currencySymbol } = currencyParts(order.currency, i18n.language)
function handleSubmit(e: FormEvent<HTMLFormElement>) {
e.preventDefault()
@@ -445,16 +466,28 @@ function AddDiscountDialog({
<FieldLabel htmlFor="discount-value">
{t('admin.orders.detail.adjustment_lines.value_field')}
</FieldLabel>
- <Input
- id="discount-value"
- name="value"
- type="number"
- step="0.01"
- min="0.01"
- value={value}
- onChange={(e) => setValue(e.target.value)}
- required
- />
+ <InputGroup>
+ {valueType === 'percent' ? null : (
+ <InputGroupAddon>
+ <InputGroupText>{currencySymbol}</InputGroupText>
+ </InputGroupAddon>
+ )}
+ <InputGroupInput
+ id="discount-value"
+ name="value"
+ type="number"
+ step="0.01"
+ min="0.01"
+ value={value}
+ onChange={(e) => setValue(e.target.value)}
+ required
+ />
+ {valueType === 'percent' ? (
+ <InputGroupAddon align="inline-end">
+ <InputGroupText>%</InputGroupText>
+ </InputGroupAddon>
+ ) : null}
+ </InputGroup>
</Field>
<Field>
<FieldLabel>
@@ -554,6 +587,7 @@ function AddFeeDialog({
value,
label: t(`admin.orders.detail.adjustment_lines.fee_kind_${value}`),
}))
+ const { symbol: currencySymbol } = currencyParts(order.currency, i18n.language)
function handleSubmit(e: FormEvent<HTMLFormElement>) {
e.preventDefault()
@@ -592,7 +626,19 @@ function AddFeeDialog({
<FieldLabel htmlFor="fee-amount">
{t('admin.orders.detail.adjustment_lines.amount_field')}
</FieldLabel>
- <Input id="fee-amount" name="amount" type="number" step="0.01" min="0" required />
+ <InputGroup>
+ <InputGroupAddon>
+ <InputGroupText>{currencySymbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
+ id="fee-amount"
+ name="amount"
+ type="number"
+ step="0.01"
+ min="0"
+ required
+ />
+ </InputGroup>
</Field>
<Field>
<FieldLabel>{t('admin.orders.detail.adjustment_lines.kind_field')}</FieldLabel>
diff --git a/packages/dashboard/src/components/spree/orders/order-customer-card.tsx b/packages/dashboard/src/components/spree/orders/order-customer-card.tsx
index d187cddd3f..dd84027a93 100644
--- a/packages/dashboard/src/components/spree/orders/order-customer-card.tsx
+++ b/packages/dashboard/src/components/spree/orders/order-customer-card.tsx
@@ -21,7 +21,7 @@ import {
DropdownMenuTrigger,
toastManager,
} from '@spree/dashboard-ui'
-import { EllipsisVerticalIcon, PencilIcon } from 'lucide-react'
+import { EllipsisVerticalIcon, PencilIcon } from '@spree/dashboard-ui/icons'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useOrderMutation } from '../../../hooks/use-order'
diff --git a/packages/dashboard/src/components/spree/orders/order-discounts-sidebar-card.tsx b/packages/dashboard/src/components/spree/orders/order-discounts-sidebar-card.tsx
index 85799f182c..670666af7f 100644
--- a/packages/dashboard/src/components/spree/orders/order-discounts-sidebar-card.tsx
+++ b/packages/dashboard/src/components/spree/orders/order-discounts-sidebar-card.tsx
@@ -21,8 +21,8 @@ import {
Separator,
useConfirm,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { useQuery } from '@tanstack/react-query'
-import { PlusIcon } from 'lucide-react'
import { type FormEvent, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useOrderMutation } from '../../../hooks/use-order'
diff --git a/packages/dashboard/src/components/spree/orders/order-edit-items-table.tsx b/packages/dashboard/src/components/spree/orders/order-edit-items-table.tsx
index 0e451d1020..ce73917618 100644
--- a/packages/dashboard/src/components/spree/orders/order-edit-items-table.tsx
+++ b/packages/dashboard/src/components/spree/orders/order-edit-items-table.tsx
@@ -11,7 +11,7 @@ import {
TableRow,
Thumbnail,
} from '@spree/dashboard-ui'
-import { PackageIcon, RotateCcwIcon, Undo2Icon, XIcon } from 'lucide-react'
+import { PackageIcon, RotateCcwIcon, Undo2Icon, XIcon } from '@spree/dashboard-ui/icons'
import { Controller, type FieldArrayWithId, type UseFormReturn } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import {
diff --git a/packages/dashboard/src/components/spree/orders/order-header.tsx b/packages/dashboard/src/components/spree/orders/order-header.tsx
index a783da6824..b657fa8b1b 100644
--- a/packages/dashboard/src/components/spree/orders/order-header.tsx
+++ b/packages/dashboard/src/components/spree/orders/order-header.tsx
@@ -7,7 +7,6 @@ import {
StatusBadge,
useConfirm,
} from '@spree/dashboard-ui'
-import { Link } from '@tanstack/react-router'
import {
CheckCircleIcon,
ExternalLinkIcon,
@@ -16,7 +15,8 @@ import {
RotateCcwIcon,
ShieldCheckIcon,
XCircleIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
+import { Link } from '@tanstack/react-router'
import { useTranslation } from 'react-i18next'
import { orderQueryKey } from '../../../hooks/use-order'
import { GONE_STATUSES } from '../../../lib/fulfillment-items'
diff --git a/packages/dashboard/src/components/spree/orders/order-marketplace-card.tsx b/packages/dashboard/src/components/spree/orders/order-marketplace-card.tsx
index 4aaf14bbc9..c6d45ddeef 100644
--- a/packages/dashboard/src/components/spree/orders/order-marketplace-card.tsx
+++ b/packages/dashboard/src/components/spree/orders/order-marketplace-card.tsx
@@ -1,7 +1,7 @@
import type { Order } from '@spree/admin-sdk'
import { Card, CardContent, CardHeader, CardTitle } from '@spree/dashboard-ui'
+import { StoreIcon } from '@spree/dashboard-ui/icons'
import { Link } from '@tanstack/react-router'
-import { StoreIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { useSeller } from '../../../hooks/use-sellers'
import { orderGroupSearch } from '../../../lib/order-group-search'
diff --git a/packages/dashboard/src/components/spree/orders/order-notes-cards.tsx b/packages/dashboard/src/components/spree/orders/order-notes-cards.tsx
index 05630ed548..bbed149f50 100644
--- a/packages/dashboard/src/components/spree/orders/order-notes-cards.tsx
+++ b/packages/dashboard/src/components/spree/orders/order-notes-cards.tsx
@@ -11,7 +11,7 @@ import {
RichTextEditor,
Textarea,
} from '@spree/dashboard-ui'
-import { PencilIcon } from 'lucide-react'
+import { PencilIcon } from '@spree/dashboard-ui/icons'
import { type FormEvent, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useOrderMutation } from '../../../hooks/use-order'
diff --git a/packages/dashboard/src/components/spree/orders/order-payments-card.tsx b/packages/dashboard/src/components/spree/orders/order-payments-card.tsx
index a9d69b98d6..989f4d9558 100644
--- a/packages/dashboard/src/components/spree/orders/order-payments-card.tsx
+++ b/packages/dashboard/src/components/spree/orders/order-payments-card.tsx
@@ -1,5 +1,5 @@
import type { Order } from '@spree/admin-sdk'
-import { adminClient } from '@spree/dashboard-core'
+import { adminClient, currencyParts } from '@spree/dashboard-core'
import {
Badge,
Button,
@@ -22,7 +22,10 @@ import {
Field,
FieldGroup,
FieldLabel,
- Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ InputGroupText,
Select,
SelectContent,
SelectItem,
@@ -38,8 +41,14 @@ import {
TableRow,
useConfirm,
} from '@spree/dashboard-ui'
+import {
+ CreditCardIcon,
+ EllipsisVerticalIcon,
+ PlusIcon,
+ XCircleIcon,
+} from '@spree/dashboard-ui/icons'
import { useQuery } from '@tanstack/react-query'
-import { CreditCardIcon, EllipsisVerticalIcon, PlusIcon, XCircleIcon } from 'lucide-react'
+import i18n from 'i18next'
import { type FormEvent, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useOrderMutation } from '../../../hooks/use-order'
@@ -186,6 +195,7 @@ function AddPaymentDialog({
const [sourceId, setSourceId] = useState<string>('')
const [amount, setAmount] = useState<string>(order.amount_due ?? '')
const [capture, setCapture] = useState(false)
+ const { symbol: currencySymbol } = currencyParts(order.currency, i18n.language)
// Re-seed amount from outstanding balance whenever the dialog opens.
useEffect(() => {
@@ -338,14 +348,19 @@ function AddPaymentDialog({
<Field>
<FieldLabel htmlFor="pay-amount">{t('admin.fields.amount.label')}</FieldLabel>
- <Input
- id="pay-amount"
- type="number"
- step="0.01"
- placeholder={order.amount_due ?? '0.00'}
- value={amount}
- onChange={(e) => setAmount(e.target.value)}
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <InputGroupText>{currencySymbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
+ id="pay-amount"
+ type="number"
+ step="0.01"
+ placeholder={order.amount_due ?? '0.00'}
+ value={amount}
+ onChange={(e) => setAmount(e.target.value)}
+ />
+ </InputGroup>
<p className="text-xs text-muted-foreground mt-1">
{t('admin.orders.detail.payment_form.amount_help')}
</p>
diff --git a/packages/dashboard/src/components/spree/orders/order-purchase-order-card.tsx b/packages/dashboard/src/components/spree/orders/order-purchase-order-card.tsx
index c9dbf71006..644653b164 100644
--- a/packages/dashboard/src/components/spree/orders/order-purchase-order-card.tsx
+++ b/packages/dashboard/src/components/spree/orders/order-purchase-order-card.tsx
@@ -18,7 +18,7 @@ import {
Input,
toastManager,
} from '@spree/dashboard-ui'
-import { DownloadIcon, FileTextIcon, PencilIcon } from 'lucide-react'
+import { DownloadIcon, FileTextIcon, PencilIcon } from '@spree/dashboard-ui/icons'
import { type FormEvent, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useOrderMutation } from '../../../hooks/use-order'
diff --git a/packages/dashboard/src/components/spree/post-sale-create-dialogs.tsx b/packages/dashboard/src/components/spree/post-sale-create-dialogs.tsx
index e620097d1c..9de8513a1b 100644
--- a/packages/dashboard/src/components/spree/post-sale-create-dialogs.tsx
+++ b/packages/dashboard/src/components/spree/post-sale-create-dialogs.tsx
@@ -1,4 +1,5 @@
import type { Claim, Order } from '@spree/admin-sdk'
+import { currencyParts, useStore } from '@spree/dashboard-core'
import {
Button,
Dialog,
@@ -10,6 +11,10 @@ import {
Field,
FieldLabel,
Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ InputGroupText,
Select,
SelectContent,
SelectItem,
@@ -18,6 +23,7 @@ import {
Switch,
Textarea,
} from '@spree/dashboard-ui'
+import i18n from 'i18next'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { type ReasonKind, useReasons } from '../../hooks/use-reasons'
@@ -334,6 +340,8 @@ export function CreateClaimDialog({
const items = order.items ?? []
const [selection, setSelection] = useState<Selection>({})
const [amounts, setAmounts] = useState<Record<string, string>>({})
+ const { defaultCurrency } = useStore()
+ const { symbol: currencySymbol } = currencyParts(defaultCurrency, i18n.language)
const [memo, setMemo] = useState('')
const [reasonId, setReasonId] = useState('')
@@ -386,13 +394,21 @@ export function CreateClaimDialog({
<FieldLabel htmlFor={`claim-amount-${item.id}`}>
{t('admin.pages.orders.detail.claims.refund_amount')}
</FieldLabel>
- <Input
- id={`claim-amount-${item.id}`}
- value={amounts[item.id] ?? ''}
- onChange={(event) =>
- setAmounts({ ...amounts, [item.id]: event.target.value })
- }
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <InputGroupText>{currencySymbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
+ id={`claim-amount-${item.id}`}
+ type="number"
+ step="0.01"
+ min="0"
+ value={amounts[item.id] ?? ''}
+ onChange={(event) =>
+ setAmounts({ ...amounts, [item.id]: event.target.value })
+ }
+ />
+ </InputGroup>
</Field>
)}
</div>
@@ -458,6 +474,8 @@ export function ResolveClaimDialog({
}) {
const { t } = useTranslation()
const lines = claim.claim_line_items ?? []
+ const { defaultCurrency } = useStore()
+ const { symbol: currencySymbol } = currencyParts(defaultCurrency, i18n.language)
const [resolution, setResolution] = useState<'refund' | 'replacement' | 'refund_and_replacement'>(
'refund',
@@ -543,11 +561,19 @@ export function ResolveClaimDialog({
<FieldLabel htmlFor="claim-resolve-amount">
{t('admin.pages.orders.detail.claims.refund_amount')}
</FieldLabel>
- <Input
- id="claim-resolve-amount"
- value={amount}
- onChange={(event) => setAmount(event.target.value)}
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <InputGroupText>{currencySymbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
+ id="claim-resolve-amount"
+ type="number"
+ step="0.01"
+ min="0"
+ value={amount}
+ onChange={(event) => setAmount(event.target.value)}
+ />
+ </InputGroup>
</Field>
<Field>
<FieldLabel htmlFor="claim-refund-method">
diff --git a/packages/dashboard/src/components/spree/price-list-editors/price-list-form.tsx b/packages/dashboard/src/components/spree/price-list-editors/price-list-form.tsx
index 323d84b305..23c0be7388 100644
--- a/packages/dashboard/src/components/spree/price-list-editors/price-list-form.tsx
+++ b/packages/dashboard/src/components/spree/price-list-editors/price-list-form.tsx
@@ -10,7 +10,6 @@ import {
useStore,
} from '@spree/dashboard-core'
import { DropdownMenuItem, useConfirm } from '@spree/dashboard-ui'
-import { useQueryClient } from '@tanstack/react-query'
import {
CalendarOffIcon,
PauseIcon,
@@ -19,7 +18,8 @@ import {
PlusIcon,
TableIcon,
TrashIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
+import { useQueryClient } from '@tanstack/react-query'
import { useEffect, useState } from 'react'
import { Controller, type UseFormReturn, useFieldArray, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/components/spree/products/digital-assets-card.tsx b/packages/dashboard/src/components/spree/products/digital-assets-card.tsx
index 16d190146a..ad129e65a0 100644
--- a/packages/dashboard/src/components/spree/products/digital-assets-card.tsx
+++ b/packages/dashboard/src/components/spree/products/digital-assets-card.tsx
@@ -24,7 +24,13 @@ import {
toastManager,
useConfirm,
} from '@spree/dashboard-ui'
-import { ChevronDownIcon, DownloadIcon, FileIcon, PlusIcon, UploadIcon } from 'lucide-react'
+import {
+ ChevronDownIcon,
+ DownloadIcon,
+ FileIcon,
+ PlusIcon,
+ UploadIcon,
+} from '@spree/dashboard-ui/icons'
import { useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import {
diff --git a/packages/dashboard/src/components/spree/products/digital-files-form-card.tsx b/packages/dashboard/src/components/spree/products/digital-files-form-card.tsx
index e1f6acf2d3..639f16275d 100644
--- a/packages/dashboard/src/components/spree/products/digital-files-form-card.tsx
+++ b/packages/dashboard/src/components/spree/products/digital-files-form-card.tsx
@@ -16,7 +16,7 @@ import {
toastManager,
useConfirm,
} from '@spree/dashboard-ui'
-import { FileIcon, Loader2Icon, UploadIcon, XIcon } from 'lucide-react'
+import { FileIcon, Loader2Icon, UploadIcon, XIcon } from '@spree/dashboard-ui/icons'
import { useCallback, useRef, useState } from 'react'
import type { UseFormReturn } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/components/spree/products/publishing-card.tsx b/packages/dashboard/src/components/spree/products/publishing-card.tsx
index 3bf39723a0..56ffdb5f37 100644
--- a/packages/dashboard/src/components/spree/products/publishing-card.tsx
+++ b/packages/dashboard/src/components/spree/products/publishing-card.tsx
@@ -18,8 +18,8 @@ import {
SheetTitle,
Skeleton,
} from '@spree/dashboard-ui'
+import { PencilIcon, SettingsIcon } from '@spree/dashboard-ui/icons'
import { parseISO } from 'date-fns'
-import { PencilIcon, SettingsIcon } from 'lucide-react'
import { useEffect, useMemo, useRef, useState } from 'react'
import { Controller, type UseFormReturn, useFieldArray } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/components/spree/promotion-editors/promotion-form.tsx b/packages/dashboard/src/components/spree/promotion-editors/promotion-form.tsx
index 98dba347e9..69812a3823 100644
--- a/packages/dashboard/src/components/spree/promotion-editors/promotion-form.tsx
+++ b/packages/dashboard/src/components/spree/promotion-editors/promotion-form.tsx
@@ -10,8 +10,8 @@ import type {
} from '@spree/admin-sdk'
import { Can, PageHeader, PreferencesForm, StoreDatePicker } from '@spree/dashboard-core'
import { DropdownMenuItem, formatCalculatorSummary, useConfirm } from '@spree/dashboard-ui'
+import { DownloadIcon, PlusIcon, SparklesIcon, TrashIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { DownloadIcon, PlusIcon, SparklesIcon, TrashIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
import { Controller, type UseFormReturn, useFieldArray, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/components/spree/resource-image-field.tsx b/packages/dashboard/src/components/spree/resource-image-field.tsx
index 9acdd48083..bced4d5029 100644
--- a/packages/dashboard/src/components/spree/resource-image-field.tsx
+++ b/packages/dashboard/src/components/spree/resource-image-field.tsx
@@ -6,7 +6,7 @@ import {
useDirectUpload,
} from '@spree/dashboard-core'
import { Button } from '@spree/dashboard-ui'
-import { LibraryIcon } from 'lucide-react'
+import { LibraryIcon } from '@spree/dashboard-ui/icons'
import { useMemo, useState } from 'react'
import type { UseFormReturn } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/components/spree/sellers/seller-address-card.tsx b/packages/dashboard/src/components/spree/sellers/seller-address-card.tsx
index 744aad1ed5..d364b8db4f 100644
--- a/packages/dashboard/src/components/spree/sellers/seller-address-card.tsx
+++ b/packages/dashboard/src/components/spree/sellers/seller-address-card.tsx
@@ -12,7 +12,7 @@ import {
CardTitle,
StatusBadge,
} from '@spree/dashboard-ui'
-import { PencilIcon } from 'lucide-react'
+import { PencilIcon } from '@spree/dashboard-ui/icons'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useUpdateSeller } from '../../../hooks/use-sellers'
diff --git a/packages/dashboard/src/components/spree/sellers/seller-at-a-glance-card.tsx b/packages/dashboard/src/components/spree/sellers/seller-at-a-glance-card.tsx
index 65a29beaf6..56927da2d1 100644
--- a/packages/dashboard/src/components/spree/sellers/seller-at-a-glance-card.tsx
+++ b/packages/dashboard/src/components/spree/sellers/seller-at-a-glance-card.tsx
@@ -1,6 +1,6 @@
import type { Seller } from '@spree/admin-sdk'
import { Card, CardContent, CardHeader, CardTitle, RelativeTime } from '@spree/dashboard-ui'
-import { PackageIcon, UsersIcon } from 'lucide-react'
+import { PackageIcon, UsersIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
import { ReadRow } from './seller-read-row'
diff --git a/packages/dashboard/src/components/spree/sellers/seller-brand-card.tsx b/packages/dashboard/src/components/spree/sellers/seller-brand-card.tsx
index 3c8c9e092d..7fa8631e12 100644
--- a/packages/dashboard/src/components/spree/sellers/seller-brand-card.tsx
+++ b/packages/dashboard/src/components/spree/sellers/seller-brand-card.tsx
@@ -1,6 +1,6 @@
import type { Seller } from '@spree/admin-sdk'
import { Button, Card, CardContent } from '@spree/dashboard-ui'
-import { PencilIcon, StoreIcon } from 'lucide-react'
+import { PencilIcon, StoreIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
/** Cover photo, logo and the seller's own description — the storefront face. */
diff --git a/packages/dashboard/src/components/spree/sellers/seller-contact-card.tsx b/packages/dashboard/src/components/spree/sellers/seller-contact-card.tsx
index b568bc7cb4..98fff6c4b7 100644
--- a/packages/dashboard/src/components/spree/sellers/seller-contact-card.tsx
+++ b/packages/dashboard/src/components/spree/sellers/seller-contact-card.tsx
@@ -1,6 +1,6 @@
import type { Seller } from '@spree/admin-sdk'
import { Button, Card, CardAction, CardContent, CardHeader, CardTitle } from '@spree/dashboard-ui'
-import { PencilIcon } from 'lucide-react'
+import { PencilIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
import { ReadRow } from './seller-read-row'
diff --git a/packages/dashboard/src/components/spree/sellers/seller-edit-settlement-sheet.tsx b/packages/dashboard/src/components/spree/sellers/seller-edit-settlement-sheet.tsx
index 85ddbbec9e..6a5e8ab16f 100644
--- a/packages/dashboard/src/components/spree/sellers/seller-edit-settlement-sheet.tsx
+++ b/packages/dashboard/src/components/spree/sellers/seller-edit-settlement-sheet.tsx
@@ -1,6 +1,11 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { Seller } from '@spree/admin-sdk'
-import { mapSpreeErrorsToForm, StoreDatePicker } from '@spree/dashboard-core'
+import {
+ currencyParts,
+ mapSpreeErrorsToForm,
+ StoreDatePicker,
+ useStore,
+} from '@spree/dashboard-core'
import {
Button,
Field,
@@ -8,7 +13,10 @@ import {
FieldError,
FieldGroup,
FieldLabel,
- Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ InputGroupText,
Select,
SelectContent,
SelectItem,
@@ -21,6 +29,7 @@ import {
SheetHeader,
SheetTitle,
} from '@spree/dashboard-ui'
+import i18n from 'i18next'
import { Controller, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { useOnSheetOpen } from '../../../hooks/use-on-sheet-open'
@@ -44,6 +53,8 @@ export function SellerEditSettlementSheet({
onOpenChange: (open: boolean) => void
}) {
const { t } = useTranslation()
+ const { defaultCurrency } = useStore()
+ const { symbol: currencySymbol } = currencyParts(defaultCurrency, i18n.language)
const updateMutation = useUpdateSeller(seller.id)
const form = useForm<SellerFormValues>({
@@ -183,12 +194,20 @@ export function SellerEditSettlementSheet({
<FieldLabel htmlFor="minimum_payout_amount">
{t('admin.fields.seller.minimum_payout_amount.label')}
</FieldLabel>
- <Input
- id="minimum_payout_amount"
- inputMode="decimal"
- aria-invalid={!!errors.minimum_payout_amount || undefined}
- {...form.register('minimum_payout_amount')}
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <InputGroupText>{currencySymbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
+ id="minimum_payout_amount"
+ type="number"
+ step="0.01"
+ min="0"
+ inputMode="decimal"
+ aria-invalid={!!errors.minimum_payout_amount || undefined}
+ {...form.register('minimum_payout_amount')}
+ />
+ </InputGroup>
<FieldDescription>
{t('admin.fields.seller.minimum_payout_amount.help')}
</FieldDescription>
diff --git a/packages/dashboard/src/components/spree/sellers/seller-onboarding-card.tsx b/packages/dashboard/src/components/spree/sellers/seller-onboarding-card.tsx
index 36f69ea91e..1fb36fef52 100644
--- a/packages/dashboard/src/components/spree/sellers/seller-onboarding-card.tsx
+++ b/packages/dashboard/src/components/spree/sellers/seller-onboarding-card.tsx
@@ -30,7 +30,7 @@ import {
EllipsisVerticalIcon,
FileTextIcon,
XCircleIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import {
diff --git a/packages/dashboard/src/components/spree/sellers/seller-settlement-card.tsx b/packages/dashboard/src/components/spree/sellers/seller-settlement-card.tsx
index 927d50a8a5..abeaf8a6dd 100644
--- a/packages/dashboard/src/components/spree/sellers/seller-settlement-card.tsx
+++ b/packages/dashboard/src/components/spree/sellers/seller-settlement-card.tsx
@@ -8,7 +8,7 @@ import {
CardTitle,
RelativeTime,
} from '@spree/dashboard-ui'
-import { PencilIcon } from 'lucide-react'
+import { PencilIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
import { ReadRow } from './seller-read-row'
diff --git a/packages/dashboard/src/components/spree/sellers/seller-team-card.tsx b/packages/dashboard/src/components/spree/sellers/seller-team-card.tsx
index 8ea2907139..a75d7f27d5 100644
--- a/packages/dashboard/src/components/spree/sellers/seller-team-card.tsx
+++ b/packages/dashboard/src/components/spree/sellers/seller-team-card.tsx
@@ -11,7 +11,7 @@ import {
RowActions,
useConfirm,
} from '@spree/dashboard-ui'
-import { UserPlusIcon } from 'lucide-react'
+import { UserPlusIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
import {
useRemoveSellerTeamMember,
diff --git a/packages/dashboard/src/components/spree/shipping/delivery-digital-methods-card.tsx b/packages/dashboard/src/components/spree/shipping/delivery-digital-methods-card.tsx
index 857af91b5a..7e613faa01 100644
--- a/packages/dashboard/src/components/spree/shipping/delivery-digital-methods-card.tsx
+++ b/packages/dashboard/src/components/spree/shipping/delivery-digital-methods-card.tsx
@@ -1,7 +1,7 @@
import type { DeliveryMethod } from '@spree/admin-sdk'
import { Can, Subject } from '@spree/dashboard-core'
import { Button, Card, CardContent, CardHeader, CardTitle } from '@spree/dashboard-ui'
-import { PlusIcon, ZapIcon } from 'lucide-react'
+import { PlusIcon, ZapIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
import { DeliveryMethodList } from './delivery-method-list'
import { useMethodSheetNavigation } from './use-method-sheet-navigation'
diff --git a/packages/dashboard/src/components/spree/shipping/delivery-method-form.tsx b/packages/dashboard/src/components/spree/shipping/delivery-method-form.tsx
index 6ca02efaf6..5df2bf8bbb 100644
--- a/packages/dashboard/src/components/spree/shipping/delivery-method-form.tsx
+++ b/packages/dashboard/src/components/spree/shipping/delivery-method-form.tsx
@@ -11,6 +11,7 @@ import type {
import {
type adminClient,
Can,
+ currencyParts,
PreferencesForm,
ResourceMultiAutocomplete,
Subject,
@@ -29,6 +30,10 @@ import {
FieldError,
FieldLabel,
Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ InputGroupText,
RadioGroup,
RadioGroupItem,
Select,
@@ -43,8 +48,9 @@ import {
SheetTitle,
Switch,
} from '@spree/dashboard-ui'
+import { PencilIcon, PlusIcon, Trash2Icon } from '@spree/dashboard-ui/icons'
import { useQueryClient } from '@tanstack/react-query'
-import { PencilIcon, PlusIcon, Trash2Icon } from 'lucide-react'
+import i18n from 'i18next'
import { useEffect, useMemo, useState } from 'react'
import { Controller, type UseFormReturn, useFieldArray } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
@@ -838,6 +844,8 @@ function ServiceOverridesSheet({
onClose: () => void
}) {
const { t } = useTranslation()
+ const { defaultCurrency } = useStore()
+ const { symbol: currencySymbol } = currencyParts(defaultCurrency, i18n.language)
return (
<Sheet open onOpenChange={(open) => !open && onClose()}>
@@ -862,27 +870,37 @@ function ServiceOverridesSheet({
<FieldLabel htmlFor={`service-markup-flat-${index}`}>
{t('admin.fields.delivery_method.markup_flat.label')}
</FieldLabel>
- <Input
- id={`service-markup-flat-${index}`}
- type="number"
- step="0.01"
- min="0"
- placeholder="0"
- {...form.register(`services.${index}.markup_flat`)}
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <InputGroupText>{currencySymbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
+ id={`service-markup-flat-${index}`}
+ type="number"
+ step="0.01"
+ min="0"
+ placeholder="0"
+ {...form.register(`services.${index}.markup_flat`)}
+ />
+ </InputGroup>
</Field>
<Field>
<FieldLabel htmlFor={`service-markup-percent-${index}`}>
{t('admin.fields.delivery_method.markup_percent.label')}
</FieldLabel>
- <Input
- id={`service-markup-percent-${index}`}
- type="number"
- step="0.01"
- min="0"
- placeholder="0"
- {...form.register(`services.${index}.markup_percent`)}
- />
+ <InputGroup>
+ <InputGroupInput
+ id={`service-markup-percent-${index}`}
+ type="number"
+ step="0.01"
+ min="0"
+ placeholder="0"
+ {...form.register(`services.${index}.markup_percent`)}
+ />
+ <InputGroupAddon align="inline-end">
+ <InputGroupText>%</InputGroupText>
+ </InputGroupAddon>
+ </InputGroup>
</Field>
</div>
<SheetFooter>
@@ -948,8 +966,11 @@ function CurrencyAmountsField({
</FieldLabel>
<div className="flex flex-col gap-2">
{codes.map((code) => (
- <div key={code} className="flex items-center gap-2">
- <Input
+ <InputGroup key={code}>
+ <InputGroupAddon>
+ <InputGroupText>{currencyParts(code, i18n.language).symbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
id={`calculator-amount-${code}`}
type="number"
step="any"
@@ -960,8 +981,10 @@ function CurrencyAmountsField({
value={amountFor(code)}
onChange={(event) => setAmount(code, event.target.value)}
/>
- <span className="w-12 shrink-0 text-muted-foreground text-xs">{code}</span>
- </div>
+ <InputGroupAddon align="inline-end">
+ <InputGroupText>{code}</InputGroupText>
+ </InputGroupAddon>
+ </InputGroup>
))}
</div>
{multiCurrency && (
@@ -975,6 +998,8 @@ function CurrencyAmountsField({
function PricingCard({ form }: { form: UseFormReturn<DeliveryMethodFormValues> }) {
const { t } = useTranslation()
+ const { defaultCurrency } = useStore()
+ const { symbol: currencySymbol } = currencyParts(defaultCurrency, i18n.language)
const { data: calculators } = useDeliveryCalculators()
const { data: taxCategories } = useTaxCategories()
const selectedRateProvider = useSelectedRateProvider(form)
@@ -1063,27 +1088,37 @@ function PricingCard({ form }: { form: UseFormReturn<DeliveryMethodFormValues> }
<FieldLabel htmlFor="markup_percent">
{t('admin.fields.delivery_method.markup_percent.label')}
</FieldLabel>
- <Input
- id="markup_percent"
- type="number"
- step="0.01"
- min="0"
- placeholder="0"
- {...form.register('markup_percent')}
- />
+ <InputGroup>
+ <InputGroupInput
+ id="markup_percent"
+ type="number"
+ step="0.01"
+ min="0"
+ placeholder="0"
+ {...form.register('markup_percent')}
+ />
+ <InputGroupAddon align="inline-end">
+ <InputGroupText>%</InputGroupText>
+ </InputGroupAddon>
+ </InputGroup>
</Field>
<Field>
<FieldLabel htmlFor="markup_flat">
{t('admin.fields.delivery_method.markup_flat.label')}
</FieldLabel>
- <Input
- id="markup_flat"
- type="number"
- step="0.01"
- min="0"
- placeholder="0"
- {...form.register('markup_flat')}
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <InputGroupText>{currencySymbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
+ id="markup_flat"
+ type="number"
+ step="0.01"
+ min="0"
+ placeholder="0"
+ {...form.register('markup_flat')}
+ />
+ </InputGroup>
</Field>
</div>
<span className="text-xs text-muted-foreground">
diff --git a/packages/dashboard/src/components/spree/shipping/delivery-method-list.tsx b/packages/dashboard/src/components/spree/shipping/delivery-method-list.tsx
index 22f88cff60..4c30be3ddf 100644
--- a/packages/dashboard/src/components/spree/shipping/delivery-method-list.tsx
+++ b/packages/dashboard/src/components/spree/shipping/delivery-method-list.tsx
@@ -8,7 +8,7 @@ import {
TooltipTrigger,
useConfirm,
} from '@spree/dashboard-ui'
-import { TruckIcon } from 'lucide-react'
+import { TruckIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
import {
useDeleteDeliveryMethod,
diff --git a/packages/dashboard/src/components/spree/shipping/delivery-origin-group-section.tsx b/packages/dashboard/src/components/spree/shipping/delivery-origin-group-section.tsx
index 45597f40bc..10727f8c67 100644
--- a/packages/dashboard/src/components/spree/shipping/delivery-origin-group-section.tsx
+++ b/packages/dashboard/src/components/spree/shipping/delivery-origin-group-section.tsx
@@ -6,7 +6,7 @@ import type {
} from '@spree/admin-sdk'
import { Can, Subject, usePermissions, useStockLocations } from '@spree/dashboard-core'
import { Button, RowActions, useConfirm } from '@spree/dashboard-ui'
-import { PlusIcon, WarehouseIcon } from 'lucide-react'
+import { PlusIcon, WarehouseIcon } from '@spree/dashboard-ui/icons'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useDeleteDeliveryOriginGroup } from '../../../hooks/use-delivery-origin-groups'
diff --git a/packages/dashboard/src/components/spree/shipping/delivery-pickup-card.tsx b/packages/dashboard/src/components/spree/shipping/delivery-pickup-card.tsx
index 9ef1bffd81..f651e83bbe 100644
--- a/packages/dashboard/src/components/spree/shipping/delivery-pickup-card.tsx
+++ b/packages/dashboard/src/components/spree/shipping/delivery-pickup-card.tsx
@@ -1,7 +1,7 @@
import type { DeliveryMethod } from '@spree/admin-sdk'
import { Can, Subject, useStockLocations, useUpdateStockLocationById } from '@spree/dashboard-core'
import { Button, Card, CardContent, CardHeader, CardTitle, Checkbox } from '@spree/dashboard-ui'
-import { PlusIcon, StoreIcon } from 'lucide-react'
+import { PlusIcon, StoreIcon } from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
import { DeliveryMethodList } from './delivery-method-list'
import { useMethodSheetNavigation } from './use-method-sheet-navigation'
diff --git a/packages/dashboard/src/components/spree/shipping/delivery-zone-card.tsx b/packages/dashboard/src/components/spree/shipping/delivery-zone-card.tsx
index c5ed91e9c1..6a8882e3ba 100644
--- a/packages/dashboard/src/components/spree/shipping/delivery-zone-card.tsx
+++ b/packages/dashboard/src/components/spree/shipping/delivery-zone-card.tsx
@@ -12,7 +12,7 @@ import {
TooltipTrigger,
useConfirm,
} from '@spree/dashboard-ui'
-import { GlobeIcon, MapIcon, PlusIcon } from 'lucide-react'
+import { GlobeIcon, MapIcon, PlusIcon } from '@spree/dashboard-ui/icons'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { useDeleteDeliveryZone } from '../../../hooks/use-delivery-zones'
diff --git a/packages/dashboard/src/components/spree/shipping/delivery-zone-region-picker.tsx b/packages/dashboard/src/components/spree/shipping/delivery-zone-region-picker.tsx
index c5fda67313..58207f86bc 100644
--- a/packages/dashboard/src/components/spree/shipping/delivery-zone-region-picker.tsx
+++ b/packages/dashboard/src/components/spree/shipping/delivery-zone-region-picker.tsx
@@ -10,8 +10,14 @@ import {
SelectTrigger,
SelectValue,
} from '@spree/dashboard-ui'
+import {
+ ChevronDownIcon,
+ ChevronRightIcon,
+ PlusIcon,
+ SearchIcon,
+ Trash2Icon,
+} from '@spree/dashboard-ui/icons'
import { Link } from '@tanstack/react-router'
-import { ChevronDownIcon, ChevronRightIcon, PlusIcon, SearchIcon, Trash2Icon } from 'lucide-react'
import { useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useCountryNames, useCountryStates, useMarketCountries } from '../../../hooks/use-geography'
diff --git a/packages/dashboard/src/components/spree/shipping/delivery-zones-and-methods-section.tsx b/packages/dashboard/src/components/spree/shipping/delivery-zones-and-methods-section.tsx
index 9842c8b52b..0ba4a487f0 100644
--- a/packages/dashboard/src/components/spree/shipping/delivery-zones-and-methods-section.tsx
+++ b/packages/dashboard/src/components/spree/shipping/delivery-zones-and-methods-section.tsx
@@ -1,7 +1,7 @@
import type { DeliveryMethod, DeliveryProfile, DeliveryZone } from '@spree/admin-sdk'
import { Can, Subject } from '@spree/dashboard-core'
import { Button } from '@spree/dashboard-ui'
-import { PlusIcon, SplitIcon } from 'lucide-react'
+import { PlusIcon, SplitIcon } from '@spree/dashboard-ui/icons'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useAllDeliveryMethods } from '../../../hooks/use-delivery-methods'
diff --git a/packages/dashboard/src/components/spree/stock-levels-panel.tsx b/packages/dashboard/src/components/spree/stock-levels-panel.tsx
index fb0b0515f3..9d75dfd568 100644
--- a/packages/dashboard/src/components/spree/stock-levels-panel.tsx
+++ b/packages/dashboard/src/components/spree/stock-levels-panel.tsx
@@ -13,8 +13,8 @@ import {
TableHeader,
TableRow,
} from '@spree/dashboard-ui'
+import { ChevronDownIcon, ChevronRightIcon } from '@spree/dashboard-ui/icons'
import { Link, useParams } from '@tanstack/react-router'
-import { ChevronDownIcon, ChevronRightIcon } from 'lucide-react'
import { useEffect, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useStockLevels, useUpdateStockLevel } from '../../hooks/use-stock-levels'
diff --git a/packages/dashboard/src/components/spree/storefront-connect-sheet.tsx b/packages/dashboard/src/components/spree/storefront-connect-sheet.tsx
index d61276bdde..ba483765c2 100644
--- a/packages/dashboard/src/components/spree/storefront-connect-sheet.tsx
+++ b/packages/dashboard/src/components/spree/storefront-connect-sheet.tsx
@@ -12,7 +12,7 @@ import {
Skeleton,
toastManager,
} from '@spree/dashboard-ui'
-import { ExternalLinkIcon, EyeIcon, EyeOffIcon } from 'lucide-react'
+import { ExternalLinkIcon, EyeIcon, EyeOffIcon } from '@spree/dashboard-ui/icons'
import { type ReactNode, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useStorefrontPublishableKey } from '../../hooks/use-api-keys'
diff --git a/packages/dashboard/src/components/spree/tax-exemption-certificates-card.tsx b/packages/dashboard/src/components/spree/tax-exemption-certificates-card.tsx
index 9e5d2141f4..7e55cfea4f 100644
--- a/packages/dashboard/src/components/spree/tax-exemption-certificates-card.tsx
+++ b/packages/dashboard/src/components/spree/tax-exemption-certificates-card.tsx
@@ -45,8 +45,6 @@ import {
StatusBadge,
useConfirm,
} from '@spree/dashboard-ui'
-import { parseISO } from 'date-fns'
-import { formatInTimeZone } from 'date-fns-tz'
import {
BadgeCheckIcon,
BanIcon,
@@ -55,7 +53,9 @@ import {
PaperclipIcon,
PlusIcon,
TrashIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
+import { parseISO } from 'date-fns'
+import { formatInTimeZone } from 'date-fns-tz'
import { useEffect, useState } from 'react'
import { Controller, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/components/spree/tax-provider-field.tsx b/packages/dashboard/src/components/spree/tax-provider-field.tsx
index 67eadef458..a9c291cc43 100644
--- a/packages/dashboard/src/components/spree/tax-provider-field.tsx
+++ b/packages/dashboard/src/components/spree/tax-provider-field.tsx
@@ -11,7 +11,7 @@ import {
SelectTrigger,
SelectValue,
} from '@spree/dashboard-ui'
-import { TriangleAlertIcon } from 'lucide-react'
+import { TriangleAlertIcon } from '@spree/dashboard-ui/icons'
import { Controller, type UseFormReturn } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { useTaxProviders } from '../../hooks/use-tax-rates'
diff --git a/packages/dashboard/src/components/spree/translations/resource-translations-card.tsx b/packages/dashboard/src/components/spree/translations/resource-translations-card.tsx
index 01c91fa651..92fc602ab0 100644
--- a/packages/dashboard/src/components/spree/translations/resource-translations-card.tsx
+++ b/packages/dashboard/src/components/spree/translations/resource-translations-card.tsx
@@ -1,5 +1,5 @@
import { Button, Card, CardContent, CardHeader, CardTitle } from '@spree/dashboard-ui'
-import { LanguagesIcon } from 'lucide-react'
+import { LanguagesIcon } from '@spree/dashboard-ui/icons'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import {
diff --git a/packages/dashboard/src/components/spree/translations/resource-translations-dialog.tsx b/packages/dashboard/src/components/spree/translations/resource-translations-dialog.tsx
index 180e91d13f..eddb36fda9 100644
--- a/packages/dashboard/src/components/spree/translations/resource-translations-dialog.tsx
+++ b/packages/dashboard/src/components/spree/translations/resource-translations-dialog.tsx
@@ -25,7 +25,7 @@ import {
toastManager,
useConfirm,
} from '@spree/dashboard-ui'
-import { XIcon } from 'lucide-react'
+import { XIcon } from '@spree/dashboard-ui/icons'
import { useCallback, useEffect, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import {
diff --git a/packages/dashboard/src/nav/default.ts b/packages/dashboard/src/nav/default.ts
index f3b9a549cf..e124199607 100644
--- a/packages/dashboard/src/nav/default.ts
+++ b/packages/dashboard/src/nav/default.ts
@@ -3,7 +3,7 @@ import type { Store } from '@spree/admin-sdk'
// re-renders on language change — see app-sidebar.tsx for resolution.
import { hasVisibleSettingsEntries, nav, Subject } from '@spree/dashboard-core'
import {
- BarChart3Icon,
+ AnalyticsIcon,
HomeIcon,
InboxIcon,
MapIcon,
@@ -12,7 +12,7 @@ import {
StoreIcon,
TagIcon,
UsersIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
import { GettingStartedNavBadge } from '../components/spree/getting-started-nav-badge'
import {
ClaimsNavBadge,
@@ -208,7 +208,7 @@ nav.add({
key: 'reports',
labelKey: 'admin.nav.reports',
path: '/reports',
- icon: BarChart3Icon,
+ icon: AnalyticsIcon,
position: 600,
})
diff --git a/packages/dashboard/src/nav/settings.ts b/packages/dashboard/src/nav/settings.ts
index 3ce7faf2ae..3017210852 100644
--- a/packages/dashboard/src/nav/settings.ts
+++ b/packages/dashboard/src/nav/settings.ts
@@ -11,7 +11,7 @@ import {
PlugIcon,
RadioTowerIcon,
ReceiptTextIcon,
- RotateCcwIcon,
+ ReturnRequestIcon,
ScrollTextIcon,
ShapesIcon,
ShieldCheckIcon,
@@ -19,10 +19,10 @@ import {
TagIcon,
TruckIcon,
UploadIcon,
- UsersRoundIcon,
+ UsersIcon,
WarehouseIcon,
WebhookIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
// Built-in entries use `labelKey` so labels re-render on language change —
// see settings-sidebar.tsx for resolution. Plugins can still pass `label`
@@ -229,7 +229,7 @@ settingsNav.add({
descriptionKey: 'admin.settings_nav.descriptions.reasons',
keywords: ['returns', 'refunds', 'claims', 'rma', 'reason'],
path: '/reasons',
- icon: RotateCcwIcon,
+ icon: ReturnRequestIcon,
group: 'post_sale',
position: 100,
subject: Subject.ReturnReason,
@@ -267,7 +267,7 @@ settingsNav.add({
descriptionKey: 'admin.settings_nav.descriptions.staff',
keywords: ['users', 'team', 'invite', 'admins'],
path: '/staff',
- icon: UsersRoundIcon,
+ icon: UsersIcon,
group: 'team',
position: 100,
subject: Subject.AdminUser,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/companies/$companyId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/companies/$companyId.tsx
index bb8d612eb7..70855db9ab 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/companies/$companyId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/companies/$companyId.tsx
@@ -46,8 +46,8 @@ import {
Switch,
useConfirm,
} from '@spree/dashboard-ui'
+import { EllipsisVerticalIcon, PlusIcon, TrashIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
-import { EllipsisVerticalIcon, PlusIcon, TrashIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
import { Controller, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/companies/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/companies/index.tsx
index ac5ab24ba9..b365a13ef2 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/companies/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/companies/index.tsx
@@ -26,8 +26,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/customers/groups.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/customers/groups.tsx
index 6d4bdc281f..5246481e61 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/customers/groups.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/customers/groups.tsx
@@ -26,8 +26,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon, UsersIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
-import { PlusIcon, UsersIcon } from 'lucide-react'
import { useEffect } from 'react'
import { type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/customers/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/customers/index.tsx
index 9928de657a..34ab6dbcd2 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/customers/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/customers/index.tsx
@@ -33,9 +33,9 @@ import {
SheetTitle,
useConfirm,
} from '@spree/dashboard-ui'
+import { PlusIcon, TagsIcon, UserMinusIcon, UserPlusIcon } from '@spree/dashboard-ui/icons'
import { useMutation } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon, TagsIcon, UserMinusIcon, UserPlusIcon } from 'lucide-react'
import { useState } from 'react'
import { Controller, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/getting-started.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/getting-started.tsx
index c5c3c166e4..e74ad3e170 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/getting-started.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/getting-started.tsx
@@ -11,8 +11,8 @@ import {
ProgressValue,
Skeleton,
} from '@spree/dashboard-ui'
+import { CheckCircle2Icon, CircleIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, Link } from '@tanstack/react-router'
-import { CheckCircle2Icon, CircleIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import '../../../components/spree/setup-tasks/register'
import { setupTaskSlot } from '../../../components/spree/setup-tasks/types'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/index.tsx
index 7e35b447d8..07df55991c 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/index.tsx
@@ -21,10 +21,10 @@ import {
TableRow,
Thumbnail,
} from '@spree/dashboard-ui'
+import { PackageIcon } from '@spree/dashboard-ui/icons'
import { useQuery } from '@tanstack/react-query'
import { createFileRoute, Link } from '@tanstack/react-router'
import { subDays } from 'date-fns'
-import { PackageIcon } from 'lucide-react'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { Bar, BarChart, CartesianGrid, XAxis } from 'recharts'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId/edit.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId/edit.tsx
index 6ea5622719..a1f65f957a 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId/edit.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId/edit.tsx
@@ -17,8 +17,8 @@ import {
toastManager,
useFormSubmitShortcut,
} from '@spree/dashboard-ui'
+import { InfoIcon, PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { InfoIcon, PlusIcon } from 'lucide-react'
import { type ReactNode, useEffect, useState } from 'react'
import { useFieldArray, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/orders/drafts.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/orders/drafts.tsx
index 3f588f59ae..1805c96a2a 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/orders/drafts.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/orders/drafts.tsx
@@ -1,7 +1,7 @@
import { adminClient, ResourceTable, resourceSearchSchema } from '@spree/dashboard-core'
import { Button } from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, Link } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import '../../../../tables/orders'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/orders/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/orders/index.tsx
index 15b34e7b38..c0540ae5f3 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/orders/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/orders/index.tsx
@@ -5,8 +5,8 @@ import {
resourceSearchSchema,
} from '@spree/dashboard-core'
import { Button } from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, Link } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import '../../../../tables/orders'
export const Route = createFileRoute('/_authenticated/$storeId/orders/')({
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/orders/new.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/orders/new.tsx
index 7e40e668dd..691b8e2dc1 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/orders/new.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/orders/new.tsx
@@ -32,9 +32,9 @@ import {
TableRow,
Textarea,
} from '@spree/dashboard-ui'
+import { FileTextIcon, TrashIcon } from '@spree/dashboard-ui/icons'
import { useMutation } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { FileTextIcon, TrashIcon } from 'lucide-react'
import { useRef, useState } from 'react'
import { useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/catalogs/$catalogId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/catalogs/$catalogId.tsx
index 9f10e8ad87..118acb107d 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/catalogs/$catalogId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/catalogs/$catalogId.tsx
@@ -40,8 +40,8 @@ import {
SelectValue,
Textarea,
} from '@spree/dashboard-ui'
+import { PlusIcon, TrashIcon, Undo2Icon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon, TrashIcon, Undo2Icon } from 'lucide-react'
import { useEffect, useMemo, useState } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/catalogs/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/catalogs/index.tsx
index f19196e5f7..512a5dee21 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/catalogs/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/catalogs/index.tsx
@@ -26,8 +26,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/categories/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/categories/index.tsx
index 5f3b1f2e5b..ea9fcb10b6 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/categories/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/categories/index.tsx
@@ -9,8 +9,8 @@ import {
InputGroupAddon,
InputGroupInput,
} from '@spree/dashboard-ui'
+import { PlusIcon, SearchIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon, SearchIcon } from 'lucide-react'
import { useDeferredValue, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { CategoryList } from '../../../../../components/spree/categories/category-list'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/collections/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/collections/index.tsx
index b29bef5e78..230f28beb6 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/collections/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/collections/index.tsx
@@ -8,8 +8,8 @@ import {
usePermissions,
} from '@spree/dashboard-core'
import { Button, RowActions, useConfirm, useRowClickBridge } from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { useDeleteCollection, useRepositionCollection } from '../../../../../hooks/use-collections'
import '../../../../../tables/collections'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/index.tsx
index fbfb7730ab..c07fef36bf 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/index.tsx
@@ -25,7 +25,6 @@ import {
SelectValue,
useConfirm,
} from '@spree/dashboard-ui'
-import { createFileRoute, useNavigate } from '@tanstack/react-router'
import {
FolderMinusIcon,
FolderPlusIcon,
@@ -35,7 +34,8 @@ import {
TagIcon,
TagsIcon,
Trash2Icon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
+import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { useCallback, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/media.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/media.tsx
index b8fd35b2f8..35e83686d5 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/media.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/media.tsx
@@ -36,7 +36,6 @@ import {
toastManager,
useConfirm,
} from '@spree/dashboard-ui'
-import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
import {
DownloadIcon,
FilmIcon,
@@ -46,7 +45,8 @@ import {
PlayIcon,
TrashIcon,
UploadIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
+import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
import { useDeferredValue, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { z } from 'zod'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/options.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/options.tsx
index 500f4c3fab..29e33c5138 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/options.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/options.tsx
@@ -64,8 +64,6 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
-import { useQueryClient } from '@tanstack/react-query'
-import { createFileRoute, useNavigate } from '@tanstack/react-router'
import {
ImageIcon,
LanguagesIcon,
@@ -73,7 +71,9 @@ import {
Trash2Icon,
UploadCloudIcon,
XIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
+import { useQueryClient } from '@tanstack/react-query'
+import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { type CSSProperties, useEffect, useId, useRef, useState } from 'react'
import {
type Control,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/index.tsx
index a248946bb6..17aacc0f6a 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/index.tsx
@@ -8,8 +8,8 @@ import {
usePermissions,
} from '@spree/dashboard-core'
import { Button, RowActions, useConfirm, useRowClickBridge } from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { useDeletePriceList } from '../../../../../hooks/use-price-lists'
import '../../../../../tables/price-lists'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers.tsx
index 1e0626dca6..69dbed07d6 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers.tsx
@@ -43,8 +43,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { ArrowLeftRightIcon, EyeIcon, PlusIcon, TrashIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { ArrowLeftRightIcon, EyeIcon, PlusIcon, TrashIcon } from 'lucide-react'
import { useMemo, useRef, useState } from 'react'
import { Trans, useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/promotions/gift-cards.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/promotions/gift-cards.tsx
index f3ebbf4eec..ec6f043003 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/promotions/gift-cards.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/promotions/gift-cards.tsx
@@ -3,6 +3,7 @@ import type { Customer, GiftCard } from '@spree/admin-sdk'
import {
Can,
CurrencySelect,
+ currencyParts,
mapSpreeErrorsToForm,
ResourceCombobox,
ResourceTable,
@@ -19,6 +20,10 @@ import {
FieldGroup,
FieldLabel,
Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ InputGroupText,
RowActions,
Sheet,
SheetContent,
@@ -29,8 +34,9 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
+import i18n from 'i18next'
import { useEffect, useRef } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
@@ -421,19 +427,28 @@ function AmountCurrencyRow<T extends GiftCardCreateFormValues | GiftCardEditForm
}) {
const { t } = useTranslation()
const errors = form.formState.errors as Record<string, { message?: string } | undefined>
+ const { symbol: currencySymbol } = currencyParts(
+ (form.watch('currency' as never) as unknown as string) || 'USD',
+ i18n.language,
+ )
return (
<div className="grid grid-cols-2 gap-3">
<Field>
<FieldLabel htmlFor="amount">{t('admin.fields.gift_card.amount.label')}</FieldLabel>
- <Input
- id="amount"
- type="number"
- step="0.01"
- min={0}
- disabled={readOnly}
- aria-invalid={!!errors.amount || undefined}
- {...form.register('amount' as never)}
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <InputGroupText>{currencySymbol}</InputGroupText>
+ </InputGroupAddon>
+ <InputGroupInput
+ id="amount"
+ type="number"
+ step="0.01"
+ min={0}
+ disabled={readOnly}
+ aria-invalid={!!errors.amount || undefined}
+ {...form.register('amount' as never)}
+ />
+ </InputGroup>
<FieldError errors={[errors.amount]} />
</Field>
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/promotions/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/promotions/index.tsx
index 4a02179b9d..596eccd803 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/promotions/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/promotions/index.tsx
@@ -8,8 +8,8 @@ import {
usePermissions,
} from '@spree/dashboard-core'
import { Button, RowActions, useConfirm, useRowClickBridge } from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { useDeletePromotion } from '../../../../hooks/use-promotions'
import '../../../../tables/promotions'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/sellers/$sellerId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/sellers/$sellerId.tsx
index debe23ae93..7a4dce8531 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/sellers/$sellerId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/sellers/$sellerId.tsx
@@ -9,8 +9,8 @@ import {
StatusBadge,
useConfirm,
} from '@spree/dashboard-ui'
+import { BanIcon, MailIcon, PauseIcon, UndoIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { BanIcon, MailIcon, PauseIcon, UndoIcon } from 'lucide-react'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { ResourceDetailSkeleton } from '../../../../components/spree/route-pending'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/sellers/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/sellers/index.tsx
index c707ea82af..92bbd42400 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/sellers/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/sellers/index.tsx
@@ -26,8 +26,8 @@ import {
SheetTitle,
useConfirm,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/allowed-origins.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/allowed-origins.tsx
index 39343f1238..2930c97986 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/allowed-origins.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/allowed-origins.tsx
@@ -28,8 +28,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/api-keys.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/api-keys.tsx
index 2efb603ac7..76137b7c17 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/api-keys.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/api-keys.tsx
@@ -1,8 +1,8 @@
import type { ApiKey } from '@spree/admin-sdk'
import { PageHeader } from '@spree/dashboard-core'
import { Button } from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { CreateApiKeyDialog } from '../../../../components/spree/api-keys/api-key-create-sheet'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/channels.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/channels.tsx
index ab41b68774..6688a239dd 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/channels.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/channels.tsx
@@ -35,8 +35,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/commission-rates.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/commission-rates.tsx
index 25abc160f8..0074df28d1 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/commission-rates.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/commission-rates.tsx
@@ -47,9 +47,9 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon, Trash2Icon } from '@spree/dashboard-ui/icons'
import { useQueryClient } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon, Trash2Icon } from 'lucide-react'
import { useEffect } from 'react'
import { Controller, type UseFormReturn, useFieldArray, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
@@ -423,14 +423,19 @@ function CommissionRateFormFields({ form }: { form: UseFormReturn<CommissionRate
<FieldLabel htmlFor="commission_tax_rate">
{t('admin.fields.commission_rate.commission_tax_rate.label')}
</FieldLabel>
- <Input
- id="commission_tax_rate"
- type="number"
- step="0.01"
- min="0"
- placeholder={t('admin.fields.commission_rate.commission_tax_rate.placeholder')}
- {...form.register('commission_tax_rate')}
- />
+ <InputGroup>
+ <InputGroupInput
+ id="commission_tax_rate"
+ type="number"
+ step="0.01"
+ min="0"
+ placeholder={t('admin.fields.commission_rate.commission_tax_rate.placeholder')}
+ {...form.register('commission_tax_rate')}
+ />
+ <InputGroupAddon align="inline-end">
+ <InputGroupText>%</InputGroupText>
+ </InputGroupAddon>
+ </InputGroup>
<span className="text-xs text-muted-foreground">
{t('admin.fields.commission_rate.commission_tax_rate.help')}
</span>
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/custom-field-definitions.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/custom-field-definitions.tsx
index 148fe3954f..f216c8e707 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/custom-field-definitions.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/custom-field-definitions.tsx
@@ -25,8 +25,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useEffect } from 'react'
import { useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-profiles/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-profiles/index.tsx
index 43a969b3d0..04ccef151b 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-profiles/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-profiles/index.tsx
@@ -36,8 +36,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { Controller, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/imports/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/imports/index.tsx
index 009f2ccf69..de0d9d0d01 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/imports/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/imports/index.tsx
@@ -6,8 +6,8 @@ import {
useDownloadImportOriginal,
} from '@spree/dashboard-core'
import { RowActions, useConfirm, useRowClickBridge } from '@spree/dashboard-ui'
+import { DownloadIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { DownloadIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { ImportWizardDialog } from '../../../../../components/spree/imports/import-wizard-dialog'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/index.tsx
index dc06feece2..c685051615 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/index.tsx
@@ -9,8 +9,8 @@ import {
useSettingsNav,
} from '@spree/dashboard-core'
import { Card, SearchInput } from '@spree/dashboard-ui'
+import { PackageIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, Link } from '@tanstack/react-router'
-import { PackageIcon } from 'lucide-react'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/integrations.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/integrations.tsx
index c0079f0fc9..bdf3fd6997 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/integrations.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/integrations.tsx
@@ -14,8 +14,8 @@ import {
EmptyMedia,
EmptyTitle,
} from '@spree/dashboard-ui'
+import { PlugIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlugIcon } from 'lucide-react'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/markets.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/markets.tsx
index e0d106bcce..ba1b84c5ea 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/markets.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/markets.tsx
@@ -32,9 +32,9 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { useQueryClient } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useEffect, useMemo } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/payment-methods.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/payment-methods.tsx
index 2e16581125..ea1ca3eda7 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/payment-methods.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/payment-methods.tsx
@@ -23,9 +23,9 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { useQueryClient } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useEffect, useMemo, useRef, useState } from 'react'
import { useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/policies.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/policies.tsx
index ba9dfd6d13..204e0bb91a 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/policies.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/policies.tsx
@@ -26,8 +26,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useEffect } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/product-types.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/product-types.tsx
index 9b46af4d72..597f6816f5 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/product-types.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/product-types.tsx
@@ -52,8 +52,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon, XIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon, XIcon } from 'lucide-react'
import { type CSSProperties, useEffect, useMemo } from 'react'
import { Controller, type UseFormReturn, useFieldArray, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/reasons.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/reasons.tsx
index a72596dfdb..35d468bbee 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/reasons.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/reasons.tsx
@@ -40,8 +40,8 @@ import {
TableRow,
useConfirm,
} from '@spree/dashboard-ui'
+import { PlusIcon, RotateCcwIcon, TriangleAlertIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute } from '@tanstack/react-router'
-import { PlusIcon, RotateCcwIcon, TriangleAlertIcon } from 'lucide-react'
import { useState } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/roles.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/roles.tsx
index 33c99ca7dd..2eb18f9ddb 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/roles.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/roles.tsx
@@ -21,8 +21,8 @@ import {
toastManager,
useConfirm,
} from '@spree/dashboard-ui'
+import { CopyIcon, LockIcon, PlusIcon, ShieldIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { CopyIcon, LockIcon, PlusIcon, ShieldIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { permissionKeyLabel } from '../../../../components/spree/permission-picker'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/seller-requirements.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/seller-requirements.tsx
index e8de2a8618..4b7d5a0472 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/seller-requirements.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/seller-requirements.tsx
@@ -33,9 +33,9 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { useQueryClient } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { z } from 'zod'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/staff.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/staff.tsx
index 8a16087a97..e12aea187d 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/staff.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/staff.tsx
@@ -53,8 +53,6 @@ import {
useConfirm,
useCopyToClipboard,
} from '@spree/dashboard-ui'
-import { createFileRoute, Link } from '@tanstack/react-router'
-import i18n from 'i18next'
import {
BanIcon,
ClockIcon,
@@ -63,7 +61,9 @@ import {
PlusIcon,
UserMinusIcon,
UsersRoundIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
+import { createFileRoute, Link } from '@tanstack/react-router'
+import i18n from 'i18next'
import { useState } from 'react'
import { Controller, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx
index 39b67705cd..247c24a4b1 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx
@@ -36,8 +36,8 @@ import {
toastManager,
useFormSubmitShortcut,
} from '@spree/dashboard-ui'
+import { ExternalLinkIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute } from '@tanstack/react-router'
-import { ExternalLinkIcon } from 'lucide-react'
import { type ReactNode, useCallback, useEffect, useMemo } from 'react'
import {
type Control,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-categories.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-categories.tsx
index 8dd14a652c..e7ea858f0a 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-categories.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-categories.tsx
@@ -28,8 +28,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useEffect } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-rates.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-rates.tsx
index 9ad44f9ecc..3dac6c32fc 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-rates.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-rates.tsx
@@ -20,6 +20,10 @@ import {
FieldGroup,
FieldLabel,
Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ InputGroupText,
RowActions,
Select,
SelectContent,
@@ -36,8 +40,8 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useEffect } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
@@ -318,16 +322,21 @@ function TaxRateFormFields({ form }: { form: UseFormReturn<TaxRateFormValues> })
<FieldLabel htmlFor="amount_percentage">
{t('admin.fields.tax_rate.amount.label')}
</FieldLabel>
- <Input
- id="amount_percentage"
- type="number"
- step="0.01"
- min="0"
- max="100"
- inputMode="decimal"
- aria-invalid={!!errors.amount_percentage || undefined}
- {...form.register('amount_percentage')}
- />
+ <InputGroup>
+ <InputGroupInput
+ id="amount_percentage"
+ type="number"
+ step="0.01"
+ min="0"
+ max="100"
+ inputMode="decimal"
+ aria-invalid={!!errors.amount_percentage || undefined}
+ {...form.register('amount_percentage')}
+ />
+ <InputGroupAddon align="inline-end">
+ <InputGroupText>%</InputGroupText>
+ </InputGroupAddon>
+ </InputGroup>
<FieldDescription>{t('admin.fields.tax_rate.amount.help')}</FieldDescription>
<FieldError errors={[errors.amount_percentage]} />
</Field>
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/webhooks/$webhookEndpointId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/webhooks/$webhookEndpointId.tsx
index 812558b8bd..5fd86165ca 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/webhooks/$webhookEndpointId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/webhooks/$webhookEndpointId.tsx
@@ -37,8 +37,8 @@ import {
useFormSubmitShortcut,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { AlertTriangleIcon, PencilIcon, PlayIcon, RotateCcwIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { AlertTriangleIcon, PencilIcon, PlayIcon, RotateCcwIcon } from 'lucide-react'
import { lazy, Suspense } from 'react'
import { type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/webhooks/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/webhooks/index.tsx
index 8016ab4604..089897d387 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/webhooks/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/webhooks/index.tsx
@@ -29,8 +29,15 @@ import {
useCopyToClipboard,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import {
+ AlertTriangleIcon,
+ BanIcon,
+ CheckIcon,
+ CopyIcon,
+ PlayIcon,
+ PlusIcon,
+} from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { AlertTriangleIcon, BanIcon, CheckIcon, CopyIcon, PlayIcon, PlusIcon } from 'lucide-react'
import { useState } from 'react'
import { useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/dashboard/src/search/create-actions.ts b/packages/dashboard/src/search/create-actions.ts
index 9318b2931a..84e8f000c3 100644
--- a/packages/dashboard/src/search/create-actions.ts
+++ b/packages/dashboard/src/search/create-actions.ts
@@ -14,7 +14,7 @@ import {
TicketPercentIcon,
UserIcon,
UsersRoundIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
// Each entry teaches the command palette that one resource can be created, so
// "add product" or "new customer" jumps straight to the right page. Destinations
diff --git a/packages/dashboard/src/search/default.tsx b/packages/dashboard/src/search/default.tsx
index ca94a09777..cc3027bf28 100644
--- a/packages/dashboard/src/search/default.tsx
+++ b/packages/dashboard/src/search/default.tsx
@@ -20,7 +20,7 @@ import {
TicketPercentIcon,
UserIcon,
UsersRoundIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
import { useTranslation } from 'react-i18next'
// Each entry teaches the command palette how to search one resource: how to
diff --git a/packages/dashboard/src/tables/allowed-origins.tsx b/packages/dashboard/src/tables/allowed-origins.tsx
index f3b1ec4736..6e14d512fc 100644
--- a/packages/dashboard/src/tables/allowed-origins.tsx
+++ b/packages/dashboard/src/tables/allowed-origins.tsx
@@ -1,8 +1,8 @@
import type { AllowedOrigin } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
+import { GlobeLockIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { GlobeLockIcon } from 'lucide-react'
defineTable<AllowedOrigin>('allowed-origins', {
title: i18n.t('admin.allowed_origins.table_title'),
diff --git a/packages/dashboard/src/tables/catalogs.tsx b/packages/dashboard/src/tables/catalogs.tsx
index e4f22a69af..c59f0a79dc 100644
--- a/packages/dashboard/src/tables/catalogs.tsx
+++ b/packages/dashboard/src/tables/catalogs.tsx
@@ -1,8 +1,8 @@
import type { Catalog } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { Badge, RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
+import { BookOpenIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { BookOpenIcon } from 'lucide-react'
defineTable<Catalog>('catalogs', {
title: i18n.t('admin.nav.catalogs'),
diff --git a/packages/dashboard/src/tables/channels.tsx b/packages/dashboard/src/tables/channels.tsx
index 0ca86967be..22ea756e25 100644
--- a/packages/dashboard/src/tables/channels.tsx
+++ b/packages/dashboard/src/tables/channels.tsx
@@ -1,8 +1,8 @@
import type { Channel } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { ActiveBadge, ResourceNameCell } from '@spree/dashboard-ui'
+import { RadioTowerIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { RadioTowerIcon } from 'lucide-react'
defineTable<Channel>('channels', {
title: i18n.t('admin.pages.channels.title'),
diff --git a/packages/dashboard/src/tables/collections.tsx b/packages/dashboard/src/tables/collections.tsx
index 219e4db962..833ee78a0c 100644
--- a/packages/dashboard/src/tables/collections.tsx
+++ b/packages/dashboard/src/tables/collections.tsx
@@ -1,8 +1,8 @@
import type { Collection } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { Badge, ResourceNameCell } from '@spree/dashboard-ui'
+import { LayersIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { LayersIcon } from 'lucide-react'
import { sortOrderLabelKey } from '../schemas/collection'
defineTable<Collection>('collections', {
diff --git a/packages/dashboard/src/tables/commission-rates.tsx b/packages/dashboard/src/tables/commission-rates.tsx
index 752fe5d894..c91c04997e 100644
--- a/packages/dashboard/src/tables/commission-rates.tsx
+++ b/packages/dashboard/src/tables/commission-rates.tsx
@@ -1,8 +1,8 @@
import type { CommissionRate } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { ActiveBadge, ResourceNameCell } from '@spree/dashboard-ui'
+import { HandCoinsIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { HandCoinsIcon } from 'lucide-react'
defineTable<CommissionRate>('commission-rates', {
title: i18n.t('admin.settings_nav.items.commission_rates'),
diff --git a/packages/dashboard/src/tables/companies.tsx b/packages/dashboard/src/tables/companies.tsx
index 2e36c4cd8f..30be117e55 100644
--- a/packages/dashboard/src/tables/companies.tsx
+++ b/packages/dashboard/src/tables/companies.tsx
@@ -1,8 +1,8 @@
import type { Company } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
+import { Building2Icon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { Building2Icon } from 'lucide-react'
import { CompanyKindBadge } from '../components/spree/company-kind-badge'
defineTable<Company>('companies', {
diff --git a/packages/dashboard/src/tables/custom-field-definitions.tsx b/packages/dashboard/src/tables/custom-field-definitions.tsx
index 4e63dcfbee..49e8b769fc 100644
--- a/packages/dashboard/src/tables/custom-field-definitions.tsx
+++ b/packages/dashboard/src/tables/custom-field-definitions.tsx
@@ -1,7 +1,7 @@
import type { CustomFieldDefinition } from '@spree/admin-sdk'
import { defineTable, i18n } from '@spree/dashboard-core'
import { ActiveBadge, Badge, ResourceNameCell } from '@spree/dashboard-ui'
-import { TagIcon } from 'lucide-react'
+import { TagIcon } from '@spree/dashboard-ui/icons'
import {
DEFAULT_RESOURCE_TYPES,
FIELD_TYPES,
diff --git a/packages/dashboard/src/tables/customer-groups.tsx b/packages/dashboard/src/tables/customer-groups.tsx
index 265672ead7..d546ceeb54 100644
--- a/packages/dashboard/src/tables/customer-groups.tsx
+++ b/packages/dashboard/src/tables/customer-groups.tsx
@@ -1,8 +1,8 @@
import type { CustomerGroup } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { ResourceNameCell } from '@spree/dashboard-ui'
+import { UsersRoundIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { UsersRoundIcon } from 'lucide-react'
defineTable<CustomerGroup>('customer-groups', {
title: i18n.t('admin.customers.groups.table.title'),
diff --git a/packages/dashboard/src/tables/customers.tsx b/packages/dashboard/src/tables/customers.tsx
index 4609b4f6aa..a3763ab2a6 100644
--- a/packages/dashboard/src/tables/customers.tsx
+++ b/packages/dashboard/src/tables/customers.tsx
@@ -1,8 +1,8 @@
import { defineTable, Subject } from '@spree/dashboard-core'
import { ActiveBadge, Badge, RelativeTime, TagList } from '@spree/dashboard-ui'
+import { UsersIcon } from '@spree/dashboard-ui/icons'
import { Link } from '@tanstack/react-router'
import i18n from 'i18next'
-import { UsersIcon } from 'lucide-react'
import { companyAutocompleteProps } from '../hooks/use-companies'
import { customerGroupAutocompleteProps } from '../hooks/use-customer-groups'
diff --git a/packages/dashboard/src/tables/delivery-profiles.tsx b/packages/dashboard/src/tables/delivery-profiles.tsx
index 00e0b68a50..852f759955 100644
--- a/packages/dashboard/src/tables/delivery-profiles.tsx
+++ b/packages/dashboard/src/tables/delivery-profiles.tsx
@@ -1,8 +1,8 @@
import type { DeliveryProfile } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { Badge, ResourceNameCell } from '@spree/dashboard-ui'
+import { TruckIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { TruckIcon } from 'lucide-react'
defineTable<DeliveryProfile>('delivery-profiles', {
title: i18n.t('admin.settings_nav.items.delivery_profiles'),
diff --git a/packages/dashboard/src/tables/gift-cards.tsx b/packages/dashboard/src/tables/gift-cards.tsx
index c5a0efec04..bdf3ab8844 100644
--- a/packages/dashboard/src/tables/gift-cards.tsx
+++ b/packages/dashboard/src/tables/gift-cards.tsx
@@ -1,8 +1,8 @@
import type { GiftCard } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { Badge, RelativeTime, ResourceNameCell, StatusBadge } from '@spree/dashboard-ui'
+import { GiftIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { GiftIcon } from 'lucide-react'
import { adminUserAutocompleteProps } from '../hooks/use-admin-users'
import { customerAutocompleteProps } from '../hooks/use-customers'
import { giftCardBatchAutocompleteProps } from '../hooks/use-gift-cards'
diff --git a/packages/dashboard/src/tables/imports.tsx b/packages/dashboard/src/tables/imports.tsx
index a8d6e8a4a2..611ebbe757 100644
--- a/packages/dashboard/src/tables/imports.tsx
+++ b/packages/dashboard/src/tables/imports.tsx
@@ -1,8 +1,8 @@
import type { Import } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { RelativeTime, ResourceNameCell, StatusBadge } from '@spree/dashboard-ui'
+import { UploadIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { UploadIcon } from 'lucide-react'
import { importTypeLabel } from '../lib/import-types'
defineTable<Import>('imports', {
diff --git a/packages/dashboard/src/tables/markets.tsx b/packages/dashboard/src/tables/markets.tsx
index 8b0625cb05..6b71d82d19 100644
--- a/packages/dashboard/src/tables/markets.tsx
+++ b/packages/dashboard/src/tables/markets.tsx
@@ -1,8 +1,8 @@
import type { Market } from '@spree/admin-sdk'
import { defineTable, LocaleLabel } from '@spree/dashboard-core'
import { ActiveBadge, Badge, ResourceNameCell } from '@spree/dashboard-ui'
+import { GlobeIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { GlobeIcon } from 'lucide-react'
defineTable<Market>('markets', {
title: i18n.t('admin.settings_nav.items.markets'),
diff --git a/packages/dashboard/src/tables/option-types.tsx b/packages/dashboard/src/tables/option-types.tsx
index 5df610fb85..d92489d0da 100644
--- a/packages/dashboard/src/tables/option-types.tsx
+++ b/packages/dashboard/src/tables/option-types.tsx
@@ -1,8 +1,8 @@
import type { OptionType } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { ActiveBadge, Badge, ResourceNameCell } from '@spree/dashboard-ui'
+import { ListChecksIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { ListChecksIcon } from 'lucide-react'
const KIND_LABELS: Record<string, string> = {
dropdown: i18n.t('admin.option_types.kinds.dropdown'),
diff --git a/packages/dashboard/src/tables/orders.tsx b/packages/dashboard/src/tables/orders.tsx
index 14634fee25..c64e6d6752 100644
--- a/packages/dashboard/src/tables/orders.tsx
+++ b/packages/dashboard/src/tables/orders.tsx
@@ -1,8 +1,8 @@
import { defineTable, Subject } from '@spree/dashboard-core'
import { RelativeTime, StatusBadge, TagList } from '@spree/dashboard-ui'
+import { ShoppingCartIcon } from '@spree/dashboard-ui/icons'
import { Link } from '@tanstack/react-router'
import i18n from 'i18next'
-import { ShoppingCartIcon } from 'lucide-react'
import { channelAutocompleteProps } from '../hooks/use-channels'
import { customerAutocompleteProps } from '../hooks/use-customers'
import { sellerAutocompleteProps } from '../hooks/use-sellers'
diff --git a/packages/dashboard/src/tables/payment-methods.tsx b/packages/dashboard/src/tables/payment-methods.tsx
index e25588e0e2..86da687ded 100644
--- a/packages/dashboard/src/tables/payment-methods.tsx
+++ b/packages/dashboard/src/tables/payment-methods.tsx
@@ -1,8 +1,8 @@
import type { PaymentMethod } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { ActiveBadge, Badge, ResourceNameCell } from '@spree/dashboard-ui'
+import { CreditCardIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { CreditCardIcon } from 'lucide-react'
defineTable<PaymentMethod>('payment-methods', {
title: i18n.t('admin.payment_methods.title'),
diff --git a/packages/dashboard/src/tables/policies.tsx b/packages/dashboard/src/tables/policies.tsx
index a8370a653b..3b2a32ff85 100644
--- a/packages/dashboard/src/tables/policies.tsx
+++ b/packages/dashboard/src/tables/policies.tsx
@@ -1,8 +1,8 @@
import type { Policy } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
+import { ScrollTextIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { ScrollTextIcon } from 'lucide-react'
defineTable<Policy>('policies', {
title: i18n.t('admin.settings_nav.items.policies'),
diff --git a/packages/dashboard/src/tables/post-sale.tsx b/packages/dashboard/src/tables/post-sale.tsx
index f59d7d9aa1..f6a043ecd9 100644
--- a/packages/dashboard/src/tables/post-sale.tsx
+++ b/packages/dashboard/src/tables/post-sale.tsx
@@ -1,9 +1,9 @@
import type { Claim, Exchange, Return } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { RelativeTime, StatusBadge } from '@spree/dashboard-ui'
+import { RepeatIcon, RotateCcwIcon, ShieldAlertIcon } from '@spree/dashboard-ui/icons'
import { Link } from '@tanstack/react-router'
import i18n from 'i18next'
-import { RepeatIcon, RotateCcwIcon, ShieldAlertIcon } from 'lucide-react'
/**
* The record's own number, linking to the order it belongs to — that page is
diff --git a/packages/dashboard/src/tables/price-lists.tsx b/packages/dashboard/src/tables/price-lists.tsx
index 63e850071b..c46435db43 100644
--- a/packages/dashboard/src/tables/price-lists.tsx
+++ b/packages/dashboard/src/tables/price-lists.tsx
@@ -1,8 +1,8 @@
import type { PriceList } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { ResourceNameCell } from '@spree/dashboard-ui'
+import { TagsIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { TagsIcon } from 'lucide-react'
import { PriceListStatusBadge } from '../components/spree/price-list-editors/status-badge'
defineTable<PriceList>('price-lists', {
diff --git a/packages/dashboard/src/tables/product-types.tsx b/packages/dashboard/src/tables/product-types.tsx
index 9872301b2d..654780d09e 100644
--- a/packages/dashboard/src/tables/product-types.tsx
+++ b/packages/dashboard/src/tables/product-types.tsx
@@ -1,8 +1,8 @@
import type { ProductType } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { Badge, ResourceNameCell } from '@spree/dashboard-ui'
+import { ShapesIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { ShapesIcon } from 'lucide-react'
defineTable<ProductType>('product-types', {
title: i18n.t('admin.settings_nav.items.product_types'),
diff --git a/packages/dashboard/src/tables/products.tsx b/packages/dashboard/src/tables/products.tsx
index 2c39e8ceea..e448e84e7f 100644
--- a/packages/dashboard/src/tables/products.tsx
+++ b/packages/dashboard/src/tables/products.tsx
@@ -1,9 +1,9 @@
import type { Channel } from '@spree/admin-sdk'
import { defineTable, formatPrice, Subject } from '@spree/dashboard-core'
import { StatusBadge, TagList, Thumbnail } from '@spree/dashboard-ui'
+import { PackageIcon } from '@spree/dashboard-ui/icons'
import { Link } from '@tanstack/react-router'
import i18n from 'i18next'
-import { PackageIcon } from 'lucide-react'
import { categoryAutocompleteProps } from '../hooks/use-categories'
import { channelAutocompleteProps } from '../hooks/use-channels'
import { productTypeAutocompleteProps } from '../hooks/use-product-types'
diff --git a/packages/dashboard/src/tables/promotions.tsx b/packages/dashboard/src/tables/promotions.tsx
index f5c00d9489..d424a5e4ad 100644
--- a/packages/dashboard/src/tables/promotions.tsx
+++ b/packages/dashboard/src/tables/promotions.tsx
@@ -1,8 +1,8 @@
import type { Promotion } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { Badge, RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
+import { TagIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { TagIcon } from 'lucide-react'
defineTable<Promotion>('promotions', {
title: i18n.t('admin.nav.promotions'),
diff --git a/packages/dashboard/src/tables/seller-requirements.tsx b/packages/dashboard/src/tables/seller-requirements.tsx
index 6c5271af61..0ee719f14d 100644
--- a/packages/dashboard/src/tables/seller-requirements.tsx
+++ b/packages/dashboard/src/tables/seller-requirements.tsx
@@ -1,8 +1,8 @@
import type { SellerRequirement } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { ActiveBadge, Badge, ResourceNameCell } from '@spree/dashboard-ui'
+import { ClipboardCheckIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { ClipboardCheckIcon } from 'lucide-react'
defineTable<SellerRequirement>('seller-requirements', {
title: i18n.t('admin.seller_requirements.title'),
diff --git a/packages/dashboard/src/tables/sellers.tsx b/packages/dashboard/src/tables/sellers.tsx
index 7908ea61ae..12b076edd4 100644
--- a/packages/dashboard/src/tables/sellers.tsx
+++ b/packages/dashboard/src/tables/sellers.tsx
@@ -1,9 +1,9 @@
import type { Seller } from '@spree/admin-sdk'
import { defineTable, progressPercentage } from '@spree/dashboard-core'
import { Progress, RelativeTime, StatusBadge } from '@spree/dashboard-ui'
+import { StoreIcon } from '@spree/dashboard-ui/icons'
import { Link } from '@tanstack/react-router'
import i18n from 'i18next'
-import { StoreIcon } from 'lucide-react'
import { SELLER_STATUSES } from '../schemas/seller'
defineTable<Seller>('sellers', {
diff --git a/packages/dashboard/src/tables/stock-transfers.tsx b/packages/dashboard/src/tables/stock-transfers.tsx
index b373ac4f76..f3902e56e1 100644
--- a/packages/dashboard/src/tables/stock-transfers.tsx
+++ b/packages/dashboard/src/tables/stock-transfers.tsx
@@ -1,8 +1,8 @@
import type { StockTransfer } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { Badge, RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
+import { ArrowLeftRightIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { ArrowLeftRightIcon } from 'lucide-react'
defineTable<StockTransfer>('stock-transfers', {
title: i18n.t('admin.stock_transfers.title'),
diff --git a/packages/dashboard/src/tables/tax-categories.tsx b/packages/dashboard/src/tables/tax-categories.tsx
index 784d7b724c..ca1ad96077 100644
--- a/packages/dashboard/src/tables/tax-categories.tsx
+++ b/packages/dashboard/src/tables/tax-categories.tsx
@@ -1,8 +1,8 @@
import type { TaxCategory } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { ActiveBadge, ResourceNameCell } from '@spree/dashboard-ui'
+import { PercentIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { PercentIcon } from 'lucide-react'
defineTable<TaxCategory>('tax-categories', {
title: i18n.t('admin.settings_nav.items.tax_categories'),
diff --git a/packages/dashboard/src/tables/tax-rates.tsx b/packages/dashboard/src/tables/tax-rates.tsx
index 278b3cf446..f666fcd924 100644
--- a/packages/dashboard/src/tables/tax-rates.tsx
+++ b/packages/dashboard/src/tables/tax-rates.tsx
@@ -1,8 +1,8 @@
import type { TaxRate } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { ActiveBadge, ResourceNameCell } from '@spree/dashboard-ui'
+import { ReceiptTextIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { ReceiptTextIcon } from 'lucide-react'
import { JurisdictionLabel } from '../components/spree/jurisdiction-label'
import { TaxCategoryLabel } from '../components/spree/tax-category-label'
diff --git a/packages/dashboard/src/tables/webhook-deliveries.tsx b/packages/dashboard/src/tables/webhook-deliveries.tsx
index 588d8340fb..32bd4ccf08 100644
--- a/packages/dashboard/src/tables/webhook-deliveries.tsx
+++ b/packages/dashboard/src/tables/webhook-deliveries.tsx
@@ -1,8 +1,8 @@
import type { WebhookDelivery } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
import { Badge, RelativeTime, StatusBadge } from '@spree/dashboard-ui'
+import { ListIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { ListIcon } from 'lucide-react'
// `success` on a delivery is tri-state: `true` (HTTP 2xx received), `false`
// (response/transport error), or `null` (queued, not yet attempted). The
diff --git a/packages/dashboard/src/tables/webhook-endpoints.tsx b/packages/dashboard/src/tables/webhook-endpoints.tsx
index 5eb382f086..dfd5e84f63 100644
--- a/packages/dashboard/src/tables/webhook-endpoints.tsx
+++ b/packages/dashboard/src/tables/webhook-endpoints.tsx
@@ -8,8 +8,8 @@ import {
ResourceNameCell,
StatusBadge,
} from '@spree/dashboard-ui'
+import { WebhookIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
-import { WebhookIcon } from 'lucide-react'
import { webhookEndpointHealth, webhookHealthBadgeVariant } from '../lib/webhook-health'
defineTable<WebhookEndpoint>('webhook-endpoints', {
diff --git a/packages/seller-dashboard/src/components/seller-address-card.tsx b/packages/seller-dashboard/src/components/seller-address-card.tsx
index 286b37e552..8ba6a5da00 100644
--- a/packages/seller-dashboard/src/components/seller-address-card.tsx
+++ b/packages/seller-dashboard/src/components/seller-address-card.tsx
@@ -11,10 +11,10 @@ import {
StatusBadge,
toastManager,
} from '@spree/dashboard-ui'
+import { PencilIcon, PlusIcon } from '@spree/dashboard-ui/icons'
import type { Profile, SellerAddressParams } from '@spree/seller-sdk'
import { useMutation, useQueryClient } from '@tanstack/react-query'
import { useParams } from '@tanstack/react-router'
-import { PencilIcon, PlusIcon } from 'lucide-react'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { sellerClient } from '../api-client'
diff --git a/packages/seller-dashboard/src/components/seller-business-card.tsx b/packages/seller-dashboard/src/components/seller-business-card.tsx
index 7322b32d47..499cbfb991 100644
--- a/packages/seller-dashboard/src/components/seller-business-card.tsx
+++ b/packages/seller-dashboard/src/components/seller-business-card.tsx
@@ -15,10 +15,10 @@ import {
SheetTitle,
toastManager,
} from '@spree/dashboard-ui'
+import { PencilIcon } from '@spree/dashboard-ui/icons'
import type { Profile } from '@spree/seller-sdk'
import { useMutation, useQueryClient } from '@tanstack/react-query'
import { useParams } from '@tanstack/react-router'
-import { PencilIcon } from 'lucide-react'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { sellerClient } from '../api-client'
diff --git a/packages/seller-dashboard/src/components/seller-returns-location-card.tsx b/packages/seller-dashboard/src/components/seller-returns-location-card.tsx
index 211fd1b702..df595a197d 100644
--- a/packages/seller-dashboard/src/components/seller-returns-location-card.tsx
+++ b/packages/seller-dashboard/src/components/seller-returns-location-card.tsx
@@ -11,10 +11,10 @@ import {
StatusBadge,
toastManager,
} from '@spree/dashboard-ui'
+import { PencilIcon, PlusIcon } from '@spree/dashboard-ui/icons'
import type { StockLocation, StockLocationParams } from '@spree/seller-sdk'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useParams } from '@tanstack/react-router'
-import { PencilIcon, PlusIcon } from 'lucide-react'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { sellerClient } from '../api-client'
diff --git a/packages/seller-dashboard/src/components/seller-switcher.tsx b/packages/seller-dashboard/src/components/seller-switcher.tsx
index 4f5e075aef..19b6ccb0d8 100644
--- a/packages/seller-dashboard/src/components/seller-switcher.tsx
+++ b/packages/seller-dashboard/src/components/seller-switcher.tsx
@@ -11,9 +11,9 @@ import {
Skeleton,
useSidebar,
} from '@spree/dashboard-ui'
+import { CheckIcon, ChevronsUpDownIcon } from '@spree/dashboard-ui/icons'
import { useQuery } from '@tanstack/react-query'
import { Link, useParams } from '@tanstack/react-router'
-import { CheckIcon, ChevronsUpDownIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { sellerClient } from '../api-client'
diff --git a/packages/seller-dashboard/src/nav/default.ts b/packages/seller-dashboard/src/nav/default.ts
index da19cea261..db27a0d0fa 100644
--- a/packages/seller-dashboard/src/nav/default.ts
+++ b/packages/seller-dashboard/src/nav/default.ts
@@ -6,7 +6,7 @@ import {
SettingsIcon,
StoreIcon,
TagIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
import { OnboardingNavBadge } from '../components/onboarding-nav-badge'
// The panel's built-in sidebar. Registered into the same registry a plugin
diff --git a/packages/seller-dashboard/src/nav/settings.ts b/packages/seller-dashboard/src/nav/settings.ts
index dccf9a9f16..410c0417b0 100644
--- a/packages/seller-dashboard/src/nav/settings.ts
+++ b/packages/seller-dashboard/src/nav/settings.ts
@@ -1,5 +1,5 @@
import { i18n, settingsNav } from '@spree/dashboard-core'
-import { ScrollTextIcon, UsersRoundIcon, WarehouseIcon } from 'lucide-react'
+import { ScrollTextIcon, UsersRoundIcon, WarehouseIcon } from '@spree/dashboard-ui/icons'
// The panel's settings rail, registered into the same registry the operator's
// dashboard writes to — so a marketplace adds, removes or reorders entries
diff --git a/packages/seller-dashboard/src/pages/home.tsx b/packages/seller-dashboard/src/pages/home.tsx
index d5663f4212..97db20102f 100644
--- a/packages/seller-dashboard/src/pages/home.tsx
+++ b/packages/seller-dashboard/src/pages/home.tsx
@@ -9,9 +9,9 @@ import {
Progress,
StatusBadge,
} from '@spree/dashboard-ui'
+import { ChevronRightIcon, PackageIcon, UsersIcon } from '@spree/dashboard-ui/icons'
import { useQuery } from '@tanstack/react-query'
import { Link, useParams } from '@tanstack/react-router'
-import { ChevronRightIcon, PackageIcon, UsersIcon } from 'lucide-react'
import type { ReactNode } from 'react'
import { useTranslation } from 'react-i18next'
import { sellerClient } from '../api-client'
diff --git a/packages/seller-dashboard/src/pages/onboarding.tsx b/packages/seller-dashboard/src/pages/onboarding.tsx
index 5fd769ca94..7ded0d7617 100644
--- a/packages/seller-dashboard/src/pages/onboarding.tsx
+++ b/packages/seller-dashboard/src/pages/onboarding.tsx
@@ -20,9 +20,6 @@ import {
Textarea,
toastManager,
} from '@spree/dashboard-ui'
-import type { RequirementStatus } from '@spree/seller-sdk'
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-import { Link, useParams } from '@tanstack/react-router'
import {
CheckCircle2Icon,
ChevronRightIcon,
@@ -30,7 +27,10 @@ import {
ClockIcon,
ExternalLinkIcon,
XCircleIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
+import type { RequirementStatus } from '@spree/seller-sdk'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { Link, useParams } from '@tanstack/react-router'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { sellerClient } from '../api-client'
diff --git a/packages/seller-dashboard/src/pages/policies.tsx b/packages/seller-dashboard/src/pages/policies.tsx
index 73fb351c0e..c5d1e92837 100644
--- a/packages/seller-dashboard/src/pages/policies.tsx
+++ b/packages/seller-dashboard/src/pages/policies.tsx
@@ -27,10 +27,10 @@ import {
useConfirm,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { PlusIcon } from '@spree/dashboard-ui/icons'
import type { Policy } from '@spree/seller-sdk'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useParams } from '@tanstack/react-router'
-import { PlusIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
import { Controller, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/seller-dashboard/src/pages/products.tsx b/packages/seller-dashboard/src/pages/products.tsx
index e7c74d8827..64eabd1b2e 100644
--- a/packages/seller-dashboard/src/pages/products.tsx
+++ b/packages/seller-dashboard/src/pages/products.tsx
@@ -25,9 +25,9 @@ import {
toastManager,
useRowClickBridge,
} from '@spree/dashboard-ui'
+import { ArchiveIcon, PlusIcon, SendIcon, Trash2Icon } from '@spree/dashboard-ui/icons'
import type { BulkProductResult, Product } from '@spree/seller-sdk'
import { useNavigate, useParams } from '@tanstack/react-router'
-import { ArchiveIcon, PlusIcon, SendIcon, Trash2Icon } from 'lucide-react'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { sellerClient } from '../api-client'
diff --git a/packages/seller-dashboard/src/pages/profile.tsx b/packages/seller-dashboard/src/pages/profile.tsx
index 1fcd0f7f7b..da6e38d6f1 100644
--- a/packages/seller-dashboard/src/pages/profile.tsx
+++ b/packages/seller-dashboard/src/pages/profile.tsx
@@ -22,10 +22,10 @@ import {
Textarea,
toastManager,
} from '@spree/dashboard-ui'
+import { PackageIcon, PencilIcon, StoreIcon, UsersIcon } from '@spree/dashboard-ui/icons'
import type { Profile } from '@spree/seller-sdk'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useParams } from '@tanstack/react-router'
-import { PackageIcon, PencilIcon, StoreIcon, UsersIcon } from 'lucide-react'
import type { ReactNode } from 'react'
import { useEffect, useState } from 'react'
import { useForm } from 'react-hook-form'
diff --git a/packages/seller-dashboard/src/pages/team.tsx b/packages/seller-dashboard/src/pages/team.tsx
index de30faae45..7e5808d1a2 100644
--- a/packages/seller-dashboard/src/pages/team.tsx
+++ b/packages/seller-dashboard/src/pages/team.tsx
@@ -37,9 +37,6 @@ import {
useConfirm,
useCopyToClipboard,
} from '@spree/dashboard-ui'
-import type { Invitation, TeamMember } from '@spree/seller-sdk'
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-import { useParams } from '@tanstack/react-router'
import {
ClockIcon,
LinkIcon,
@@ -49,7 +46,10 @@ import {
UserMinusIcon,
UsersRoundIcon,
XIcon,
-} from 'lucide-react'
+} from '@spree/dashboard-ui/icons'
+import type { Invitation, TeamMember } from '@spree/seller-sdk'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { useParams } from '@tanstack/react-router'
import { useState } from 'react'
import { useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
diff --git a/packages/seller-dashboard/src/tables/orders.tsx b/packages/seller-dashboard/src/tables/orders.tsx
index cd3c400c81..9ae4b10f96 100644
--- a/packages/seller-dashboard/src/tables/orders.tsx
+++ b/packages/seller-dashboard/src/tables/orders.tsx
@@ -1,8 +1,8 @@
import { defineTable } from '@spree/dashboard-core'
import { ResourceNameCell, StatusBadge } from '@spree/dashboard-ui'
+import { PackageIcon } from '@spree/dashboard-ui/icons'
import type { Order } from '@spree/seller-sdk'
import i18n from 'i18next'
-import { PackageIcon } from 'lucide-react'
/** Mirrors the operator dashboard's order status vocabularies. */
const FULFILLMENT_STATUSES = [
diff --git a/packages/seller-dashboard/src/tables/policies.tsx b/packages/seller-dashboard/src/tables/policies.tsx
index 8d58dbdf0f..9f02e3f4d3 100644
--- a/packages/seller-dashboard/src/tables/policies.tsx
+++ b/packages/seller-dashboard/src/tables/policies.tsx
@@ -1,8 +1,8 @@
import { defineTable } from '@spree/dashboard-core'
import { RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
+import { ScrollTextIcon } from '@spree/dashboard-ui/icons'
import type { Policy } from '@spree/seller-sdk'
import i18n from 'i18next'
-import { ScrollTextIcon } from 'lucide-react'
defineTable<Policy>('seller-policies', {
title: i18n.t('policies.title'),
diff --git a/packages/seller-dashboard/src/tables/products.tsx b/packages/seller-dashboard/src/tables/products.tsx
index bc09fc5702..1b64dada3a 100644
--- a/packages/seller-dashboard/src/tables/products.tsx
+++ b/packages/seller-dashboard/src/tables/products.tsx
@@ -1,8 +1,8 @@
import { defineTable } from '@spree/dashboard-core'
import { ResourceNameCell, StatusBadge, Thumbnail } from '@spree/dashboard-ui'
+import { PackageIcon } from '@spree/dashboard-ui/icons'
import type { Product } from '@spree/seller-sdk'
import i18n from 'i18next'
-import { PackageIcon } from 'lucide-react'
/** Mirrors the operator dashboard's product statuses. */
const PRODUCT_STATUSES = ['active', 'draft', 'proposed', 'rejected', 'archived'] as const