@12-apps/discounts 1.19.0 → 1.19.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@12-apps/discounts",
-  "version": "1.19.0",
+  "version": "1.19.2",
   "type": "module",
   "sideEffects": [
     "**/e2e/**"
@@ -44,7 +44,7 @@
     "@12-apps/app-shell": "^5.14.1",
     "@12-apps/forms-core": "^1.23.0",
     "@12-apps/shared-helpers": "^2.2.0",
-    "@12-apps/ui": "^6.96.0",
+    "@12-apps/ui": "^6.96.2",
     "@mui/icons-material": "^6.5.0",
     "zod": "^4.3.5"
   },

package/src/react/discount-form-validate.ts

@@ -142,6 +142,20 @@ function checkCombo(
   values: DiscountFormValues,
   slots: readonly ComboRequirement[],
   copy: DiscountsWebCopy,
+): Record<string, string> {
+  const errors = checkComboKind(values, slots, copy);
+  // Recorded apart from `errors.kind`, which holds only ONE message: a bad
+  // quantity wins it, and the product line under the builder must still show.
+  if (values.kind === "FREE_UNITS" && slots.every((slot) => slot.menuItemIds.length === 0)) {
+    errors.freeUnitsTargets = copy.form.freeUnitsTargetRequired;
+  }
+  return errors;
+}
+
+function checkComboKind(
+  values: DiscountFormValues,
+  slots: readonly ComboRequirement[],
+  copy: DiscountsWebCopy,
 ): Record<string, string> {
   if (!isComboKind(values.kind)) return {};
   // "Leve 3, pague 2" is one group of products, so it is refused in those words

package/src/react/discount-target-picker.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import type { JSX } from "react";
+import { useEffect, type JSX } from "react";
 
 import { useFormContext } from "@12-apps/ui/form/total-form";
 
@@ -87,6 +87,23 @@ export function DiscountTargetPicker({
   const { values, errors, setFieldValue } = useFormContext();
   const kind = values.kind ?? "PERCENTAGE";
   const scope = values.scope ?? "ORDER";
+  const staleTargets = errors.freeUnitsTargets !== undefined;
+
+  const picked = selection.comboRequirements.some((slot) => slot.menuItemIds.length > 0);
+  const productRefusal = errors.kind === copy.form.freeUnitsTargetRequired;
+
+  // `setFieldValue` clears only the key it sets, and neither the kind toggle
+  // nor a pick sets `freeUnitsTargets`: the product refusal would outlive a
+  // switch away, or the product the owner then picks, and keep the error toast
+  // up. Setting its own key drops it; the value is never read or sent. A pick
+  // also drops the same refusal from `errors.kind` (re-setting the kind it
+  // already has), but never a quantity refusal held there (FUT-4470).
+  useEffect(() => {
+    const answered = kind !== "FREE_UNITS" || picked;
+    if (!answered) return;
+    if (staleTargets) setFieldValue("freeUnitsTargets", "");
+    if (kind === "FREE_UNITS" && productRefusal) setFieldValue("kind", kind);
+  }, [kind, picked, staleTargets, productRefusal, setFieldValue]);
 
   if (kind === "FREE_UNITS") {
     return (
@@ -96,6 +113,7 @@ export function DiscountTargetPicker({
         copy={copy}
         freeUnits={values.freeUnits ?? ""}
         error={errors.freeUnits}
+        targetRefused={staleTargets}
         onChange={selection.onComboRequirementsChange}
         onFreeUnitsChange={(next) => setFieldValue("freeUnits", next)}
       />

package/src/react/free-units-builder.tsx

@@ -116,6 +116,7 @@ export function FreeUnitsBuilder({
   copy,
   freeUnits,
   error,
+  targetRefused,
   onChange,
   onFreeUnitsChange,
 }: {
@@ -130,6 +131,8 @@ export function FreeUnitsBuilder({
    * this itself, but it would also sit outside the sentence it belongs to.
    */
   error: string | undefined;
+  /** Criar/Salvar refused the product list; the message waits for it. */
+  targetRefused: boolean;
   onChange: (next: ComboRequirement[]) => void;
   onFreeUnitsChange: (next: string) => void;
 }): JSX.Element | null {
@@ -138,8 +141,6 @@ export function FreeUnitsBuilder({
 
   const slot = onlySlot(slots);
   const summary = summaryOf(slot.quantity, Number(freeUnits), copy);
-  const empty = slot.menuItemIds.length === 0;
-
   return (
     <FormControl fullWidth>
       <FormLabel>{copy.combo.freeUnitsTitle}</FormLabel>
@@ -172,7 +173,7 @@ export function FreeUnitsBuilder({
             {error ?? copy.form.wholeNumberOnly}
           </FormMessage>
         )}
-        {empty ? (
+        {slot.menuItemIds.length === 0 && targetRefused ? (
           <FormMessage error dataTestId="free-units-message">
             {copy.form.freeUnitsTargetRequired}
           </FormMessage>