@mercurjs/admin 2.2.0-canary.27 → 2.2.0-canary.29

package/dist/{add-campaign-promotions-TSVKITKJ.js → add-campaign-promotions-PBKYGW67.js}

@@ -1,11 +1,11 @@
 import {
   usePromotionTableColumns,
   usePromotionTableQuery
-} from "./chunk-TY6PRG7C.js";
+} from "./chunk-XZRINNEK.js";
 import {
   usePromotionTableFilters
 } from "./chunk-S2WEYEQR.js";
-import "./chunk-7I7FFT4A.js";
+import "./chunk-3TZWLHMQ.js";
 import "./chunk-JHIMVLB2.js";
 import "./chunk-FMFVTERD.js";
 import "./chunk-DB6ANJBO.js";
@@ -18,7 +18,7 @@ import {
 import "./chunk-YN3FGNJM.js";
 import "./chunk-KAZ5BYTQ.js";
 import "./chunk-PAYQJPGK.js";
-import "./chunk-4KLVH4XT.js";
+import "./chunk-6IZ5YBWE.js";
 import "./chunk-TKGWSUEI.js";
 import {
   KeyboundForm

package/dist/{campaign-detail-E77T2QAI.js → campaign-detail-UIDRN6TA.js}

@@ -1,11 +1,11 @@
 import {
   CAMPAIGN_DETAIL_FIELDS,
   CampaignDetailPage
-} from "./chunk-2KOE4QV6.js";
-import "./chunk-TY6PRG7C.js";
+} from "./chunk-4DP2SPYG.js";
+import "./chunk-XZRINNEK.js";
 import "./chunk-S2WEYEQR.js";
 import "./chunk-RK5N3XIX.js";
-import "./chunk-7I7FFT4A.js";
+import "./chunk-3TZWLHMQ.js";
 import "./chunk-JHIMVLB2.js";
 import "./chunk-FMFVTERD.js";
 import "./chunk-DB6ANJBO.js";
@@ -15,7 +15,7 @@ import "./chunk-JGCGVEFZ.js";
 import "./chunk-YN3FGNJM.js";
 import "./chunk-KAZ5BYTQ.js";
 import "./chunk-PAYQJPGK.js";
-import "./chunk-4KLVH4XT.js";
+import "./chunk-6IZ5YBWE.js";
 import "./chunk-IQPN4PZJ.js";
 import "./chunk-E74OUNA3.js";
 import "./chunk-H6MYB7GB.js";

package/dist/{chunk-HTTJLQR3.js → chunk-3RKBBZGV.js}

@@ -10,7 +10,7 @@ import {
   decorateVariantsWithDefaultValues,
   generateVariantsFromAttributes,
   normalizeProductFormValues
-} from "./chunk-M3BDFG5D.js";
+} from "./chunk-W6SVRN6P.js";
 import {
   HandleInput
 } from "./chunk-HJ56YXBU.js";

package/dist/{chunk-7I7FFT4A.js → chunk-3TZWLHMQ.js}

@@ -1,6 +1,6 @@
 import {
   i18n
-} from "./chunk-4KLVH4XT.js";
+} from "./chunk-6IZ5YBWE.js";
 
 // src/lib/promotions.ts
 var getPromotionStatusMap = () => ({

package/dist/{chunk-2KOE4QV6.js → chunk-4DP2SPYG.js}

@@ -1,7 +1,7 @@
 import {
   usePromotionTableColumns,
   usePromotionTableQuery
-} from "./chunk-TY6PRG7C.js";
+} from "./chunk-XZRINNEK.js";
 import {
   usePromotionTableFilters
 } from "./chunk-S2WEYEQR.js";

package/dist/{chunk-SINWGUXZ.js → chunk-55TMW3GW.js}

@@ -63,7 +63,7 @@ var CommissionValueFields = ({
               min: 0,
               code,
               symbol: getCurrencySymbol(code),
-              onValueChange: (val) => onChange(val ? parseFloat(val) : 0),
+              onValueChange: (val) => onChange(val ? parseFloat(val) : void 0),
               ...field,
               value: value ?? ""
             }

package/dist/{chunk-4KLVH4XT.js → chunk-6IZ5YBWE.js}

@@ -12755,6 +12755,14 @@ var en_default = {
     status: {
       enabled: "Active",
       disabled: "Inactive"
+    },
+    validation: {
+      titleRequired: "Please enter a title",
+      codeRequired: "Please enter a code",
+      value: "Please enter a value",
+      storesRequired: "Please select at least one store",
+      productTypesRequired: "Please select at least one product type",
+      categoriesRequired: "Please select at least one category"
     }
   },
   commissionRates: {

package/dist/{chunk-XNCSX2EJ.js → chunk-QJSKG6JE.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-RK5N3XIX.js";
 import {
   getPromotionStatus
-} from "./chunk-7I7FFT4A.js";
+} from "./chunk-3TZWLHMQ.js";
 import {
   formatPercentage
 } from "./chunk-QDPLZDMX.js";

package/dist/{chunk-LOCIDCV2.js → chunk-VS4LCJLY.js}

@@ -1,7 +1,7 @@
 import {
   usePromotionTableColumns,
   usePromotionTableQuery
-} from "./chunk-TY6PRG7C.js";
+} from "./chunk-XZRINNEK.js";
 import {
   usePromotionTableFilters
 } from "./chunk-S2WEYEQR.js";

package/dist/{chunk-M3BDFG5D.js → chunk-W6SVRN6P.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-AJLGY3LQ.js";
 import {
   i18n
-} from "./chunk-4KLVH4XT.js";
+} from "./chunk-6IZ5YBWE.js";
 
 // src/pages/products/product-create/constants.ts
 import { z } from "zod";

package/dist/{chunk-TY6PRG7C.js → chunk-XZRINNEK.js}

@@ -1,6 +1,6 @@
 import {
   getPromotionStatus
-} from "./chunk-7I7FFT4A.js";
+} from "./chunk-3TZWLHMQ.js";
 import {
   TextCell,
   TextHeader

package/dist/{commission-rule-commission-edit-L2F2PNRI.js → commission-rule-commission-edit-AMJAHLPW.js}

@@ -1,12 +1,15 @@
 import {
   CommissionValueFields,
   useStoreCurrencies
-} from "./chunk-SINWGUXZ.js";
+} from "./chunk-55TMW3GW.js";
 import {
   buildValuesPayload,
   fixedValuesFromRate
 } from "./chunk-CGIVQ7D2.js";
 import "./chunk-MAEP2UCK.js";
+import {
+  Combobox
+} from "./chunk-AW77UWCZ.js";
 import {
   SwitchBox
 } from "./chunk-2EME4AWX.js";
@@ -28,9 +31,6 @@ import {
 } from "./chunk-ZIFHQXP3.js";
 import "./chunk-FXWKGNRV.js";
 import "./chunk-VDKOJ5WD.js";
-import {
-  useDocumentDirection
-} from "./chunk-Y7QKP6QU.js";
 import "./chunk-RHKRREUU.js";
 import "./chunk-ZA2KFUFR.js";
 import "./chunk-ZBWL72TB.js";
@@ -38,7 +38,7 @@ import "./chunk-NBMM2TZK.js";
 
 // src/pages/commissions/commission-rule-commission-edit/commission-rule-commission-edit.tsx
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Button, Heading, Select, toast } from "@medusajs/ui";
+import { Button, Heading, toast } from "@medusajs/ui";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
@@ -54,8 +54,11 @@ var EditCommissionSchema = zod.object({
 var EditCommissionForm = ({ rule }) => {
   const { t } = useTranslation();
   const { handleSuccess } = useRouteModal();
-  const direction = useDocumentDirection();
   const { currencies } = useStoreCurrencies();
+  const typeOptions = [
+    { value: "percentage", label: t("commissions.fields.type.percentage") },
+    { value: "fixed", label: t("commissions.fields.type.fixed") }
+  ];
   const form = useForm({
     defaultValues: {
       type: rule.type,
@@ -98,22 +101,17 @@ var EditCommissionForm = ({ rule }) => {
         {
           control: form.control,
           name: "type",
-          render: ({ field: { onChange, ref, ...field } }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
+          render: ({ field }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
             /* @__PURE__ */ jsx(Form.Label, { children: t("commissions.fields.type.label") }),
-            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsxs(Select, { ...field, onValueChange: onChange, dir: direction, children: [
-              /* @__PURE__ */ jsx(
-                Select.Trigger,
-                {
-                  ref,
-                  "data-testid": "commission-edit-type-select",
-                  children: /* @__PURE__ */ jsx(Select.Value, {})
-                }
-              ),
-              /* @__PURE__ */ jsxs(Select.Content, { children: [
-                /* @__PURE__ */ jsx(Select.Item, { value: "percentage", children: t("commissions.fields.type.percentage") }),
-                /* @__PURE__ */ jsx(Select.Item, { value: "fixed", children: t("commissions.fields.type.fixed") })
-              ] })
-            ] }) }),
+            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsx(
+              Combobox,
+              {
+                ...field,
+                options: typeOptions,
+                forceHideInput: true,
+                "data-testid": "commission-edit-type-select"
+              }
+            ) }),
             /* @__PURE__ */ jsx(Form.ErrorMessage, {})
           ] })
         }

package/dist/{commission-rule-create-SCZ3PBTF.js → commission-rule-create-A2N3JNUI.js}

@@ -1,7 +1,7 @@
 import {
   CommissionValueFields,
   useStoreCurrencies
-} from "./chunk-SINWGUXZ.js";
+} from "./chunk-55TMW3GW.js";
 import "./chunk-QR3GYYX6.js";
 import {
   SCOPE_TYPE_DIMENSIONS,
@@ -39,9 +39,6 @@ import {
 } from "./chunk-ZIFHQXP3.js";
 import "./chunk-FXWKGNRV.js";
 import "./chunk-VDKOJ5WD.js";
-import {
-  useDocumentDirection
-} from "./chunk-Y7QKP6QU.js";
 import "./chunk-RHKRREUU.js";
 import "./chunk-ZA2KFUFR.js";
 import {
@@ -56,19 +53,23 @@ import { useTranslation as useTranslation4 } from "react-i18next";
 // src/pages/commissions/commission-rule-create/components/create-commission-rule-form/create-commission-rule-form.tsx
 import { zodResolver } from "@hookform/resolvers/zod";
 import { toast } from "@medusajs/ui";
+import { useMemo } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation as useTranslation3 } from "react-i18next";
 
 // src/pages/commissions/commission-rule-create/components/create-commission-rule-form/create-commission-rule-commission.tsx
-import { Heading, Select } from "@medusajs/ui";
+import { Heading } from "@medusajs/ui";
 import { useTranslation } from "react-i18next";
 import { jsx, jsxs } from "react/jsx-runtime";
 var CreateCommissionRuleCommission = () => {
   const { t } = useTranslation();
   const form = useTabbedForm();
-  const direction = useDocumentDirection();
   const { currencies } = useStoreCurrencies();
   const commissionType = form.watch("commissionType");
+  const typeOptions = [
+    { value: "percentage", label: t("commissions.fields.type.percentage") },
+    { value: "fixed", label: t("commissions.fields.type.fixed") }
+  ];
   return /* @__PURE__ */ jsx("div", { className: "flex flex-col items-center p-16", children: /* @__PURE__ */ jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-8", children: [
     /* @__PURE__ */ jsx(Heading, { children: t("commissions.create.commission") }),
     /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-y-4", children: [
@@ -77,22 +78,17 @@ var CreateCommissionRuleCommission = () => {
         {
           control: form.control,
           name: "commissionType",
-          render: ({ field: { onChange, ref, ...field } }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
+          render: ({ field }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
             /* @__PURE__ */ jsx(Form.Label, { children: t("commissions.fields.type.label") }),
-            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsxs(Select, { ...field, onValueChange: onChange, dir: direction, children: [
-              /* @__PURE__ */ jsx(
-                Select.Trigger,
-                {
-                  ref,
-                  "data-testid": "commission-rule-commission-type-select",
-                  children: /* @__PURE__ */ jsx(Select.Value, {})
-                }
-              ),
-              /* @__PURE__ */ jsxs(Select.Content, { children: [
-                /* @__PURE__ */ jsx(Select.Item, { value: "percentage", children: t("commissions.fields.type.percentage") }),
-                /* @__PURE__ */ jsx(Select.Item, { value: "fixed", children: t("commissions.fields.type.fixed") })
-              ] })
-            ] }) }),
+            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsx(
+              Combobox,
+              {
+                ...field,
+                options: typeOptions,
+                forceHideInput: true,
+                "data-testid": "commission-rule-commission-type-select"
+              }
+            ) }),
             /* @__PURE__ */ jsx(Form.ErrorMessage, {})
           ] })
         }
@@ -135,15 +131,30 @@ CreateCommissionRuleCommission._tabMeta = defineTabMeta({
 });
 
 // src/pages/commissions/commission-rule-create/components/create-commission-rule-form/create-commission-rule-details.tsx
-import { Heading as Heading2, Input, Select as Select2 } from "@medusajs/ui";
+import { Heading as Heading2, Input } from "@medusajs/ui";
 import { useTranslation as useTranslation2 } from "react-i18next";
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var CreateCommissionRuleDetails = () => {
   const { t } = useTranslation2();
   const form = useTabbedForm();
-  const direction = useDocumentDirection();
   const scopeType = form.watch("scopeType");
   const dimensions = SCOPE_TYPE_DIMENSIONS[scopeType];
+  const scopeTypeOptions = [
+    { value: "store", label: t("commissions.fields.scopeType.store") },
+    {
+      value: "product_type",
+      label: t("commissions.fields.scopeType.productType")
+    },
+    { value: "category", label: t("commissions.fields.scopeType.category") },
+    {
+      value: "store_product_type",
+      label: t("commissions.fields.scopeType.storeProductType")
+    },
+    {
+      value: "store_category",
+      label: t("commissions.fields.scopeType.storeCategory")
+    }
+  ];
   const stores = useComboboxData({
     queryKey: ["commission_stores"],
     queryFn: (params) => sdk.admin.sellers.query({ ...params }),
@@ -183,30 +194,41 @@ var CreateCommissionRuleDetails = () => {
           ] })
         }
       ),
+      /* @__PURE__ */ jsx2(
+        Form.Field,
+        {
+          control: form.control,
+          name: "code",
+          render: ({ field }) => /* @__PURE__ */ jsxs2(Form.Item, { children: [
+            /* @__PURE__ */ jsx2(Form.Label, { children: t("commissions.fields.code") }),
+            /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsx2(
+              Input,
+              {
+                autoComplete: "off",
+                "data-testid": "commission-rule-code-input",
+                ...field
+              }
+            ) }),
+            /* @__PURE__ */ jsx2(Form.ErrorMessage, {})
+          ] })
+        }
+      ),
       /* @__PURE__ */ jsx2(
         Form.Field,
         {
           control: form.control,
           name: "scopeType",
-          render: ({ field: { onChange, ref, ...field } }) => /* @__PURE__ */ jsxs2(Form.Item, { children: [
+          render: ({ field }) => /* @__PURE__ */ jsxs2(Form.Item, { children: [
             /* @__PURE__ */ jsx2(Form.Label, { children: t("commissions.fields.scopeType.label") }),
-            /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsxs2(Select2, { ...field, onValueChange: onChange, dir: direction, children: [
-              /* @__PURE__ */ jsx2(
-                Select2.Trigger,
-                {
-                  ref,
-                  "data-testid": "commission-rule-scope-type-select",
-                  children: /* @__PURE__ */ jsx2(Select2.Value, {})
-                }
-              ),
-              /* @__PURE__ */ jsxs2(Select2.Content, { children: [
-                /* @__PURE__ */ jsx2(Select2.Item, { value: "store", children: t("commissions.fields.scopeType.store") }),
-                /* @__PURE__ */ jsx2(Select2.Item, { value: "product_type", children: t("commissions.fields.scopeType.productType") }),
-                /* @__PURE__ */ jsx2(Select2.Item, { value: "category", children: t("commissions.fields.scopeType.category") }),
-                /* @__PURE__ */ jsx2(Select2.Item, { value: "store_product_type", children: t("commissions.fields.scopeType.storeProductType") }),
-                /* @__PURE__ */ jsx2(Select2.Item, { value: "store_category", children: t("commissions.fields.scopeType.storeCategory") })
-              ] })
-            ] }) }),
+            /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsx2(
+              Combobox,
+              {
+                ...field,
+                options: scopeTypeOptions,
+                forceHideInput: true,
+                "data-testid": "commission-rule-scope-type-select"
+              }
+            ) }),
             /* @__PURE__ */ jsx2(Form.ErrorMessage, {})
           ] })
         }
@@ -221,11 +243,13 @@ var CreateCommissionRuleDetails = () => {
             /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsx2(
               Combobox,
               {
+                ...field,
+                value: field.value ?? [],
                 options: stores.options,
-                fetchNextPage: stores.fetchNextPage,
                 searchValue: stores.searchValue,
                 onSearchValueChange: stores.onSearchValueChange,
-                ...field
+                fetchNextPage: stores.fetchNextPage,
+                "data-testid": "commission-rule-stores-input"
               }
             ) }),
             /* @__PURE__ */ jsx2(Form.ErrorMessage, {})
@@ -242,11 +266,13 @@ var CreateCommissionRuleDetails = () => {
             /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsx2(
               Combobox,
               {
+                ...field,
+                value: field.value ?? [],
                 options: productTypes.options,
-                fetchNextPage: productTypes.fetchNextPage,
                 searchValue: productTypes.searchValue,
                 onSearchValueChange: productTypes.onSearchValueChange,
-                ...field
+                fetchNextPage: productTypes.fetchNextPage,
+                "data-testid": "commission-rule-product-types-input"
               }
             ) }),
             /* @__PURE__ */ jsx2(Form.ErrorMessage, {})
@@ -263,11 +289,13 @@ var CreateCommissionRuleDetails = () => {
             /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsx2(
               Combobox,
               {
+                ...field,
+                value: field.value ?? [],
                 options: categories.options,
-                fetchNextPage: categories.fetchNextPage,
                 searchValue: categories.searchValue,
                 onSearchValueChange: categories.onSearchValueChange,
-                ...field
+                fetchNextPage: categories.fetchNextPage,
+                "data-testid": "commission-rule-categories-input"
               }
             ) }),
             /* @__PURE__ */ jsx2(Form.ErrorMessage, {})
@@ -283,6 +311,7 @@ CreateCommissionRuleDetails._tabMeta = defineTabMeta(
     labelKey: "commissions.create.details",
     validationFields: [
       "title",
+      "code",
       "scopeType",
       "stores",
       "productTypes",
@@ -292,9 +321,11 @@ CreateCommissionRuleDetails._tabMeta = defineTabMeta(
 );
 
 // src/pages/commissions/commission-rule-create/components/create-commission-rule-form/schema.ts
+import i18n from "i18next";
 import * as zod from "zod";
-var CreateCommissionRuleSchema = zod.object({
-  title: zod.string().min(1, "Please enter a title"),
+var baseCommissionRuleSchema = zod.object({
+  title: zod.string().min(1, { message: i18n.t("commissions.validation.titleRequired") }),
+  code: zod.string().min(1, { message: i18n.t("commissions.validation.codeRequired") }),
   scopeType: zod.enum([
     "store",
     "product_type",
@@ -310,34 +341,48 @@ var CreateCommissionRuleSchema = zod.object({
   fixed_values: zod.record(zod.string(), zod.coerce.number()).optional(),
   include_tax: zod.boolean(),
   include_shipping: zod.boolean()
-}).superRefine((data, ctx) => {
+});
+var createCommissionRuleSchema = (currencies = []) => baseCommissionRuleSchema.superRefine((data, ctx) => {
   const dimensions = SCOPE_TYPE_DIMENSIONS[data.scopeType];
   if (dimensions.includes("seller") && data.stores.length === 0) {
     ctx.addIssue({
       code: zod.ZodIssueCode.custom,
       path: ["stores"],
-      message: "Please select at least one store"
+      message: i18n.t("commissions.validation.storesRequired")
     });
   }
   if (dimensions.includes("product_type") && data.productTypes.length === 0) {
     ctx.addIssue({
       code: zod.ZodIssueCode.custom,
       path: ["productTypes"],
-      message: "Please select at least one product type"
+      message: i18n.t("commissions.validation.productTypesRequired")
     });
   }
   if (dimensions.includes("product_category") && data.categories.length === 0) {
     ctx.addIssue({
       code: zod.ZodIssueCode.custom,
       path: ["categories"],
-      message: "Please select at least one category"
+      message: i18n.t("commissions.validation.categoriesRequired")
     });
   }
-  if (data.commissionType === "percentage" && (data.value === void 0 || Number.isNaN(data.value))) {
-    ctx.addIssue({
-      code: zod.ZodIssueCode.custom,
-      path: ["value"],
-      message: "Please enter a value."
+  if (data.commissionType === "percentage") {
+    if (data.value === void 0 || Number.isNaN(data.value)) {
+      ctx.addIssue({
+        code: zod.ZodIssueCode.custom,
+        path: ["value"],
+        message: i18n.t("commissions.validation.value")
+      });
+    }
+  } else {
+    currencies.forEach((code) => {
+      const amount = data.fixed_values?.[code];
+      if (amount === void 0 || Number.isNaN(amount)) {
+        ctx.addIssue({
+          code: zod.ZodIssueCode.custom,
+          path: ["fixed_values", code],
+          message: i18n.t("commissions.validation.value")
+        });
+      }
     });
   }
 });
@@ -348,9 +393,14 @@ var CreateCommissionRuleForm = () => {
   const { t } = useTranslation3();
   const { handleSuccess } = useRouteModal();
   const { currencies } = useStoreCurrencies();
+  const resolver = useMemo(
+    () => zodResolver(createCommissionRuleSchema(currencies)),
+    [currencies]
+  );
   const form = useForm({
     defaultValues: {
       title: "",
+      code: "",
       scopeType: "store",
       stores: [],
       productTypes: [],
@@ -361,7 +411,7 @@ var CreateCommissionRuleForm = () => {
       include_tax: false,
       include_shipping: false
     },
-    resolver: zodResolver(CreateCommissionRuleSchema)
+    resolver
   });
   const { mutateAsync, isPending } = useCreateCommissionRule();
   const handleSubmit = form.handleSubmit(async (values) => {
@@ -374,6 +424,7 @@ var CreateCommissionRuleForm = () => {
     await mutateAsync(
       {
         name: values.title,
+        code: values.code,
         type: values.commissionType,
         value: isFixed ? 0 : values.value,
         ...isFixed ? { values: buildValuesPayload(currencies, values.fixed_values) } : {},

package/dist/{commission-rule-edit-W5KIEYZY.js → commission-rule-edit-OWGW6HLN.js}

@@ -41,6 +41,7 @@ import "./chunk-NBMM2TZK.js";
 // src/pages/commissions/commission-rule-edit/commission-rule-edit.tsx
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button, Heading, Input, Select, toast } from "@medusajs/ui";
+import i18n from "i18next";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
@@ -49,7 +50,7 @@ import { jsx, jsxs } from "react/jsx-runtime";
 var EditCommissionRuleSchema = zod.object({
   status: zod.enum(["active", "inactive"]),
   name: zod.string().min(1),
-  code: zod.string().min(1),
+  code: zod.string().min(1, { message: i18n.t("commissions.validation.codeRequired") }),
   scopeType: zod.enum([
     "store",
     "product_type",

package/dist/{global-commission-edit-4HDRIZSC.js → global-commission-edit-444IQHQS.js}

@@ -1,12 +1,15 @@
 import {
   CommissionValueFields,
   useStoreCurrencies
-} from "./chunk-SINWGUXZ.js";
+} from "./chunk-55TMW3GW.js";
 import {
   buildValuesPayload,
   fixedValuesFromRate
 } from "./chunk-CGIVQ7D2.js";
 import "./chunk-MAEP2UCK.js";
+import {
+  Combobox
+} from "./chunk-AW77UWCZ.js";
 import {
   SwitchBox
 } from "./chunk-2EME4AWX.js";
@@ -28,9 +31,6 @@ import {
 } from "./chunk-ZIFHQXP3.js";
 import "./chunk-FXWKGNRV.js";
 import "./chunk-VDKOJ5WD.js";
-import {
-  useDocumentDirection
-} from "./chunk-Y7QKP6QU.js";
 import "./chunk-RHKRREUU.js";
 import "./chunk-ZA2KFUFR.js";
 import "./chunk-ZBWL72TB.js";
@@ -38,13 +38,14 @@ import "./chunk-NBMM2TZK.js";
 
 // src/pages/commissions/global-commission-edit/global-commission-edit.tsx
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Button, Heading, Input, Select, toast } from "@medusajs/ui";
+import { Button, Heading, Input, toast } from "@medusajs/ui";
+import i18n from "i18next";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import * as zod from "zod";
 import { jsx, jsxs } from "react/jsx-runtime";
 var EditGlobalCommissionSchema = zod.object({
-  code: zod.string().min(1),
+  code: zod.string().min(1, { message: i18n.t("commissions.validation.codeRequired") }),
   type: zod.enum(["percentage", "fixed"]),
   value: zod.coerce.number().optional(),
   fixed_values: zod.record(zod.string(), zod.coerce.number()).optional(),
@@ -55,15 +56,18 @@ var EditGlobalCommissionSchema = zod.object({
     ctx.addIssue({
       code: zod.ZodIssueCode.custom,
       path: ["value"],
-      message: "Please enter a value."
+      message: i18n.t("commissions.validation.valueRequired")
     });
   }
 });
 var EditGlobalCommissionForm = ({ rate }) => {
   const { t } = useTranslation();
   const { handleSuccess } = useRouteModal();
-  const direction = useDocumentDirection();
   const { currencies } = useStoreCurrencies();
+  const typeOptions = [
+    { value: "percentage", label: t("commissions.fields.type.percentage") },
+    { value: "fixed", label: t("commissions.fields.type.fixed") }
+  ];
   const form = useForm({
     defaultValues: {
       code: rate.code,
@@ -125,22 +129,17 @@ var EditGlobalCommissionForm = ({ rate }) => {
         {
           control: form.control,
           name: "type",
-          render: ({ field: { onChange, ref, ...field } }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
+          render: ({ field }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
             /* @__PURE__ */ jsx(Form.Label, { children: t("commissions.fields.type.label") }),
-            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsxs(Select, { ...field, onValueChange: onChange, dir: direction, children: [
-              /* @__PURE__ */ jsx(
-                Select.Trigger,
-                {
-                  ref,
-                  "data-testid": "global-commission-type-select",
-                  children: /* @__PURE__ */ jsx(Select.Value, {})
-                }
-              ),
-              /* @__PURE__ */ jsxs(Select.Content, { children: [
-                /* @__PURE__ */ jsx(Select.Item, { value: "percentage", children: t("commissions.fields.type.percentage") }),
-                /* @__PURE__ */ jsx(Select.Item, { value: "fixed", children: t("commissions.fields.type.fixed") })
-              ] })
-            ] }) }),
+            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsx(
+              Combobox,
+              {
+                ...field,
+                options: typeOptions,
+                forceHideInput: true,
+                "data-testid": "global-commission-type-select"
+              }
+            ) }),
             /* @__PURE__ */ jsx(Form.ErrorMessage, {})
           ] })
         }

package/dist/index.js

@@ -21,7 +21,7 @@ import "./chunk-KAZ5BYTQ.js";
 import "./chunk-PAYQJPGK.js";
 import {
   I18n
-} from "./chunk-4KLVH4XT.js";
+} from "./chunk-6IZ5YBWE.js";
 import {
   TabbedForm,
   defineTabMeta,
@@ -3476,7 +3476,7 @@ function getRouteMap({
                     children: [
                       {
                         path: "create",
-                        lazy: () => import("./product-create-RLFRPP6W.js")
+                        lazy: () => import("./product-create-JAZJIOHI.js")
                       },
                       {
                         path: "bulk-edit",
@@ -3540,7 +3540,7 @@ function getRouteMap({
                           },
                           {
                             path: "media",
-                            lazy: () => import("./product-media-NVYHJEI3.js")
+                            lazy: () => import("./product-media-ZG5KTNVK.js")
                           },
                           {
                             path: "variants/create",
@@ -3715,7 +3715,7 @@ function getRouteMap({
                           },
                           {
                             path: "billing-address",
-                            lazy: () => import("./order-edit-billing-address-5CV6WCIA.js")
+                            lazy: () => import("./order-edit-billing-address-Y55XBPZI.js")
                           },
                           {
                             path: "metadata/edit",
@@ -3736,7 +3736,7 @@ function getRouteMap({
                 children: [
                   {
                     path: "",
-                    lazy: () => import("./promotion-list-ONYUXHN3.js")
+                    lazy: () => import("./promotion-list-TVXL23BH.js")
                   },
                   {
                     path: "create",
@@ -3745,7 +3745,7 @@ function getRouteMap({
                   {
                     path: ":id",
                     lazy: async () => {
-                      const { Breadcrumb, loader } = await import("./promotion-detail-WAGO4GG4.js");
+                      const { Breadcrumb, loader } = await import("./promotion-detail-CPZLLTKU.js");
                       return {
                         Component: Outlet4,
                         loader,
@@ -3757,7 +3757,7 @@ function getRouteMap({
                     children: [
                       {
                         path: "",
-                        lazy: () => import("./promotion-detail-WAGO4GG4.js"),
+                        lazy: () => import("./promotion-detail-CPZLLTKU.js"),
                         children: [
                           {
                             path: "edit",
@@ -3796,7 +3796,7 @@ function getRouteMap({
                   {
                     path: ":id",
                     lazy: async () => {
-                      const { Breadcrumb, loader } = await import("./campaign-detail-E77T2QAI.js");
+                      const { Breadcrumb, loader } = await import("./campaign-detail-UIDRN6TA.js");
                       return {
                         Component: Outlet4,
                         loader,
@@ -3808,7 +3808,7 @@ function getRouteMap({
                     children: [
                       {
                         path: "",
-                        lazy: () => import("./campaign-detail-E77T2QAI.js"),
+                        lazy: () => import("./campaign-detail-UIDRN6TA.js"),
                         children: [
                           {
                             path: "edit",
@@ -3824,7 +3824,7 @@ function getRouteMap({
                           },
                           {
                             path: "add-promotions",
-                            lazy: () => import("./add-campaign-promotions-TSVKITKJ.js")
+                            lazy: () => import("./add-campaign-promotions-PBKYGW67.js")
                           }
                         ]
                       }
@@ -4103,7 +4103,7 @@ function getRouteMap({
                         children: [
                           {
                             path: "edit",
-                            lazy: () => import("./store-edit-W4PB6TBU.js")
+                            lazy: () => import("./store-edit-BRS7YYE5.js")
                           },
                           {
                             path: "edit-address",
@@ -4475,11 +4475,11 @@ function getRouteMap({
                     children: [
                       {
                         path: "create",
-                        lazy: () => import("./commission-rule-create-SCZ3PBTF.js")
+                        lazy: () => import("./commission-rule-create-A2N3JNUI.js")
                       },
                       {
                         path: "edit-global",
-                        lazy: () => import("./global-commission-edit-4HDRIZSC.js")
+                        lazy: () => import("./global-commission-edit-444IQHQS.js")
                       }
                     ]
                   },
@@ -4501,11 +4501,11 @@ function getRouteMap({
                         children: [
                           {
                             path: "edit",
-                            lazy: () => import("./commission-rule-edit-W5KIEYZY.js")
+                            lazy: () => import("./commission-rule-edit-OWGW6HLN.js")
                           },
                           {
                             path: "edit-commission",
-                            lazy: () => import("./commission-rule-commission-edit-L2F2PNRI.js")
+                            lazy: () => import("./commission-rule-commission-edit-AMJAHLPW.js")
                           }
                         ]
                       }
@@ -5071,7 +5071,7 @@ function getRouteMap({
                     children: [
                       {
                         path: "create",
-                        lazy: () => import("./tax-region-create-G24BSFF4.js")
+                        lazy: () => import("./tax-region-create-3RBWOWVG.js")
                       }
                     ]
                   },
@@ -5237,7 +5237,7 @@ function getRouteMap({
             },
             {
               path: "/reset-password",
-              lazy: () => import("./reset-password-VQ5PYBJ5.js")
+              lazy: () => import("./reset-password-WLZSNWHV.js")
             },
             {
               path: "/invite",

package/dist/{order-edit-billing-address-5CV6WCIA.js → order-edit-billing-address-Y55XBPZI.js}

@@ -9,7 +9,7 @@ import "./chunk-FMFVTERD.js";
 import "./chunk-JRTZWK77.js";
 import {
   i18n
-} from "./chunk-4KLVH4XT.js";
+} from "./chunk-6IZ5YBWE.js";
 import "./chunk-TKGWSUEI.js";
 import {
   KeyboundForm

package/dist/pages/index.js

@@ -192,11 +192,11 @@ import {
 import "../chunk-HINXQTCW.js";
 import {
   CampaignDetailPage
-} from "../chunk-2KOE4QV6.js";
+} from "../chunk-4DP2SPYG.js";
 import {
   PromotionListPage
-} from "../chunk-LOCIDCV2.js";
-import "../chunk-TY6PRG7C.js";
+} from "../chunk-VS4LCJLY.js";
+import "../chunk-XZRINNEK.js";
 import "../chunk-S2WEYEQR.js";
 import {
   CreatePromotionSchema,
@@ -207,9 +207,9 @@ import "../chunk-SKKF3CU6.js";
 import "../chunk-54TMLQH3.js";
 import {
   PromotionDetailPage
-} from "../chunk-XNCSX2EJ.js";
+} from "../chunk-QJSKG6JE.js";
 import "../chunk-RK5N3XIX.js";
-import "../chunk-7I7FFT4A.js";
+import "../chunk-3TZWLHMQ.js";
 import "../chunk-MAEP2UCK.js";
 import "../chunk-LHVXXHPO.js";
 import "../chunk-WQFFCK3R.js";
@@ -299,12 +299,12 @@ import "../chunk-KAZ5BYTQ.js";
 import "../chunk-PAYQJPGK.js";
 import {
   ProductCreatePage
-} from "../chunk-HTTJLQR3.js";
+} from "../chunk-3RKBBZGV.js";
 import "../chunk-IIFQ7KYL.js";
 import "../chunk-32URSQ4F.js";
 import {
   ProductCreateSchema
-} from "../chunk-M3BDFG5D.js";
+} from "../chunk-W6SVRN6P.js";
 import "../chunk-HJ56YXBU.js";
 import "../chunk-AJLGY3LQ.js";
 import "../chunk-SMQT3ZNO.js";
@@ -314,7 +314,7 @@ import "../chunk-B5OMHYJ5.js";
 import "../chunk-5KGMGL4N.js";
 import "../chunk-PYDRHQTY.js";
 import "../chunk-AW77UWCZ.js";
-import "../chunk-4KLVH4XT.js";
+import "../chunk-6IZ5YBWE.js";
 import "../chunk-FREUYHMS.js";
 import "../chunk-VSLHL2AZ.js";
 import "../chunk-2EME4AWX.js";

package/dist/{product-create-RLFRPP6W.js → product-create-JAZJIOHI.js}

@@ -1,9 +1,9 @@
 import {
   ProductCreate
-} from "./chunk-HTTJLQR3.js";
+} from "./chunk-3RKBBZGV.js";
 import "./chunk-IIFQ7KYL.js";
 import "./chunk-32URSQ4F.js";
-import "./chunk-M3BDFG5D.js";
+import "./chunk-W6SVRN6P.js";
 import "./chunk-HJ56YXBU.js";
 import "./chunk-AJLGY3LQ.js";
 import "./chunk-SMQT3ZNO.js";
@@ -13,7 +13,7 @@ import "./chunk-B5OMHYJ5.js";
 import "./chunk-5KGMGL4N.js";
 import "./chunk-PYDRHQTY.js";
 import "./chunk-AW77UWCZ.js";
-import "./chunk-4KLVH4XT.js";
+import "./chunk-6IZ5YBWE.js";
 import "./chunk-FREUYHMS.js";
 import "./chunk-VSLHL2AZ.js";
 import "./chunk-2EME4AWX.js";

package/dist/{product-media-NVYHJEI3.js → product-media-ZG5KTNVK.js}

@@ -3,10 +3,10 @@ import {
 } from "./chunk-32URSQ4F.js";
 import {
   EditProductMediaSchema
-} from "./chunk-M3BDFG5D.js";
+} from "./chunk-W6SVRN6P.js";
 import "./chunk-AJLGY3LQ.js";
 import "./chunk-SMQT3ZNO.js";
-import "./chunk-4KLVH4XT.js";
+import "./chunk-6IZ5YBWE.js";
 import "./chunk-VSLHL2AZ.js";
 import "./chunk-TKGWSUEI.js";
 import {

package/dist/{promotion-detail-WAGO4GG4.js → promotion-detail-CPZLLTKU.js}

@@ -1,13 +1,13 @@
 import {
   PromotionDetailPage
-} from "./chunk-XNCSX2EJ.js";
+} from "./chunk-QJSKG6JE.js";
 import "./chunk-RK5N3XIX.js";
-import "./chunk-7I7FFT4A.js";
+import "./chunk-3TZWLHMQ.js";
 import "./chunk-QDPLZDMX.js";
 import "./chunk-XSX255FK.js";
 import "./chunk-FMFVTERD.js";
 import "./chunk-PAYQJPGK.js";
-import "./chunk-4KLVH4XT.js";
+import "./chunk-6IZ5YBWE.js";
 import "./chunk-E74OUNA3.js";
 import "./chunk-H6MYB7GB.js";
 import "./chunk-UZWFZMOX.js";

package/dist/{promotion-list-ONYUXHN3.js → promotion-list-TVXL23BH.js}

@@ -1,9 +1,9 @@
 import {
   PromotionListPage
-} from "./chunk-LOCIDCV2.js";
-import "./chunk-TY6PRG7C.js";
+} from "./chunk-VS4LCJLY.js";
+import "./chunk-XZRINNEK.js";
 import "./chunk-S2WEYEQR.js";
-import "./chunk-7I7FFT4A.js";
+import "./chunk-3TZWLHMQ.js";
 import "./chunk-JHIMVLB2.js";
 import "./chunk-FMFVTERD.js";
 import "./chunk-DB6ANJBO.js";
@@ -13,7 +13,7 @@ import "./chunk-JGCGVEFZ.js";
 import "./chunk-YN3FGNJM.js";
 import "./chunk-KAZ5BYTQ.js";
 import "./chunk-PAYQJPGK.js";
-import "./chunk-4KLVH4XT.js";
+import "./chunk-6IZ5YBWE.js";
 import "./chunk-E74OUNA3.js";
 import "./chunk-H6MYB7GB.js";
 import "./chunk-UZWFZMOX.js";

package/dist/{reset-password-VQ5PYBJ5.js → reset-password-WLZSNWHV.js}

@@ -5,7 +5,7 @@ import "./chunk-U2EI2ZLM.js";
 import "./chunk-FMFVTERD.js";
 import {
   i18n
-} from "./chunk-4KLVH4XT.js";
+} from "./chunk-6IZ5YBWE.js";
 import {
   Form
 } from "./chunk-3QSRE5LS.js";

package/dist/{store-edit-W4PB6TBU.js → store-edit-BRS7YYE5.js}

@@ -1,12 +1,12 @@
 import {
   MediaSchema
-} from "./chunk-M3BDFG5D.js";
+} from "./chunk-W6SVRN6P.js";
 import {
   HandleInput
 } from "./chunk-HJ56YXBU.js";
 import "./chunk-AJLGY3LQ.js";
 import "./chunk-SMQT3ZNO.js";
-import "./chunk-4KLVH4XT.js";
+import "./chunk-6IZ5YBWE.js";
 import {
   FileUpload
 } from "./chunk-VSLHL2AZ.js";

package/dist/{tax-region-create-G24BSFF4.js → tax-region-create-3RBWOWVG.js}

@@ -19,7 +19,7 @@ import {
 } from "./chunk-AW77UWCZ.js";
 import {
   i18n
-} from "./chunk-4KLVH4XT.js";
+} from "./chunk-6IZ5YBWE.js";
 import "./chunk-TKGWSUEI.js";
 import {
   KeyboundForm

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercurjs/admin",
-  "version": "2.2.0-canary.27",
+  "version": "2.2.0-canary.29",
   "repository": {
     "type": "git",
     "url": "https://github.com/mercurjs/mercur",