@mercurjs/admin 2.2.0-canary.35 → 2.2.0-canary.37

package/dist/{chunk-UULZCRTC.js → chunk-RZ43M34Q.js}

@@ -21,7 +21,7 @@ import {
 } from "./chunk-MDABSESI.js";
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";

package/dist/{chunk-4ZXFOBOB.js → chunk-SWQC5UPD.js}

@@ -6,14 +6,14 @@ import {
   PriceListRulesSchema,
   usePriceListCurrencyData,
   usePriceListGridColumns
-} from "./chunk-3OZRK7TN.js";
+} from "./chunk-OTXOV6YU.js";
 import {
   exctractPricesFromProducts,
   isProductRow
 } from "./chunk-U5MJIHLY.js";
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";
@@ -27,7 +27,7 @@ import {
 } from "./chunk-FREUYHMS.js";
 import {
   DataGrid
-} from "./chunk-HHW4PPNH.js";
+} from "./chunk-4OCWOY2F.js";
 import {
   RouteFocusModal,
   StackedFocusModal,

package/dist/{chunk-7WUQR3ZU.js → chunk-U725ING6.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-RK5N3XIX.js";
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";

package/dist/{chunk-T2WVIET2.js → chunk-VM56ZITS.js}

@@ -158,6 +158,8 @@ import {
   EllipsisHorizontal,
   InformationCircleSolid,
   Photo,
+  QueueList,
+  StackPerspective,
   ThumbnailBadge,
   Trash,
   XMark as XMark2
@@ -288,7 +290,7 @@ var CollectionMediaItemMenu = ({
       /* @__PURE__ */ jsx3(
         MenuItemWithTooltip,
         {
-          icon: /* @__PURE__ */ jsx3(ThumbnailBadge, {}),
+          icon: /* @__PURE__ */ jsx3(StackPerspective, {}),
           label: item.is_thumbnail ? t("collections.media.actions.removeThumbnail") : t("collections.media.actions.setThumbnail"),
           tooltip: t("collections.media.tooltips.thumbnail"),
           onClick: onToggleThumbnail
@@ -297,7 +299,7 @@ var CollectionMediaItemMenu = ({
       /* @__PURE__ */ jsx3(
         MenuItemWithTooltip,
         {
-          icon: /* @__PURE__ */ jsx3(ListBadge, {}),
+          icon: /* @__PURE__ */ jsx3(QueueList, {}),
           label: item.is_banner ? t("collections.media.actions.removeBanner") : t("collections.media.actions.setBanner"),
           tooltip: t("collections.media.tooltips.banner"),
           onClick: onToggleBanner

package/dist/{chunk-TFDRETCH.js → chunk-X3TWPSUM.js}

@@ -1,10 +1,10 @@
 import {
   getCollectionGallery,
   getCollectionIcon
-} from "./chunk-T2WVIET2.js";
+} from "./chunk-VM56ZITS.js";
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";
@@ -425,27 +425,23 @@ var useColumns = () => {
     () => [
       columnHelper.display({
         id: "select",
-        header: ({ table }) => {
-          return /* @__PURE__ */ jsx4(
-            Checkbox,
-            {
-              checked: table.getIsSomePageRowsSelected() ? "indeterminate" : table.getIsAllPageRowsSelected(),
-              onCheckedChange: (value) => table.toggleAllPageRowsSelected(!!value)
-            }
-          );
-        },
-        cell: ({ row }) => {
-          return /* @__PURE__ */ jsx4(
-            Checkbox,
-            {
-              checked: row.getIsSelected(),
-              onCheckedChange: (value) => row.toggleSelected(!!value),
-              onClick: (e) => {
-                e.stopPropagation();
-              }
-            }
-          );
-        }
+        header: ({ table }) => /* @__PURE__ */ jsx4(
+          Checkbox,
+          {
+            checked: table.getIsSomePageRowsSelected() ? "indeterminate" : table.getIsAllPageRowsSelected(),
+            onCheckedChange: (value) => table.toggleAllPageRowsSelected(!!value),
+            "data-testid": "products-table-header-select-checkbox"
+          }
+        ),
+        cell: ({ row }) => /* @__PURE__ */ jsx4(
+          Checkbox,
+          {
+            checked: row.getIsSelected(),
+            onCheckedChange: (value) => row.toggleSelected(!!value),
+            onClick: (e) => e.stopPropagation(),
+            "data-testid": `products-table-cell-${row.id}-select-checkbox`
+          }
+        )
       }),
       ...columns,
       columnHelper.display({

package/dist/{chunk-NX3YQW2B.js → chunk-XEB5I2KE.js}

@@ -4,7 +4,7 @@ import {
   ShippingOptionPriceProvider,
   buildShippingOptionPriceRules,
   useShippingOptionPriceColumns
-} from "./chunk-GQUGCSJV.js";
+} from "./chunk-2MRYNLVT.js";
 import {
   CONDITIONAL_PRICES_STACKED_MODAL_ID,
   ShippingOptionPriceType
@@ -31,7 +31,7 @@ import {
 } from "./chunk-2EME4AWX.js";
 import {
   DataGrid
-} from "./chunk-HHW4PPNH.js";
+} from "./chunk-4OCWOY2F.js";
 import {
   RouteFocusModal,
   StackedFocusModal,

package/dist/{chunk-C45OXCZW.js → chunk-YRGPQ2C4.js}

@@ -1,6 +1,6 @@
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";
@@ -31,7 +31,14 @@ import { Children as Children2 } from "react";
 
 // src/pages/products/product-list/components/product-list-table/product-list-table.tsx
 import { PencilSquare, Trash } from "@medusajs/icons";
-import { Button, Container, Heading, toast, usePrompt } from "@medusajs/ui";
+import {
+  Button,
+  Checkbox,
+  Container,
+  Heading,
+  toast,
+  usePrompt
+} from "@medusajs/ui";
 import { keepPreviousData } from "@tanstack/react-query";
 import { createColumnHelper } from "@tanstack/react-table";
 import { useMemo, useState, Children } from "react";
@@ -261,6 +268,26 @@ var useColumns = () => {
   const base = useProductTableColumns();
   const columns = useMemo(
     () => [
+      columnHelper.display({
+        id: "select",
+        header: ({ table }) => /* @__PURE__ */ jsx(
+          Checkbox,
+          {
+            checked: table.getIsSomePageRowsSelected() ? "indeterminate" : table.getIsAllPageRowsSelected(),
+            onCheckedChange: (value) => table.toggleAllPageRowsSelected(!!value),
+            "data-testid": "products-table-header-select-checkbox"
+          }
+        ),
+        cell: ({ row }) => /* @__PURE__ */ jsx(
+          Checkbox,
+          {
+            checked: row.getIsSelected(),
+            onCheckedChange: (value) => row.toggleSelected(!!value),
+            onClick: (e) => e.stopPropagation(),
+            "data-testid": `products-table-cell-${row.id}-select-checkbox`
+          }
+        )
+      }),
       ...base,
       columnHelper.display({
         id: "actions",

package/dist/{chunk-KW5DS5GL.js → chunk-ZDEIYWCK.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-AJLGY3LQ.js";
 import {
   i18n
-} from "./chunk-HOUYHVRG.js";
+} from "./chunk-6YEVK7JJ.js";
 import {
   require_dist
 } from "./chunk-YZBEJ3CY.js";
@@ -220,7 +220,9 @@ var ProductCreateVariantSchema = z.object({
   variant_rank: z.number()
 });
 var ProductCreateSchema = z.object({
-  title: z.string().min(1),
+  title: z.string().min(1, {
+    message: i18n.t("products.create.errors.requiredTitle")
+  }),
   subtitle: z.string().optional(),
   handle: z.string().optional(),
   description: z.string().optional(),
@@ -228,7 +230,7 @@ var ProductCreateSchema = z.object({
   globally_available: z.boolean(),
   type_id: z.string().optional(),
   collection_id: z.string().optional(),
-  category_id: z.string().min(1),
+  category_id: z.string().min(1, i18n.t("products.create.errors.requiredCategory")),
   seller_ids: z.array(z.string()).optional(),
   tags: z.array(z.string()).optional(),
   origin_country: z.string().optional(),
@@ -266,10 +268,18 @@ var ProductCreateSchema = z.object({
     if (!attr.is_required) return;
     const isEmpty = attr.values === void 0 || attr.values === "" || Array.isArray(attr.values) && attr.values.length === 0;
     if (isEmpty) {
+      let messageKey = "products.create.errors.requiredAttribute";
+      if (attr.type === "single_select" || attr.type === "toggle") {
+        messageKey = "products.create.errors.requiredAttributeSelect";
+      } else if (attr.type === "multi_select") {
+        messageKey = "products.create.errors.requiredAttributeMultiSelect";
+      } else if (attr.type === "text" || attr.type === "unit") {
+        messageKey = "products.create.errors.requiredAttributeEnter";
+      }
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
         path: [`attributes.${index}.values`],
-        message: i18n.t("products.create.errors.requiredAttribute")
+        message: i18n.t(messageKey)
       });
     }
   });

package/dist/{collection-add-products-E7YLYPY5.js → collection-add-products-2G37ZL2J.js}

@@ -1,6 +1,6 @@
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import "./chunk-WBSUHLO7.js";
 import {
   useProductTableFilters

package/dist/{collection-create-T6HBO4LU.js → collection-create-5IGFVQKE.js}

@@ -3,7 +3,7 @@ import {
   CollectionIconTip,
   CollectionMediaInput,
   uploadCollectionImages
-} from "./chunk-T2WVIET2.js";
+} from "./chunk-VM56ZITS.js";
 import {
   HandleInput
 } from "./chunk-HJ56YXBU.js";

package/dist/{collection-detail-M4ETYKBU.js → collection-detail-AB6HGJDM.js}

@@ -1,8 +1,8 @@
 import {
   CollectionDetailPage
-} from "./chunk-TFDRETCH.js";
-import "./chunk-T2WVIET2.js";
-import "./chunk-SU444Q24.js";
+} from "./chunk-X3TWPSUM.js";
+import "./chunk-VM56ZITS.js";
+import "./chunk-O53E5U52.js";
 import "./chunk-WBSUHLO7.js";
 import "./chunk-P4LTLPTK.js";
 import "./chunk-FWPGOIFA.js";

package/dist/{collection-icon-edit-VZP3W6AZ.js → collection-icon-edit-WCSKUDXE.js}

@@ -3,7 +3,7 @@ import {
   CollectionIconTip,
   getCollectionIcon,
   uploadCollectionImages
-} from "./chunk-T2WVIET2.js";
+} from "./chunk-VM56ZITS.js";
 import "./chunk-VSLHL2AZ.js";
 import "./chunk-TKGWSUEI.js";
 import {

package/dist/{collection-list-RSFOKJBX.js → collection-list-UHFUKA5U.js}

@@ -1,7 +1,7 @@
 import {
   CollectionListPage
-} from "./chunk-YAOYZQDK.js";
-import "./chunk-P4GIBTTG.js";
+} from "./chunk-KUKBV4XN.js";
+import "./chunk-5BSSIDW6.js";
 import "./chunk-KOURHC2N.js";
 import "./chunk-2ZFELO2L.js";
 import "./chunk-26OOAKQ6.js";
@@ -9,7 +9,7 @@ import "./chunk-ZQZHFMD7.js";
 import "./chunk-C4N5EJAD.js";
 import "./chunk-OI4DJXUL.js";
 import "./chunk-HGTPUAHD.js";
-import "./chunk-T2WVIET2.js";
+import "./chunk-VM56ZITS.js";
 import "./chunk-S2WEYEQR.js";
 import "./chunk-WKTRJNOK.js";
 import "./chunk-MG4GKUJW.js";
@@ -20,7 +20,7 @@ import "./chunk-7SVLKK6Q.js";
 import "./chunk-GR6JUIRU.js";
 import "./chunk-QUHSHIAC.js";
 import "./chunk-3XOE4NV5.js";
-import "./chunk-PVZBDWLK.js";
+import "./chunk-GRH7C3QN.js";
 import "./chunk-DY3XQPHC.js";
 import "./chunk-JHIMVLB2.js";
 import "./chunk-P4LTLPTK.js";

package/dist/{collection-media-3Z2RJDVG.js → collection-media-YIV5BV3Y.js}

@@ -2,7 +2,7 @@ import {
   COLLECTION_IMAGE_FORMATS,
   getCollectionGallery,
   uploadCollectionImages
-} from "./chunk-T2WVIET2.js";
+} from "./chunk-VM56ZITS.js";
 import {
   FileUpload
 } from "./chunk-VSLHL2AZ.js";

package/dist/{commission-rule-commission-edit-6675TZCZ.js → commission-rule-commission-edit-EXLLNUKM.js}

@@ -1,7 +1,9 @@
 import {
   CommissionValueFields,
+  addCommissionValueIssues,
+  optionalAmount,
   useStoreCurrencies
-} from "./chunk-R3YD5UOZ.js";
+} from "./chunk-CU4UVEHX.js";
 import {
   buildValuesPayload,
   fixedValuesFromRate
@@ -39,6 +41,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, toast } from "@medusajs/ui";
+import { useMemo } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
@@ -46,11 +49,19 @@ import * as zod from "zod";
 import { jsx, jsxs } from "react/jsx-runtime";
 var EditCommissionSchema = zod.object({
   type: zod.enum(["percentage", "fixed"]),
-  value: zod.coerce.number().min(0),
-  fixed_values: zod.record(zod.string(), zod.coerce.number()).optional(),
+  value: optionalAmount,
+  fixed_values: zod.record(zod.string(), optionalAmount).optional(),
   include_tax: zod.boolean(),
   include_shipping: zod.boolean()
 });
+var createEditCommissionSchema = (currencies) => EditCommissionSchema.superRefine((data, ctx) => {
+  addCommissionValueIssues(ctx, {
+    type: data.type,
+    value: data.value,
+    fixedValues: data.fixed_values,
+    currencies
+  });
+});
 var EditCommissionForm = ({ rule }) => {
   const { t } = useTranslation();
   const { handleSuccess } = useRouteModal();
@@ -59,6 +70,10 @@ var EditCommissionForm = ({ rule }) => {
     { value: "percentage", label: t("commissions.fields.type.percentage") },
     { value: "fixed", label: t("commissions.fields.type.fixed") }
   ];
+  const resolver = useMemo(
+    () => zodResolver(createEditCommissionSchema(currencies)),
+    [currencies]
+  );
   const form = useForm({
     defaultValues: {
       type: rule.type,
@@ -67,7 +82,7 @@ var EditCommissionForm = ({ rule }) => {
       include_tax: rule.include_tax,
       include_shipping: rule.include_shipping
     },
-    resolver: zodResolver(EditCommissionSchema)
+    resolver
   });
   const { mutateAsync, isPending } = useUpdateCommissionRule(rule.id);
   const handleSubmit = form.handleSubmit(async (values) => {

package/dist/{commission-rule-create-PEYCFGCW.js → commission-rule-create-3MCNOSWN.js}

@@ -1,7 +1,9 @@
 import {
   CommissionValueFields,
+  addCommissionValueIssues,
+  optionalAmount,
   useStoreCurrencies
-} from "./chunk-R3YD5UOZ.js";
+} from "./chunk-CU4UVEHX.js";
 import "./chunk-QR3GYYX6.js";
 import {
   SCOPE_TYPE_DIMENSIONS,
@@ -323,13 +325,6 @@ 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 optionalAmount = zod.preprocess((val) => {
-  if (val === "" || val === null || val === void 0) {
-    return void 0;
-  }
-  const parsed = typeof val === "number" ? val : Number(val);
-  return Number.isNaN(parsed) ? void 0 : parsed;
-}, zod.number().optional());
 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") }),
@@ -372,26 +367,12 @@ var createCommissionRuleSchema = (currencies = []) => baseCommissionRuleSchema.s
       message: i18n.t("commissions.validation.categoriesRequired")
     });
   }
-  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")
-        });
-      }
-    });
-  }
+  addCommissionValueIssues(ctx, {
+    type: data.commissionType,
+    value: data.value,
+    fixedValues: data.fixed_values,
+    currencies
+  });
 });
 
 // src/pages/commissions/commission-rule-create/components/create-commission-rule-form/create-commission-rule-form.tsx

package/dist/{commission-rule-edit-GCI67KZU.js → commission-rule-edit-X45EQ6BK.js}

@@ -49,7 +49,7 @@ import * as zod from "zod";
 import { jsx, jsxs } from "react/jsx-runtime";
 var EditCommissionRuleSchema = zod.object({
   status: zod.enum(["active", "inactive"]),
-  name: zod.string().min(1),
+  name: 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",
@@ -61,6 +61,29 @@ var EditCommissionRuleSchema = zod.object({
   stores: zod.array(zod.string()),
   productTypes: zod.array(zod.string()),
   categories: zod.array(zod.string())
+}).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: i18n.t("commissions.validation.storesRequired")
+    });
+  }
+  if (dimensions.includes("product_type") && data.productTypes.length === 0) {
+    ctx.addIssue({
+      code: zod.ZodIssueCode.custom,
+      path: ["productTypes"],
+      message: i18n.t("commissions.validation.productTypesRequired")
+    });
+  }
+  if (dimensions.includes("product_category") && data.categories.length === 0) {
+    ctx.addIssue({
+      code: zod.ZodIssueCode.custom,
+      path: ["categories"],
+      message: i18n.t("commissions.validation.categoriesRequired")
+    });
+  }
 });
 var EditCommissionRuleForm = ({ rule }) => {
   const { t } = useTranslation();

package/dist/{customer-detail-QH4IXPIR.js → customer-detail-ZYJDB47Y.js}

@@ -1,8 +1,9 @@
 import {
   CustomerDetailPage
-} from "./chunk-CASK2IOQ.js";
+} from "./chunk-HMKXCYCJ.js";
 import "./chunk-54EPH67T.js";
 import "./chunk-OI4DJXUL.js";
+import "./chunk-FU3QYH6H.js";
 import "./chunk-QUHSHIAC.js";
 import "./chunk-3XOE4NV5.js";
 import "./chunk-TZSOL34K.js";

package/dist/{customer-group-add-customers-EOS25HL4.js → customer-group-add-customers-GSEUGBTJ.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-HGTPUAHD.js";
 import {
   useCustomerTableQuery
-} from "./chunk-PVZBDWLK.js";
+} from "./chunk-GRH7C3QN.js";
 import "./chunk-25LYVP3C.js";
 import "./chunk-DB6ANJBO.js";
 import "./chunk-PHOCVOZ5.js";

package/dist/{customer-group-detail-XQOG6SZY.js → customer-group-detail-5VSUJTR3.js}

@@ -1,10 +1,10 @@
 import {
   CUSTOMER_GROUP_DETAIL_FIELDS,
   CustomerGroupDetailPage
-} from "./chunk-LNOZHSZV.js";
+} from "./chunk-EMW5WXXR.js";
 import "./chunk-QG6PLWNH.js";
 import "./chunk-HGTPUAHD.js";
-import "./chunk-PVZBDWLK.js";
+import "./chunk-GRH7C3QN.js";
 import "./chunk-25LYVP3C.js";
 import "./chunk-DB6ANJBO.js";
 import "./chunk-PHOCVOZ5.js";

package/dist/{customer-list-ELN5NIKN.js → customer-list-6PRFTWMO.js}

@@ -1,9 +1,9 @@
 import {
   CustomerListPage
-} from "./chunk-TJ5IONZX.js";
+} from "./chunk-5YWQDIVG.js";
 import "./chunk-QG6PLWNH.js";
 import "./chunk-HGTPUAHD.js";
-import "./chunk-PVZBDWLK.js";
+import "./chunk-GRH7C3QN.js";
 import "./chunk-25LYVP3C.js";
 import "./chunk-DB6ANJBO.js";
 import "./chunk-PHOCVOZ5.js";

package/dist/{customers-add-customer-group-PJ24V5YA.js → customers-add-customer-group-56GS7TR7.js}

@@ -158,9 +158,10 @@ var AddCustomerGroupsForm = ({
     setIsPending(true);
     try {
       await batchCustomerCustomerGroups({ add: data.customer_group_ids });
+      const names = data.customer_group_ids.map((id) => customer_groups?.find((g) => g.id === id)?.name).filter(Boolean);
       toast.success(
-        t("customers.groups.add.success", {
-          groups: data.customer_group_ids.map((id) => customer_groups?.find((g) => g.id === id)).filter(Boolean).map((cg) => cg?.name)
+        names.length === 1 ? t("customers.groups.add.successOne", { groups: names[0] }) : t("customers.groups.add.successMany", {
+          groups: names.join(", ")
         })
       );
       handleSuccess(`/customers/${customerId}`);

package/dist/{global-commission-edit-AOZ6XLH7.js → global-commission-edit-7ZMMIV7B.js}

@@ -1,7 +1,9 @@
 import {
   CommissionValueFields,
+  addCommissionValueIssues,
+  optionalAmount,
   useStoreCurrencies
-} from "./chunk-R3YD5UOZ.js";
+} from "./chunk-CU4UVEHX.js";
 import {
   buildValuesPayload,
   fixedValuesFromRate
@@ -40,6 +42,7 @@ import "./chunk-NBMM2TZK.js";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button, Heading, Input, toast } from "@medusajs/ui";
 import i18n from "i18next";
+import { useMemo } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import * as zod from "zod";
@@ -47,18 +50,18 @@ import { jsx, jsxs } from "react/jsx-runtime";
 var EditGlobalCommissionSchema = zod.object({
   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(),
+  value: optionalAmount,
+  fixed_values: zod.record(zod.string(), optionalAmount).optional(),
   include_tax: zod.boolean(),
   include_shipping: zod.boolean()
-}).superRefine((data, ctx) => {
-  if (data.type === "percentage" && (data.value === void 0 || Number.isNaN(data.value))) {
-    ctx.addIssue({
-      code: zod.ZodIssueCode.custom,
-      path: ["value"],
-      message: i18n.t("commissions.validation.valueRequired")
-    });
-  }
+});
+var createEditGlobalCommissionSchema = (currencies) => EditGlobalCommissionSchema.superRefine((data, ctx) => {
+  addCommissionValueIssues(ctx, {
+    type: data.type,
+    value: data.value,
+    fixedValues: data.fixed_values,
+    currencies
+  });
 });
 var EditGlobalCommissionForm = ({ rate }) => {
   const { t } = useTranslation();
@@ -68,6 +71,10 @@ var EditGlobalCommissionForm = ({ rate }) => {
     { value: "percentage", label: t("commissions.fields.type.percentage") },
     { value: "fixed", label: t("commissions.fields.type.fixed") }
   ];
+  const resolver = useMemo(
+    () => zodResolver(createEditGlobalCommissionSchema(currencies)),
+    [currencies]
+  );
   const form = useForm({
     defaultValues: {
       code: rate.code,
@@ -77,7 +84,7 @@ var EditGlobalCommissionForm = ({ rate }) => {
       include_tax: rate.include_tax,
       include_shipping: rate.include_shipping
     },
-    resolver: zodResolver(EditGlobalCommissionSchema)
+    resolver
   });
   const { mutateAsync, isPending } = useUpdateCommissionRule(rate.id);
   const handleSubmit = form.handleSubmit(async (values) => {