apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx (3)

106-116: Accordion state references a removed panel ("sale")

You’re setting openAccordions to include "sale", but there is no "sale" accordion item anymore. Remove it to avoid inconsistent UI state.

   if (commissionType === "custom") {
     setOpenAccordions([...baseValues, "commission"]);
   } else if (commissionType === "sale") {
-    setOpenAccordions([...baseValues, "customer", "sale"]);
+    setOpenAccordions([...baseValues, "customer"]);
   } else if (commissionType === "lead") {
     setOpenAccordions([...baseValues, "customer"]);
   }

---

181-187: Fix state setter typos and add selection state

Rename misspelled setters to avoid confusion and add state for the selected existing event.

-const [existingEvents, setExistingEventss] = useState<
+const [existingEvents, setExistingEvents] = useState<
   { type: string; date?: string; amount?: number }[]
 >([]);
-const [existingEventsLoading, setExistingEventssLoading] = useState(false);
+const [existingEventsLoading, setExistingEventsLoading] = useState(false);
+
+const [selectedExistingEvent, setSelectedExistingEvent] = useState<
+  { type: string; date?: string; amount?: number } | null
+>(null);
+
+useEffect(() => {
+  setSelectedExistingEvent(null);
+}, [customerId, commissionType, useExistingEvents]);

---

662-691: Apply money keydown handling to sale amount for consistency

Match the custom commission amount behavior and prevent invalid number input.

   render={({ field }) => (
     <input
       {...field}
       type="number"
       onWheel={(e) => e.currentTarget.blur()}
+      onKeyDown={handleMoneyKeyDown}
+      step="0.01"

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx (6)

120-127: Accordion auto-open references a non-existent "sale" section

Keep only "customer". This was flagged already; fix here too.

Apply this diff:

-    } else if (commissionType === "sale") {
-      setOpenAccordions([...baseValues, "customer", "sale"]);
+    } else if (commissionType === "sale") {
+      setOpenAccordions([...baseValues, "customer"]);

---

528-550: Event buttons lacked click handlers previously—now addressed

Prior review noted missing onClick. Ensure the new handler also sets eventIds as shown above so the server receives them.

---

563-646: Lead toggles unreachable when collapsed

Switches live inside collapsing containers. Move switches outside; animate only inputs. Prior comment covers this; please adopt it.

---

712-768: Invoice ID toggle unreachable (same pattern)

Keep switch visible; animate input only. Prior comment covers exact diff.

---

769-824: Product ID toggle unreachable (same pattern)

Mirror the invoice fix. Prior comment covers exact diff.

---

521-555: Wire selection: set eventIds and prefill fields; fix header grammar

Buttons don’t update form state. Persist selection and set form values. Also fix “events” → “event”.

Apply this diff:

-                              <h3 className="mb-3 text-sm font-medium text-neutral-900">
-                                Select an existing events
-                              </h3>
+                              <h3 className="mb-3 text-sm font-medium text-neutral-900">
+                                Select an existing event
+                              </h3>
@@
-                                {existingEvents.map((event, index) => (
+                                {existingEvents.map((event, index) => (
                                   <button
                                     key={index}
                                     type="button"
-                                    className="flex w-full items-center justify-between rounded-md bg-white p-3 text-sm hover:bg-neutral-50 focus:bg-neutral-100 focus:outline-none"
+                                    onClick={() => {
+                                      setValue("eventIds", [event.id], { shouldDirty: true });
+                                      if (commissionType === "sale") {
+                                        // TODO: confirm units; convert cents->dollars if needed
+                                        setValue("saleEventDate", event.date ?? null, { shouldDirty: true });
+                                        setValue("saleAmount", event.amount ?? null, { shouldDirty: true });
+                                      } else if (commissionType === "lead") {
+                                        setValue("leadEventDate", event.date ?? null, { shouldDirty: true });
+                                      }
+                                    }}
+                                    className="flex w-full items-center justify-between rounded-md bg-white p-3 text-sm hover:bg-neutral-50 focus:bg-neutral-100 focus:outline-none"
                                   >
                                     <div>
                                       <span className="font-medium">
-                                        {event.type}
+                                        {event.type.charAt(0).toUpperCase() + event.type.slice(1)}
                                       </span>

apps/web/lib/zod/schemas/commissions.ts (1)

152-153: Constrain and document eventIds; enforce non-empty and basic hygiene

Right now eventIds accepts empty arrays and empty strings. Tighten validation and add a simple cross‑field guard so event reuse can’t be combined with the “custom” flow.

Apply this diff:

-  eventIds: z.array(z.string()).nullish(),
+  // When provided, we will reuse existing events to create commissions.
+  eventIds: z
+    .array(z.string().min(1, "Event ID cannot be empty"))
+    .min(1, "Select at least one event")
+    .max(50, "Too many events selected")
+    .nullish(),

Optionally add a refine to disallow mixing custom commission fields with event reuse:

 export const createCommissionSchema = z.object({
   workspaceId: z.string(),
   partnerId: z.string(),
@@
   productId: z.string().nullish(),
 
-  eventIds: z.array(z.string()).nullish(),
+  eventIds: z
+    .array(z.string().min(1))
+    .min(1)
+    .max(50)
+    .nullish(),
 }).refine(
-  (data) => true,
+  (data) => !data.eventIds || (!data.date && !data.amount),
   {
-    message: "",
+    message:
+      "Do not combine eventIds with the one-time commission fields (date/amount).",
+    path: ["eventIds"],
   },
 );

apps/web/lib/actions/partners/create-manual-commission.ts (1)

123-137: Guard dummy-lead creation behind “no eventIds” earlier to reduce branching complexity

The else-if added is good, but with the early return above we can simplify: treat eventIds first, then fall back to existing/dummy lead. This reduces accidental double-processing.

Apply this diff to re-order the checks:

-    // if there is an existing lead event + no custom lead details were provided
+    // If eventIds present, reuse and return (handled below).
+    // If there is an existing lead event + no custom lead details were provided
     // we can use that leadEvent's existing details
-    if (
+    if (
       !leadEventDate &&
       !leadEventName &&
       existingLeadEvent &&
       existingLeadEvent.data.length > 0
     ) {
       leadEvent = leadEventSchemaTB.parse(existingLeadEvent.data[0]);
-    } else if (!eventIds || eventIds.length === 0) {
+    } else {
+      // dummy path executes only when eventIds not provided (the eventIds branch returns early)
+      if (eventIds && eventIds.length > 0) {
+        // handled later
+      } else {
         // else, if there's no existing lead event and there is also no custom leadEventName/Date
         // we need to create a dummy click + lead event (using the customer's country if available)
         const dummyRequest = new Request(link.url, {
           headers: new Headers({

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx (3)

171-189: Submission gating ignores eventIds; enable submit when reusing events

When using existing events, sale should not require manual saleAmount; lead should only require linkId/customerId. Incorporate eventIds and useExistingEvents.

Apply this diff:

-  const shouldDisableSubmit = useMemo(() => {
+  const shouldDisableSubmit = useMemo(() => {
     if (!partnerId) {
       return true;
     }
@@
-    if (commissionType === "sale") {
-      return !linkId || !customerId || !saleAmount;
+    if (commissionType === "sale") {
+      const hasExisting = useExistingEvents && (watch("eventIds")?.length ?? 0) > 0;
+      return !linkId || !customerId || (!saleAmount && !hasExisting);
     }
@@
-  }, [commissionType, partnerId, linkId, customerId, saleAmount, amount]);
+  }, [commissionType, partnerId, linkId, customerId, saleAmount, amount, useExistingEvents, watch]);

---

191-228: Race-safe fetch; include workspaceId in deps and check response.ok

Add a cancellation guard/AbortController, include workspaceId in deps, and handle non‑200s.

Apply this diff:

-  useEffect(() => {
+  useEffect(() => {
+    let cancelled = false;
+    const controller = new AbortController();
     if (
       !customerId ||
       !commissionType ||
       !workspaceId ||
       commissionType === "custom"
     ) {
       setExistingEvents([]);
       setExistingEventsLoading(false);
       return;
     }
 
     const fetchEvents = async () => {
       setExistingEventsLoading(true);
 
       try {
         const searchParams = new URLSearchParams({
           workspaceId,
           customerId,
           event: `${commissionType}s`,
         });
 
-        const response = await fetch(`/api/events?${searchParams.toString()}`, {
-          method: "GET",
-        });
-
-        setExistingEvents(await response.json());
+        const response = await fetch(`/api/events?${searchParams.toString()}`, {
+          method: "GET",
+          signal: controller.signal,
+        });
+        if (!response.ok) throw new Error(`Failed to fetch events: ${response.status}`);
+        const data = await response.json();
+        if (!cancelled) setExistingEvents(data ?? []);
       } catch (error) {
-        setExistingEvents([]);
+        if (!cancelled) setExistingEvents([]);
       } finally {
-        setExistingEventsLoading(false);
+        if (!cancelled) setExistingEventsLoading(false);
       }
     };
 
     fetchEvents();
-  }, [customerId, commissionType]);
+    return () => {
+      cancelled = true;
+      controller.abort();
+    };
+  }, [customerId, commissionType, workspaceId]);

---

229-230: Remove debug log before merge

console.log leaks internal state to devtools.

Apply this diff:

-  console.log({ existingEvents });
+

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

apps/web/lib/actions/partners/create-manual-commission.ts (1)

271-333: Duplicate-events branch doesn’t create commissions or trigger workflows; also ignores reuse when link matches

• No createPartnerCommission calls for duplicated events → user sees analytics but no commissions.
• No executeWorkflows after duplication.
• Reuse is skipped entirely when customer.linkId === linkId (events on same link): shouldDuplicateEvents prevents any handling, but users still expect commissions to be created for selected eventIds.
• Minor: console.log(events) risks leaking PII in logs.
• Fragile: inferring eventType from saleAmount can mismatch selected eventIds (e.g., reusing lead events while passing a sale amount, or vice versa).

Fix by always handling eventIds (create commissions), and only duplicating records when the link differs. Also emit the appropriate workflow trigger and remove the log.

Apply this diff:

-    // Duplicate the customer events
-    const shouldDuplicateEvents =
-      eventIds && eventIds.length > 0 && customer.linkId !== linkId;
-
-    if (shouldDuplicateEvents) {
-      const eventType = !saleAmount ? "leads" : "sales";
+    // Reuse or duplicate the selected events (always create commissions).
+    const hasEventIds =
+      Array.isArray(eventIds) && eventIds.length > 0;
+    if (hasEventIds) {
+      const shouldDuplicate = customer.linkId !== linkId;
+      const eventType = !saleAmount ? "leads" : "sales"; // NOTE: UI must ensure selected ids match this type.
@@
-      const pipe = tb.buildPipe({
+      const pipe = tb.buildPipe({
         pipe: "v2_events",
         parameters: eventsFilterTB,
         data: z.any(),
       });
@@
-      const events = response.data;
+      const events = response.data;
@@
-      if (events.length === 0) {
+      if (events.length === 0) {
         throw new Error("Selected events not found.");
       }
 
-      
-
-      // Duplicate the events for the new customer
-      if (eventType === "leads") {
-        await Promise.all(
-          events.map((event) =>
-            recordLeadWithTimestamp({
-              ...event,
-              customer_id: customerId, // TODO: should be new customerId
-              link_id: link.id,
-            }),
-          ),
-        );
-      } else if (eventType === "sales") {
-        await Promise.all(
-          events.map((event) =>
-            recordSaleWithTimestamp({
-              ...event,
-              customer_id: customerId, // TODO: should be new customerId
-              link_id: link.id,
-            }),
-          ),
-        );
-      }
-
-      console.log(events);
+      // 1) Duplicate events only if needed (link mismatch).
+      if (shouldDuplicate) {
+        if (eventType === "leads") {
+          await Promise.allSettled(
+            events.map((event: any) =>
+              recordLeadWithTimestamp({
+                ...event,
+                customer_id: customerId, // TODO: replace with new customerId when partner mismatch is handled
+                link_id: link.id,
+              }),
+            ),
+          );
+        } else {
+          await Promise.allSettled(
+            events.map((event: any) =>
+              recordSaleWithTimestamp({
+                ...event,
+                customer_id: customerId, // TODO: replace with new customerId when partner mismatch is handled
+                link_id: link.id,
+              }),
+            ),
+          );
+        }
+      }
+
+      // 2) Create commissions for each selected (or duplicated) event.
+      if (eventType === "leads") {
+        await Promise.allSettled(
+          events.map((event: any) =>
+            createPartnerCommission({
+              event: "lead",
+              programId,
+              partnerId,
+              linkId,
+              eventId: event.event_id,
+              customerId,
+              amount: 0,
+              quantity: 1,
+              createdAt: new Date(event.timestamp),
+              user,
+              context: {
+                customer: { country: customer.country },
+              },
+            }),
+          ),
+        );
+        await executeWorkflows({
+          trigger: WorkflowTrigger.leadRecorded,
+          programId,
+          partnerId,
+        });
+      } else {
+        await Promise.allSettled(
+          events.map((event: any) =>
+            createPartnerCommission({
+              event: "sale",
+              programId,
+              partnerId,
+              linkId,
+              eventId: event.event_id,
+              customerId,
+              amount: typeof event.amount === "number" ? event.amount : saleAmount ?? 0,
+              quantity: 1,
+              invoiceId,
+              currency: (event as any).currency ?? "usd",
+              createdAt: new Date(event.timestamp),
+              user,
+              context: {
+                customer: { country: customer.country },
+                sale: { productId },
+              },
+            }),
+          ),
+        );
+        await executeWorkflows({
+          trigger: WorkflowTrigger.saleRecorded,
+          programId,
+          partnerId,
+        });
+      }
     }

apps/web/lib/zod/schemas/analytics.ts (2)

321-323: Remove non-existent key from omit() mask

page is not part of analyticsFilterTB’s shape; passing it to omit() will break type inference. Drop it.

Apply this diff:

-export const eventsFilterTB = analyticsFilterTB
-  .omit({ granularity: true, timezone: true, page: true, sortBy: true,  })
+export const eventsFilterTB = analyticsFilterTB
+  .omit({ granularity: true, timezone: true, sortBy: true })

---

329-330: Accept CSV for eventIds (parity with linkIds/folderIds)

Other filters accept both CSV string and array. Mirror that for eventIds to ease query construction and TB piping.

Apply this diff:

-      eventIds: z.array(z.string()).optional(),
+      eventIds: z
+        .union([z.string(), z.array(z.string())])
+        .transform((v) => (Array.isArray(v) ? v : v.split(",")))
+        .optional(),

apps/web/lib/actions/partners/create-manual-commission.ts (2)

300-301: Avoid PII in server logs

Remove console.log(events); events may include customer metadata.

Apply this diff:

-      console.log(events);
+      // Intentionally no logging of raw events to avoid PII in server logs.

---

133-221: Potential double-commission when mixing eventIds and synthetic lead/sale

If eventIds are provided and the branch above also created a synthetic lead (dummy click+lead) and a sale (when saleAmount && leadEvent), users could get extra commissions. Once the eventIds path is in place, consider short‑circuiting earlier synthetic creation when eventIds are present.

Would you like a patch to move the eventIds handling before the synthetic lead/sale logic and return early after completion?

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

apps/web/lib/actions/partners/create-manual-commission.ts (1)

303-361: Handle eventIds first: add reuse path, create commissions, and early-return

Currently, eventIds are ignored unless partner mismatch, and even then no commissions are created. Also, deriving eventType from saleAmount is brittle. Process eventIds up-front, reuse when partner/link match, duplicate with new IDs when migrating, create commissions in both cases, trigger workflows, and return early.

Apply this diff to replace the whole block:

-    // Duplicate the customer events
-    const shouldDuplicateEvents =
-      eventIds && eventIds.length > 0 && customer.linkId !== linkId;
-
-    if (shouldDuplicateEvents) {
-      const eventType = !saleAmount ? "leads" : "sales";
-
-      // Find the events by the eventIds
-      const { startDate, endDate } = getStartEndDates({
-        interval: "all",
-      });
-
-      const pipe = tb.buildPipe({
-        pipe: "v2_events",
-        parameters: eventsFilterTB,
-        data: z.any(),
-      });
-
-      const response = await pipe({
-        workspaceId: workspace.id,
-        eventType,
-        sortBy: "timestamp",
-        offset: 0,
-        limit: 100,
-        start: startDate.toISOString().replace("T", " ").replace("Z", ""),
-        end: endDate.toISOString().replace("T", " ").replace("Z", ""),
-        eventIds,
-      });
-
-      const events = response.data;
-
-      if (events.length === 0) {
-        throw new Error("Selected events not found.");
-      }
-
-      // Duplicate the events for the new customer
-      if (eventType === "leads") {
-        await Promise.all(
-          events.map((event) =>
-            recordLeadWithTimestamp({
-              ...event,
-              customer_id: customer.id,
-              link_id: link.id,
-            }),
-          ),
-        );
-      } else if (eventType === "sales") {
-        await Promise.all(
-          events.map((event) =>
-            recordSaleWithTimestamp({
-              ...event,
-              customer_id: customer.id,
-              link_id: link.id,
-            }),
-          ),
-        );
-      }
-    }
+    // Process provided eventIds: reuse or duplicate, then create commissions, then return.
+    if (Array.isArray(eventIds) && eventIds.length > 0) {
+      const { startDate, endDate } = getStartEndDates({ interval: "all" });
+      const pipe = tb.buildPipe({
+        pipe: "v2_events",
+        parameters: eventsFilterTB,
+        data: z.any(),
+      });
+      // Try leads first, then sales, so we don't rely on saleAmount to infer type.
+      const fetchByType = (eventType: "leads" | "sales") =>
+        pipe({
+          workspaceId: workspace.id,
+          eventType,
+          sortBy: "timestamp",
+          offset: 0,
+          limit: eventIds.length,
+          start: startDate.toISOString().replace("T", " ").replace("Z", ""),
+          end: endDate.toISOString().replace("T", " ").replace("Z", ""),
+          eventIds,
+        });
+
+      let response = await fetchByType("leads");
+      if (!response.data?.length) {
+        response = await fetchByType("sales");
+      }
+      const events = response.data ?? [];
+      if (events.length === 0) {
+        throw new Error("Selected events not found.");
+      }
+
+      const isPartnerMismatch = customer.linkId !== linkId;
+
+      if (isPartnerMismatch) {
+        // Duplicate events with fresh IDs for the new customer/link, then create commissions for those new IDs.
+        await Promise.allSettled(
+          events.map((event: any) => {
+            const isSale = "amount" in event && Number(event.amount) > 0;
+            const newEventId = nanoid(16);
+            const ts = new Date(event.timestamp);
+            const recordPromise = isSale
+              ? recordSaleWithTimestamp({
+                  ...event,
+                  event_id: newEventId,
+                  customer_id: customer.id,
+                  link_id: link.id,
+                })
+              : recordLeadWithTimestamp({
+                  ...event,
+                  event_id: newEventId,
+                  customer_id: customer.id,
+                  link_id: link.id,
+                });
+            const commissionPromise = createPartnerCommission({
+              event: isSale ? "sale" : "lead",
+              programId,
+              partnerId,
+              linkId,
+              eventId: newEventId,
+              customerId: customer.id,
+              amount: isSale ? Number(event.amount) : 0,
+              quantity: 1,
+              ...(isSale && { invoiceId, currency: "usd" }),
+              createdAt: ts,
+              user,
+              context: {
+                customer: { country: customer.country },
+                ...(isSale && { sale: { productId } }),
+              },
+            });
+            const workflowPromise = executeWorkflows({
+              trigger: isSale
+                ? WorkflowTrigger.saleRecorded
+                : WorkflowTrigger.leadRecorded,
+              programId,
+              partnerId,
+            });
+            return Promise.allSettled([
+              recordPromise,
+              commissionPromise,
+              workflowPromise,
+            ]);
+          }),
+        );
+      } else {
+        // Reuse existing events: create commissions referencing the existing IDs, no event writes.
+        const hasSale = events.some(
+          (e: any) => "amount" in e && Number(e.amount) > 0,
+        );
+        await Promise.allSettled(
+          events.map((event: any) =>
+            createPartnerCommission({
+              event:
+                "amount" in event && Number(event.amount) > 0
+                  ? "sale"
+                  : "lead",
+              programId,
+              partnerId,
+              linkId,
+              eventId: event.event_id,
+              customerId,
+              amount:
+                "amount" in event && Number(event.amount) > 0
+                  ? Number(event.amount)
+                  : 0,
+              quantity: 1,
+              ...(("amount" in event && Number(event.amount) > 0) && {
+                invoiceId,
+                currency: "usd",
+              }),
+              createdAt: new Date(event.timestamp),
+              user,
+              context: {
+                customer: { country: customer.country },
+                ...(("amount" in event && Number(event.amount) > 0) && {
+                  sale: { productId },
+                }),
+              },
+            }),
+          ),
+        );
+        await executeWorkflows({
+          trigger: hasSale
+            ? WorkflowTrigger.saleRecorded
+            : WorkflowTrigger.leadRecorded,
+          programId,
+          partnerId,
+        });
+      }
+      return;
+    }

apps/web/lib/actions/partners/create-manual-commission.ts (2)

341-358: Send only accepted fields to TB record endpoints

Spreading events from v2_events into recordLead/Sale may include columns not accepted by the ingestion endpoints. Pass the whitelisted fields (event_id, event_name, customer_id, link_id, amount, currency, timestamp, metadata, etc.).

I can generate a typed pick for the TB schemas if helpful.

---

371-390: Stats updates may be inconsistent for migrated customers

• isFirstConversion uses the (possibly cloned) customer object; if counters weren’t reset on the new record, first-conversion increments won’t fire.
• Sale increments are gated by saleAmount, which may be undefined for reuse/duplicate flows.

Would you like a follow-up patch to compute link/customer increments based on the processed events (lead vs sale) rather than saleAmount?

Also applies to: 394-414

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

apps/web/lib/actions/partners/create-manual-commission.ts (3)

307-314: Don’t infer event type from saleAmount

const eventType = !saleAmount ? "leads" : "sales" will misclassify valid events. Fetch both types by ID(s) and branch by actual rows (see prior diff).

---

132-156: Don't spread Prisma entities into create(); also capture and use a targetCustomerId

Spreading ...customer can copy read-only/unique fields (and stale values from before the update), causing constraint issues and incorrect state. Also, later writes still use the original customerId. Introduce targetCustomerId and copy only safe fields.

Apply this focused diff:

-    if (shouldCreateNewCustomer) {
-      customer = await prisma.$transaction(async (tx) => {
+    let targetCustomerId = customer!.id;
+    if (shouldCreateNewCustomer) {
+      customer = await prisma.$transaction(async (tx) => {
         await tx.customer.update({
           where: {
             id: customer!.id,
           },
           data: {
             name: `${customer!.name} (old)`,
             externalId: null,
             stripeCustomerId: null,
             linkId: null,
             clickId: null,
           },
         });
-
-        return await tx.customer.create({
-          data: {
-            ...customer,
-            id: createId({ prefix: "cus_" }),
-            linkId: link.id,
-            projectId: workspace.id,
-          },
-        });
-      });
+        const newCustomer = await tx.customer.create({
+          data: {
+            id: createId({ prefix: "cus_" }),
+            name: customer!.name,
+            country: customer!.country,
+            linkId: link.id,
+            projectId: workspace.id,
+          },
+        });
+        return newCustomer;
+      });
+      targetCustomerId = customer.id;
     }

---

303-362: Duplication flow: generate new IDs, create commissions, trigger workflows, and remove console.log

Current code reuses event.event_id (collision risk), doesn’t create commissions for duplicates, doesn’t trigger workflows, and logs to console. Also, inferring eventType from saleAmount can misclassify events.

Apply this replacement to the duplication block:

-  const shouldDuplicateEvents =
-    eventIds && eventIds.length > 0 && shouldCreateNewCustomer;
+  const shouldDuplicateEvents =
+    eventIds && eventIds.length > 0 && shouldCreateNewCustomer;
@@
-  if (shouldDuplicateEvents) {
-    const eventType = !saleAmount ? "leads" : "sales";
-
-    // Find the events by the eventIds
-    const { startDate, endDate } = getStartEndDates({
-      interval: "all",
-    });
-
-    const pipe = tb.buildPipe({
-      pipe: "v2_events",
-      parameters: eventsFilterTB,
-      data: z.any(),
-    });
-
-    const response = await pipe({
-      workspaceId: workspace.id,
-      eventType,
-      sortBy: "timestamp",
-      offset: 0,
-      limit: 100,
-      start: startDate.toISOString().replace("T", " ").replace("Z", ""),
-      end: endDate.toISOString().replace("T", " ").replace("Z", ""),
-      eventIds,
-    });
-
-    const events = response.data;
-
-    if (events.length === 0) {
-      throw new Error("Selected events not found.");
-    }
-
-    console.log(events);
-
-    // Duplicate the events for the new customer
-    if (eventType === "leads") {
-      await Promise.all(
-        events.map((event) =>
-          recordLeadWithTimestamp({
-            ...event,
-            customer_id: customer.id,
-            link_id: link.id,
-          }),
-        ),
-      );
-    } else if (eventType === "sales") {
-      await Promise.all(
-        events.map((event) =>
-          recordSaleWithTimestamp({
-            ...event,
-            customer_id: customer.id,
-            link_id: link.id,
-          }),
-        ),
-      );
-    }
-  }
+  if (shouldDuplicateEvents) {
+    const { startDate, endDate } = getStartEndDates({ interval: "all" });
+    const pipe = tb.buildPipe({
+      pipe: "v2_events",
+      parameters: eventsFilterTB,
+      data: z.any(),
+    });
+
+    const fetchEvents = async (eventType: "leads" | "sales") => {
+      const res = await pipe({
+        workspaceId: workspace.id,
+        eventType,
+        sortBy: "timestamp",
+        offset: 0,
+        limit: eventIds.length,
+        start: startDate.toISOString().replace("T", " ").replace("Z", ""),
+        end: endDate.toISOString().replace("T", " ").replace("Z", ""),
+        eventIds,
+      });
+      return res.data as any[];
+    };
+
+    const [leadRows, saleRows] = await Promise.all([
+      fetchEvents("leads"),
+      fetchEvents("sales"),
+    ]);
+    if (leadRows.length + saleRows.length === 0) {
+      throw new Error("Selected events not found.");
+    }
+
+    // Duplicate leads
+    await Promise.allSettled(
+      leadRows.map(async (event) => {
+        const newId = nanoid(16);
+        await recordLeadWithTimestamp({
+          ...event,
+          event_id: newId,
+          customer_id: customer.id,
+          link_id: link.id,
+        });
+        await createPartnerCommission({
+          event: "lead",
+          programId,
+          partnerId,
+          linkId,
+          eventId: newId,
+          customerId: customer.id,
+          amount: 0,
+          quantity: 1,
+          createdAt: new Date(event.timestamp),
+          user,
+          context: { customer: { country: customer.country } },
+        });
+      }),
+    );
+
+    // Duplicate sales
+    await Promise.allSettled(
+      saleRows.map(async (event) => {
+        const newId = nanoid(16);
+        await recordSaleWithTimestamp({
+          ...event,
+          event_id: newId,
+          customer_id: customer.id,
+          link_id: link.id,
+        });
+        await createPartnerCommission({
+          event: "sale",
+          programId,
+          partnerId,
+          linkId,
+          eventId: newId,
+          customerId: customer.id,
+          amount: Number(event.amount) || 0,
+          quantity: 1,
+          invoiceId,
+          currency: (event.currency || "usd").toLowerCase(),
+          createdAt: new Date(event.timestamp),
+          user,
+          context: {
+            customer: { country: customer.country },
+            sale: { productId },
+          },
+        });
+      }),
+    );
+
+    await Promise.allSettled([
+      leadRows.length
+        ? executeWorkflows({
+            trigger: WorkflowTrigger.leadRecorded,
+            programId,
+            partnerId,
+          })
+        : Promise.resolve(),
+      saleRows.length
+        ? executeWorkflows({
+            trigger: WorkflowTrigger.saleRecorded,
+            programId,
+            partnerId,
+          })
+        : Promise.resolve(),
+    ]);
+    return;
+  }

apps/web/lib/actions/partners/create-manual-commission.ts (4)

321-330: Limit should reflect the number of eventIds

Avoid truncating results when more than 100 IDs are selected.

Apply this tiny change (included in the larger diff too):

-        limit: 100,
+        limit: eventIds.length,

---

338-338: Remove debug logging

console.log(events) leaks potentially sensitive data and adds noise.

Apply this deletion (already removed in the larger diff).

---

27-30: Resolve or remove TODO

The code now implements the partner-move + duplication flow; update/remove the TODO to prevent confusion.

---

158-171: Existing-lead reuse may be wrong after partner move

getLeadEvent({ customerId }) queries the old customer. If you intend to skip dummy creation when eventIds are provided (either reuse or duplicate), short-circuit before this block. Otherwise, query using targetCustomerId after the move.

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx (6)

141-148: Remove non-existent “sale” accordion key.

No item with value="sale" exists; referencing it breaks auto-open behavior.

-  } else if (commissionType === "sale") {
-      setOpenAccordions([...baseValues, "customer", "sale"]);
+  } else if (commissionType === "sale") {
+      setOpenAccordions([...baseValues, "customer"]);

---

225-263: Harden events fetch: response.ok check, cancellation, and full deps.

Prevents UI crashes on HTTP errors, stale updates, and stale workspace/folder data. Also guard missing defaultFolderId.

 useEffect(() => {
-  if (
+  if (
     !customerId ||
     !commissionType ||
     !workspaceId ||
-    commissionType === "custom"
+    commissionType === "custom" ||
+    !program?.defaultFolderId
   ) {
     setExistingEvents([]);
     setExistingEventsLoading(false);
     return;
   }

-  const fetchEvents = async () => {
+  const controller = new AbortController();
+  let cancelled = false;
+
+  const fetchEvents = async () => {
     setExistingEventsLoading(true);

     try {
       const searchParams = new URLSearchParams({
         workspaceId,
         customerId,
-        folderId: program?.defaultFolderId!,
+        folderId: program.defaultFolderId,
         event: `${commissionType}s`,
       });

-      const response = await fetch(`/api/events?${searchParams.toString()}`, {
-        method: "GET",
-      });
-
-      setExistingEvents(await response.json());
+      const response = await fetch(`/api/events?${searchParams.toString()}`, {
+        method: "GET",
+        signal: controller.signal,
+      });
+      if (!response.ok) throw new Error(`Failed to fetch events: ${response.status}`);
+      const json = await response.json();
+      if (!cancelled) setExistingEvents(json);
     } catch (error) {
-      setExistingEvents([]);
+      if (!cancelled) setExistingEvents([]);
     } finally {
-      setExistingEventsLoading(false);
+      if (!cancelled) setExistingEventsLoading(false);
     }
   };

   fetchEvents();
-}, [customerId, commissionType]);
+  return () => {
+    cancelled = true;
+    controller.abort();
+  };
+}, [customerId, commissionType, workspaceId, program?.defaultFolderId]);

---

570-609: Lead date toggle is unreachable; keep switch visible, animate only input.

Current structure hides the Switch when collapsed.

-<AnimatedSizeContainer
-  height
-  transition={{ ease: "easeInOut", duration: 0.2 }}
-  style={{
-    height: hasCustomLeadEventDate ? "auto" : "0px",
-    overflow: "hidden",
-  }}
->
-  <div className="flex flex-col gap-6">
-    <div className="flex items-center gap-4">
-      <Switch
-        fn={setHasCustomLeadEventDate}
-        checked={hasCustomLeadEventDate}
-        trackDimensions="w-8 h-4"
-        thumbDimensions="w-3 h-3"
-        thumbTranslate="translate-x-4"
-      />
-      <div className="flex flex-col gap-1">
-        <h3 className="text-sm font-medium text-neutral-700">
-          Set a custom lead event date
-        </h3>
-      </div>
-    </div>
-
-    {hasCustomLeadEventDate && (
-      <div className="p-px">
-        <SmartDateTimePicker
-          value={leadEventDate}
-          onChange={(date) => {
-            setValue("leadEventDate", date, {
-              shouldDirty: true,
-            });
-          }}
-          label="Lead event date"
-          placeholder='E.g. "2024-03-01", "Last Thursday", "2 hours ago"'
-        />
-      </div>
-    )}
-  </div>
-</AnimatedSizeContainer>
+<div className="flex items-center gap-4">
+  <Switch
+    fn={setHasCustomLeadEventDate}
+    checked={hasCustomLeadEventDate}
+    trackDimensions="w-8 h-4"
+    thumbDimensions="w-3 h-3"
+    thumbTranslate="translate-x-4"
+  />
+  <div className="flex flex-col gap-1">
+    <h3 className="text-sm font-medium text-neutral-700">
+      Set a custom lead event date
+    </h3>
+  </div>
+</div>
+<AnimatedSizeContainer
+  height
+  transition={{ ease: "easeInOut", duration: 0.2 }}
+  style={{ height: hasCustomLeadEventDate ? "auto" : "0px", overflow: "hidden" }}
+>
+  {hasCustomLeadEventDate && (
+    <div className="p-px">
+      <SmartDateTimePicker
+        value={leadEventDate}
+        onChange={(date) => {
+          setValue("leadEventDate", date, { shouldDirty: true });
+        }}
+        label="Lead event date"
+        placeholder='E.g. "2024-03-01", "Last Thursday", "2 hours ago"'
+      />
+    </div>
+  )}
+</AnimatedSizeContainer>

---

610-653: Lead name toggle has same issue; keep switch visible.

-<AnimatedSizeContainer
-  height
-  transition={{ ease: "easeInOut", duration: 0.2 }}
-  style={{
-    height: hasCustomLeadEventName ? "auto" : "0px",
-    overflow: "hidden",
-  }}
->
-  <div className="flex flex-col gap-6">
-    <div className="flex items-center gap-4">
-      <Switch
-        fn={setHasCustomLeadEventName}
-        checked={hasCustomLeadEventName}
-        trackDimensions="w-8 h-4"
-        thumbDimensions="w-3 h-3"
-        thumbTranslate="translate-x-4"
-      />
-      <div className="flex flex-col gap-1">
-        <h3 className="text-sm font-medium text-neutral-700">
-          Set a custom lead event name
-        </h3>
-      </div>
-    </div>
-
-    {hasCustomLeadEventName && (
-      <div className="p-px">
-        <input
-          type="text"
-          className={cn(
-            "block w-full rounded-md border-neutral-300 px-3 py-2 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
-            errors.leadEventName &&
-              "border-red-600 focus:border-red-500 focus:ring-red-600",
-          )}
-          {...register("leadEventName", {
-            setValueAs: (value) =>
-              value === "" ? null : value,
-          })}
-          placeholder="Enter lead event name"
-        />
-      </div>
-    )}
-  </div>
-</AnimatedSizeContainer>
+<div className="flex items-center gap-4">
+  <Switch
+    fn={setHasCustomLeadEventName}
+    checked={hasCustomLeadEventName}
+    trackDimensions="w-8 h-4"
+    thumbDimensions="w-3 h-3"
+    thumbTranslate="translate-x-4"
+  />
+  <div className="flex flex-col gap-1">
+    <h3 className="text-sm font-medium text-neutral-700">
+      Set a custom lead event name
+    </h3>
+  </div>
+</div>
+<AnimatedSizeContainer
+  height
+  transition={{ ease: "easeInOut", duration: 0.2 }}
+  style={{ height: hasCustomLeadEventName ? "auto" : "0px", overflow: "hidden" }}
+>
+  {hasCustomLeadEventName && (
+    <div className="p-px">
+      <input
+        type="text"
+        className={cn(
+          "block w-full rounded-md border-neutral-300 px-3 py-2 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
+          errors.leadEventName &&
+            "border-red-600 focus:border-red-500 focus:ring-red-600",
+        )}
+        {...register("leadEventName", {
+          setValueAs: (value) => (value === "" ? null : value),
+        })}
+        placeholder="Enter lead event name"
+      />
+    </div>
+  )}
+</AnimatedSizeContainer>

---

719-775: Invoice ID toggle is unreachable; keep switch visible and animate only input.

-<AnimatedSizeContainer
-  height
-  transition={{ ease: "easeInOut", duration: 0.2 }}
-  className={!hasInvoiceId ? "hidden" : ""}
-  style={{
-    display: !hasInvoiceId ? "none" : "block",
-  }}
->
-  <div className="flex items-center gap-4">
-    <Switch
-      fn={setHasInvoiceId}
-      checked={hasInvoiceId}
-      trackDimensions="w-8 h-4"
-      thumbDimensions="w-3 h-3"
-      thumbTranslate="translate-x-4"
-    />
-    <div className="flex gap-1">
-      <h3 className="text-sm font-medium text-neutral-700">
-        Add{" "}
-      </h3>
-      <span className="rounded-md border border-neutral-200 bg-neutral-100 px-1 py-0.5 text-xs">
-        invoiceID
-      </span>
-    </div>
-  </div>
-
-  {hasInvoiceId && (
+<div className="flex items-center gap-4">
+  <Switch
+    fn={setHasInvoiceId}
+    checked={hasInvoiceId}
+    trackDimensions="w-8 h-4"
+    thumbDimensions="w-3 h-3"
+    thumbTranslate="translate-x-4"
+  />
+  <div className="flex gap-1">
+    <h3 className="text-sm font-medium text-neutral-700">Add</h3>
+    <span className="rounded-md border border-neutral-200 bg-neutral-100 px-1 py-0.5 text-xs">
+      invoiceID
+    </span>
+  </div>
+</div>
+<AnimatedSizeContainer
+  height
+  transition={{ ease: "easeInOut", duration: 0.2 }}
+  style={{ height: hasInvoiceId ? "auto" : "0px", overflow: "hidden" }}
+>
+  {hasInvoiceId && (
     <div className="mt-4">
       <label
         htmlFor="invoiceId"
         className="flex items-center space-x-2"
       >
         <h2 className="text-sm font-medium text-neutral-900">
           Invoice ID
         </h2>
       </label>
       <div className="mt-2 p-px">
         <input
           type="text"
           id="invoiceId"
           className={cn(
             "block w-full rounded-md border-neutral-300 px-3 py-2 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
             errors.invoiceId &&
               "border-red-600 focus:border-red-500 focus:ring-red-600",
           )}
           {...register("invoiceId", {
             required: hasInvoiceId,
             setValueAs: (value) => value === "" ? null : value,
           })}
           placeholder="Enter invoice ID"
         />
       </div>
     </div>
   )}
-</AnimatedSizeContainer>
+</AnimatedSizeContainer>

---

776-831: Product ID toggle is unreachable; mirror the invoice fix.

-<AnimatedSizeContainer
-  height
-  transition={{ ease: "easeInOut", duration: 0.2 }}
-  className={!hasProductId ? "hidden" : ""}
-  style={{
-    display: !hasProductId ? "none" : "block",
-  }}
->
-  <div className="flex items-center gap-4">
-    <Switch
-      fn={setHasProductId}
-      checked={hasProductId}
-      trackDimensions="w-8 h-4"
-      thumbDimensions="w-3 h-3"
-      thumbTranslate="translate-x-4"
-    />
-    <div className="flex gap-1">
-      <h3 className="text-sm font-medium text-neutral-700">
-        Add{" "}
-      </h3>
-      <span className="rounded-md border border-neutral-200 bg-neutral-100 px-1 py-0.5 text-xs">
-        productID
-      </span>
-    </div>
-  </div>
-
-  {hasProductId && (
+<div className="flex items-center gap-4">
+  <Switch
+    fn={setHasProductId}
+    checked={hasProductId}
+    trackDimensions="w-8 h-4"
+    thumbDimensions="w-3 h-3"
+    thumbTranslate="translate-x-4"
+  />
+  <div className="flex gap-1">
+    <h3 className="text-sm font-medium text-neutral-700">Add</h3>
+    <span className="rounded-md border border-neutral-200 bg-neutral-100 px-1 py-0.5 text-xs">
+      productID
+    </span>
+  </div>
+</div>
+<AnimatedSizeContainer
+  height
+  transition={{ ease: "easeInOut", duration: 0.2 }}
+  style={{ height: hasProductId ? "auto" : "0px", overflow: "hidden" }}
+>
+  {hasProductId && (
     <div className="mt-4">
       <label
         htmlFor="productId"
         className="flex items-center space-x-2"
       >
         <h2 className="text-sm font-medium text-neutral-900">
           Product ID
         </h2>
       </label>
       <div className="mt-2 p-px">
         <input
           type="text"
           id="productId"
           className={cn(
             "block w-full rounded-md border-neutral-300 px-3 py-2 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
             errors.productId &&
               "border-red-600 focus:border-red-500 focus:ring-red-600",
           )}
           {...register("productId", {
             required: hasProductId,
             setValueAs: (value) =>
               value === "" ? null : value,
           })}
           placeholder="Enter product ID"
         />
       </div>
     </div>
   )}
-</AnimatedSizeContainer>
+</AnimatedSizeContainer>

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx (1)

874-941: Provide stable row ids to the table.

Improves performance and selection consistency.

-  const table = useTable({
+  const table = useTable({
     data: events || [],
     columns: [
       {
         id: "date",
@@
     ],
+    getRowId: (row) => row.eventId || String(row.timestamp),
     thClassName: (id) =>

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx (5)

141-147: Remove non-existent "sale" accordion key

The component doesn’t render a value="sale" item; opening it has no effect.

Apply this diff:

-    } else if (commissionType === "sale") {
-      setOpenAccordions([...baseValues, "customer", "sale"]);
+    } else if (commissionType === "sale") {
+      setOpenAccordions([...baseValues, "customer"]);

---

62-62: Fix events fetch effect: missing deps, unsafe !, no abort, no response.ok check

Prevent bad folderId=undefined, stale updates, and swallowing HTTP errors.

Apply this diff:

-  const { program } = useProgram();
+  const { program, loading: programLoading } = useProgram();
@@
-  useEffect(() => {
-    if (
-      !customerId ||
-      !commissionType ||
-      !workspaceId ||
-      commissionType === "custom"
-    ) {
-      setExistingEvents([]);
-      setExistingEventsLoading(false);
-      return;
-    }
-
-    const fetchEvents = async () => {
-      setExistingEventsLoading(true);
-
-      try {
-        const searchParams = new URLSearchParams({
-          workspaceId,
-          customerId,
-          folderId: program?.defaultFolderId!,
-          event: `${commissionType}s`,
-        });
-
-        const response = await fetch(`/api/events?${searchParams.toString()}`, {
-          method: "GET",
-        });
-
-        setExistingEvents(await response.json());
-      } catch (error) {
-        setExistingEvents([]);
-      } finally {
-        setExistingEventsLoading(false);
-      }
-    };
-
-    fetchEvents();
-  }, [customerId, commissionType]);
+  useEffect(() => {
+    if (
+      !customerId ||
+      !commissionType ||
+      !workspaceId ||
+      commissionType === "custom" ||
+      programLoading ||
+      !program?.defaultFolderId
+    ) {
+      setExistingEvents([]);
+      setExistingEventsLoading(false);
+      return;
+    }
+
+    const controller = new AbortController();
+    const { signal } = controller;
+    let cancelled = false;
+
+    const fetchEvents = async () => {
+      setExistingEventsLoading(true);
+      try {
+        const searchParams = new URLSearchParams({
+          workspaceId,
+          customerId,
+          folderId: program.defaultFolderId,
+          event: `${commissionType}s`,
+        });
+        const response = await fetch(`/api/events?${searchParams.toString()}`, {
+          method: "GET",
+          signal,
+        });
+        if (!response.ok) {
+          throw new Error(`Failed to fetch events: ${response.status}`);
+        }
+        const json = await response.json();
+        if (!cancelled) setExistingEvents(Array.isArray(json) ? json : []);
+      } catch (err: any) {
+        if (err?.name === "AbortError") return;
+        if (!cancelled) setExistingEvents([]);
+      } finally {
+        if (!cancelled) setExistingEventsLoading(false);
+      }
+    };
+
+    fetchEvents();
+    return () => {
+      cancelled = true;
+      controller.abort();
+    };
+  }, [
+    customerId,
+    commissionType,
+    workspaceId,
+    programLoading,
+    program?.defaultFolderId,
+  ]);

Also applies to: 232-269

---

572-660: Lead toggles are unreachable (switch hidden inside collapsed container)

Keep the Switch visible; animate only the input block.

Apply this diff:

-                        <>
-                          <AnimatedSizeContainer
-                            height
-                            transition={{ ease: "easeInOut", duration: 0.2 }}
-                            style={{
-                              height: hasCustomLeadEventDate ? "auto" : "0px",
-                              overflow: "hidden",
-                            }}
-                          >
-                            <div className="flex flex-col gap-6">
-                              <div className="flex items-center gap-4">
-                                <Switch
-                                  fn={setHasCustomLeadEventDate}
-                                  checked={hasCustomLeadEventDate}
-                                  trackDimensions="w-8 h-4"
-                                  thumbDimensions="w-3 h-3"
-                                  thumbTranslate="translate-x-4"
-                                />
-                                <div className="flex flex-col gap-1">
-                                  <h3 className="text-sm font-medium text-neutral-700">
-                                    Set a custom lead event date
-                                  </h3>
-                                </div>
-                              </div>
-
-                              {hasCustomLeadEventDate && (
-                                <div className="p-px">
-                                  <SmartDateTimePicker
-                                    value={leadEventDate}
-                                    onChange={(date) => {
-                                      setValue("leadEventDate", date, {
-                                        shouldDirty: true,
-                                      });
-                                    }}
-                                    label="Lead event date"
-                                    placeholder='E.g. "2024-03-01", "Last Thursday", "2 hours ago"'
-                                  />
-                                </div>
-                              )}
-                            </div>
-                          </AnimatedSizeContainer>
+                        <>
+                          <div className="flex items-center gap-4">
+                            <Switch
+                              fn={setHasCustomLeadEventDate}
+                              checked={hasCustomLeadEventDate}
+                              trackDimensions="w-8 h-4"
+                              thumbDimensions="w-3 h-3"
+                              thumbTranslate="translate-x-4"
+                            />
+                            <div className="flex flex-col gap-1">
+                              <h3 className="text-sm font-medium text-neutral-700">
+                                Set a custom lead event date
+                              </h3>
+                            </div>
+                          </div>
+                          <AnimatedSizeContainer
+                            height
+                            transition={{ ease: "easeInOut", duration: 0.2 }}
+                            style={{
+                              height: hasCustomLeadEventDate ? "auto" : "0px",
+                              overflow: "hidden",
+                            }}
+                          >
+                            {hasCustomLeadEventDate && (
+                              <div className="p-px">
+                                <SmartDateTimePicker
+                                  value={leadEventDate}
+                                  onChange={(date) => {
+                                    setValue("leadEventDate", date, {
+                                      shouldDirty: true,
+                                    });
+                                  }}
+                                  label="Lead event date"
+                                  placeholder='E.g. "2024-03-01", "Last Thursday", "2 hours ago"'
+                                />
+                              </div>
+                            )}
+                          </AnimatedSizeContainer>
@@
-                          <AnimatedSizeContainer
-                            height
-                            transition={{ ease: "easeInOut", duration: 0.2 }}
-                            style={{
-                              height: hasCustomLeadEventName ? "auto" : "0px",
-                              overflow: "hidden",
-                            }}
-                          >
-                            <div className="flex flex-col gap-6">
-                              <div className="flex items-center gap-4">
-                                <Switch
-                                  fn={setHasCustomLeadEventName}
-                                  checked={hasCustomLeadEventName}
-                                  trackDimensions="w-8 h-4"
-                                  thumbDimensions="w-3 h-3"
-                                  thumbTranslate="translate-x-4"
-                                />
-                                <div className="flex flex-col gap-1">
-                                  <h3 className="text-sm font-medium text-neutral-700">
-                                    Set a custom lead event name
-                                  </h3>
-                                </div>
-                              </div>
-
-                              {hasCustomLeadEventName && (
-                                <div className="p-px">
-                                  <input
-                                    type="text"
-                                    className={cn(
-                                      "block w-full rounded-md border-neutral-300 px-3 py-2 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
-                                      errors.leadEventName &&
-                                        "border-red-600 focus:border-red-500 focus:ring-red-600",
-                                    )}
-                                    {...register("leadEventName", {
-                                      setValueAs: (value) =>
-                                        value === "" ? null : value,
-                                    })}
-                                    placeholder="Enter lead event name"
-                                  />
-                                </div>
-                              )}
-                            </div>
-                          </AnimatedSizeContainer>
+                          <div className="flex items-center gap-4">
+                            <Switch
+                              fn={setHasCustomLeadEventName}
+                              checked={hasCustomLeadEventName}
+                              trackDimensions="w-8 h-4"
+                              thumbDimensions="w-3 h-3"
+                              thumbTranslate="translate-x-4"
+                            />
+                            <div className="flex flex-col gap-1">
+                              <h3 className="text-sm font-medium text-neutral-700">
+                                Set a custom lead event name
+                              </h3>
+                            </div>
+                          </div>
+                          <AnimatedSizeContainer
+                            height
+                            transition={{ ease: "easeInOut", duration: 0.2 }}
+                            style={{
+                              height: hasCustomLeadEventName ? "auto" : "0px",
+                              overflow: "hidden",
+                            }}
+                          >
+                            {hasCustomLeadEventName && (
+                              <div className="p-px">
+                                <input
+                                  type="text"
+                                  className={cn(
+                                    "block w-full rounded-md border-neutral-300 px-3 py-2 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
+                                    errors.leadEventName &&
+                                      "border-red-600 focus:border-red-500 focus:ring-red-600",
+                                  )}
+                                  {...register("leadEventName", {
+                                    setValueAs: (value) =>
+                                      value === "" ? null : value,
+                                  })}
+                                  placeholder="Enter lead event name"
+                                />
+                              </div>
+                            )}
+                          </AnimatedSizeContainer>

---

726-782: Invoice ID toggle unreachable (switch hidden when off)

Move the Switch out; animate only the input.

Apply this diff:

-                          <AnimatedSizeContainer
-                            height
-                            transition={{ ease: "easeInOut", duration: 0.2 }}
-                            className={!hasInvoiceId ? "hidden" : ""}
-                            style={{
-                              display: !hasInvoiceId ? "none" : "block",
-                            }}
-                          >
-                            <div className="flex items-center gap-4">
-                              <Switch
-                                fn={setHasInvoiceId}
-                                checked={hasInvoiceId}
-                                trackDimensions="w-8 h-4"
-                                thumbDimensions="w-3 h-3"
-                                thumbTranslate="translate-x-4"
-                              />
-                              <div className="flex gap-1">
-                                <h3 className="text-sm font-medium text-neutral-700">
-                                  Add{" "}
-                                </h3>
-                                <span className="rounded-md border border-neutral-200 bg-neutral-100 px-1 py-0.5 text-xs">
-                                  invoiceID
-                                </span>
-                              </div>
-                            </div>
-
-                            {hasInvoiceId && (
-                              <div className="mt-4">
+                          <div className="flex items-center gap-4">
+                            <Switch
+                              fn={setHasInvoiceId}
+                              checked={hasInvoiceId}
+                              trackDimensions="w-8 h-4"
+                              thumbDimensions="w-3 h-3"
+                              thumbTranslate="translate-x-4"
+                            />
+                            <div className="flex gap-1">
+                              <h3 className="text-sm font-medium text-neutral-700">
+                                Add
+                              </h3>
+                              <span className="rounded-md border border-neutral-200 bg-neutral-100 px-1 py-0.5 text-xs">
+                                invoiceID
+                              </span>
+                            </div>
+                          </div>
+                          <AnimatedSizeContainer
+                            height
+                            transition={{ ease: "easeInOut", duration: 0.2 }}
+                            style={{
+                              height: hasInvoiceId ? "auto" : "0px",
+                              overflow: "hidden",
+                            }}
+                          >
+                            {hasInvoiceId && (
+                              <div className="mt-4">
                                 <label
                                   htmlFor="invoiceId"
                                   className="flex items-center space-x-2"
                                 >
                                   <h2 className="text-sm font-medium text-neutral-900">
                                     Invoice ID
                                   </h2>
                                 </label>
                                 <div className="mt-2 p-px">
                                   <input
                                     type="text"
                                     id="invoiceId"
                                     className={cn(
                                       "block w-full rounded-md border-neutral-300 px-3 py-2 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
                                       errors.invoiceId &&
                                         "border-red-600 focus:border-red-500 focus:ring-red-600",
                                     )}
                                     {...register("invoiceId", {
                                       required: hasInvoiceId,
                                       setValueAs: (value) =>
                                         value === "" ? null : value,
                                     })}
                                     placeholder="Enter invoice ID"
                                   />
                                 </div>
                               </div>
                             )}
-                          </AnimatedSizeContainer>
+                          </AnimatedSizeContainer>

---

783-838: Product ID toggle unreachable (same issue as Invoice ID)

Mirror the fix for Product ID.

Apply this diff:

-                          <AnimatedSizeContainer
-                            height
-                            transition={{ ease: "easeInOut", duration: 0.2 }}
-                            className={!hasProductId ? "hidden" : ""}
-                            style={{
-                              display: !hasProductId ? "none" : "block",
-                            }}
-                          >
-                            <div className="flex items-center gap-4">
-                              <Switch
-                                fn={setHasProductId}
-                                checked={hasProductId}
-                                trackDimensions="w-8 h-4"
-                                thumbDimensions="w-3 h-3"
-                                thumbTranslate="translate-x-4"
-                              />
-                              <div className="flex gap-1">
-                                <h3 className="text-sm font-medium text-neutral-700">
-                                  Add{" "}
-                                </h3>
-                                <span className="rounded-md border border-neutral-200 bg-neutral-100 px-1 py-0.5 text-xs">
-                                  productID
-                                </span>
-                              </div>
-                            </div>
-
-                            {hasProductId && (
-                              <div className="mt-4">
+                          <div className="flex items-center gap-4">
+                            <Switch
+                              fn={setHasProductId}
+                              checked={hasProductId}
+                              trackDimensions="w-8 h-4"
+                              thumbDimensions="w-3 h-3"
+                              thumbTranslate="translate-x-4"
+                            />
+                            <div className="flex gap-1">
+                              <h3 className="text-sm font-medium text-neutral-700">
+                                Add
+                              </h3>
+                              <span className="rounded-md border border-neutral-200 bg-neutral-100 px-1 py-0.5 text-xs">
+                                productID
+                              </span>
+                            </div>
+                          </div>
+                          <AnimatedSizeContainer
+                            height
+                            transition={{ ease: "easeInOut", duration: 0.2 }}
+                            style={{
+                              height: hasProductId ? "auto" : "0px",
+                              overflow: "hidden",
+                            }}
+                          >
+                            {hasProductId && (
+                              <div className="mt-4">
                                 <label
                                   htmlFor="productId"
                                   className="flex items-center space-x-2"
                                 >
                                   <h2 className="text-sm font-medium text-neutral-900">
                                     Product ID
                                   </h2>
                                 </label>
                                 <div className="mt-2 p-px">
                                   <input
                                     type="text"
                                     id="productId"
                                     className={cn(
                                       "block w-full rounded-md border-neutral-300 px-3 py-2 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
                                       errors.productId &&
                                         "border-red-600 focus:border-red-500 focus:ring-red-600",
                                     )}
                                     {...register("productId", {
                                       required: hasProductId,
                                       setValueAs: (value) =>
                                         value === "" ? null : value,
                                     })}
                                     placeholder="Enter product ID"
                                   />
                                 </div>
                               </div>
                             )}
-                          </AnimatedSizeContainer>
+                          </AnimatedSizeContainer>

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx (1)

874-951: Stabilize rows with getRowId for eventId

Better table behavior on updates; avoids index-based keys.

Apply this diff:

-  const table = useTable({
+  const table = useTable({
     data: events || [],
+    getRowId: (row) => row.eventId,

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

apps/web/lib/actions/partners/create-manual-commission.ts (7)

165-169: Remove debug console logs (PII risk, noisy in prod logs)

These log raw customer/event payloads. Prefer structured logging behind a debug flag if needed.

-      console.log("Found existing click event: ", existingClickEvent);
-      console.log("Found existing lead event: ", existingLeadEvent);
-      console.log("Found existing sale events: ", existingSaleEvents);
@@
-      console.log(
-        `Duplicated customer ${customer.id} to ${duplicatedCustomer.id}: `,
-        duplicatedCustomer,
-      );
@@
-    console.log("recorded events in Tinybird: ", res);
@@
-        console.log(
-          "Final commissions to transfer event ids: ",
-          finalCommissionsToTransferEventIds,
-        );

Also applies to: 169-173, 315-318, 416-417, 425-428

---

328-339: Preserve country on generated click events

Without country, Zod defaults to "Unknown", which later overwrites customer country.

       const generatedClickEvent = recordClickZodSchema.parse({
         timestamp: clickTimestamp.toISOString(),
         identity_hash: customer.externalId || customer.id,
         click_id: clickId,
         link_id: link.id,
         url: link.url,
         ip: "127.0.0.1",
+        country: customer.country || "Unknown",
         continent: customer.country
           ? COUNTRIES_TO_CONTINENTS[customer.country.toUpperCase()] || "NA"
           : "NA",
       });

---

437-447: Use correct customer context for first-conversion calc after duplication

Passing the original customer inflates conversions. Use duplicated stats.

-              ...(isFirstConversion({
-                customer,
-                linkId,
-              }) && {
+              ...(isFirstConversion({
+                customer: useExistingEvents
+                  ? { sales: totalSales, linkId: link.id }
+                  : customer,
+                linkId,
+              }) && {

---

430-471: Update customer stats in non-reuse sale path for consistency

When creating new sale events (!useExistingEvents), customer.sales/saleAmount aren’t incremented.

         const updatedRes = await Promise.all([
           // update link stats
           prisma.link.update({
@@
           }),
+          // keep customer stats in sync for new sale events
+          !useExistingEvents &&
+            saleAmount &&
+            prisma.customer.update({
+              where: { id: customer.id },
+              data: {
+                sales: { increment: 1 },
+                saleAmount: { increment: saleAmount },
+              },
+            }),
           // update the commissions
-          finalCommissionsToTransferEventIds.length > 0 &&
-            prisma.commission.updateMany({
-              where: {
-                eventId: {
-                  in: finalCommissionsToTransferEventIds,
-                },
-              },
-              data: {
-                eventId: null,
-                invoiceId: null,
-              },
-            }),
+          /* provenance-preserving transfer handled elsewhere */
         ]);

---

175-183: Fix crash when no existing click; also ensure a click is recorded to maintain event chain

Spreading existingClickEvent when it’s undefined throws, and later you rely on clickEventData regardless. Build from a safe base, infer a timestamp/identity, and always record the click.

-      const clickEventData = recordClickZodSchema.parse({
-        ...existingClickEvent,
-        click_id: nanoid(16), // create new clickId
-        link_id: link.id, // set to new link.id,
-      });
-
-      if (existingClickEvent) {
-        tbEventsToRecord.push(recordClickZod(clickEventData));
-      }
+      const inferredClickTs =
+        (existingClickEvent?.timestamp as string | undefined) ??
+        (existingLeadEvent?.timestamp as string | undefined) ??
+        (existingSaleEvents[0]?.timestamp as string | undefined) ??
+        new Date().toISOString();
+
+      const clickEventData = recordClickZodSchema.parse({
+        ...(existingClickEvent ?? {}),
+        timestamp: inferredClickTs,
+        identity_hash:
+          existingClickEvent?.identity_hash ?? customer.externalId ?? customer.id,
+        click_id: nanoid(16),
+        link_id: link.id,
+      });
+
+      tbEventsToRecord.push(recordClickZod(clickEventData));

---

457-469: Do not nullify eventId/invoiceId — breaks dedup, reporting, and auditability

Nulling provenance fields severs links used across exports, payouts, and idempotency. Prefer updating attribution (partner/link/customer) or recording a transfer record; don’t destroy keys.

-          finalCommissionsToTransferEventIds.length > 0 &&
-            prisma.commission.updateMany({
-              where: {
-                eventId: {
-                  in: finalCommissionsToTransferEventIds,
-                },
-              },
-              data: {
-                eventId: null,
-                invoiceId: null,
-              },
-            }),
+          // Intentionally avoid nullifying provenance fields; handle attribution transfer explicitly elsewhere.

---

299-312: Do not spread Prisma entity into create(); copy safe fields and null external/unique fields

Spreading ...customer risks unique constraint violations (e.g., external/Stripe IDs), wrong timestamps, and leaking old attribution.

-        return await tx.customer.create({
-          data: {
-            ...customer,
-            id: duplicateCustomerId,
-            linkId: link.id,
-            clickId: clickEventData.click_id,
-            clickedAt: new Date(clickEventData.timestamp),
-            country: clickEventData.country,
-            ...(recordSaleEvents && {
-              sales: totalSales,
-              saleAmount: totalSaleAmount,
-            }),
-          },
-        });
+        return await tx.customer.create({
+          data: {
+            id: duplicateCustomerId,
+            name: customer.name,
+            email: customer.email,
+            avatar: customer.avatar,
+            // reset external/unique fields
+            externalId: null,
+            stripeCustomerId: null,
+            // preserve original country when available
+            country: customer.country ?? clickEventData.country,
+            linkId: link.id,
+            clickId: clickEventData.click_id,
+            clickedAt: new Date(
+              (existingLeadEvent?.timestamp as string | undefined) ??
+                (existingSaleEvents[0]?.timestamp as string | undefined) ??
+                clickEventData.timestamp
+            ),
+            ...(recordSaleEvents
+              ? { sales: totalSales, saleAmount: totalSaleAmount }
+              : {}),
+          },
+        });

apps/web/lib/actions/partners/create-manual-commission.ts (2)

373-387: Guard sale-event creation by commissionType to avoid stray sales

Currently a “lead” commission with saleAmount records a sale event but no commission. Gate by type.

-      if (saleAmount) {
+      if (commissionType === "sale" && saleAmount) {

---

415-417: Handle Tinybird ingest failures explicitly

At least count rejects and surface an actionable error/log, not raw payloads.

-    const res = await Promise.allSettled(tbEventsToRecord);
-    console.log("recorded events in Tinybird: ", res);
+    const res = await Promise.allSettled(tbEventsToRecord);
+    const failures = res.filter((r) => r.status === "rejected");
+    if (failures.length > 0) {
+      // consider bubbling or structured logging
+      throw new Error(`Failed to record ${failures.length} event(s) to Tinybird`);
+    }

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

apps/web/lib/actions/partners/create-manual-commission.ts (4)

439-447: Compute first‑conversion against the correct customer in reuse flow.

isFirstConversion should use the duplicated customer’s stats, not the original.

Apply:

-              ...(isFirstConversion({
-                customer,
-                linkId,
-              }) && {
+              ...(isFirstConversion({
+                customer: useExistingEvents
+                  ? { sales: totalSales, linkId: link.id }
+                  : customer,
+                linkId,
+              }) && {

---

178-187: Fix: build clickEventData safely when no existing click; also ensure identity/timestamp.

Spreading possibly-undefined existingClickEvent is okay, but timestamp defaults to "" which later produces Invalid Date for clickedAt.

Apply:

+      const inferredClickTs =
+        (existingClickEvent?.timestamp as string | undefined) ??
+        (existingLeadEvent?.timestamp as string | undefined) ??
+        (existingSaleEvents[0]?.timestamp as string | undefined) ??
+        new Date().toISOString();
       const clickEventData = recordClickZodSchema.parse({
-        ...existingClickEvent,
-        ...newClickAttributes,
+        ...(existingClickEvent ?? {}),
+        timestamp: inferredClickTs,
+        identity_hash:
+          existingClickEvent?.identity_hash ?? customer.externalId ?? customer.id,
+        ...newClickAttributes,
       });

---

460-471: Provenance risk: nullifying eventId/invoiceId; also scope the update by programId.

Setting eventId/invoiceId to null severs audit/dedup trails. At minimum, constrain by programId; ideally, preserve originals in audit metadata.

Apply scoping fix:

-            prisma.commission.updateMany({
-              where: {
-                eventId: {
-                  in: finalCommissionsToTransferEventIds,
-                },
-              },
+            prisma.commission.updateMany({
+              where: {
+                programId,
+                eventId: { in: finalCommissionsToTransferEventIds },
+              },
               data: {
                 eventId: null,
                 invoiceId: null,
               },
             }),

Recommendation: record an explicit audit entry mapping old→new event/invoice IDs before nullifying. I can wire that if desired.

---

291-318: Critical: don’t spread a Prisma entity into create(); copy safe fields and fix clickedAt fallback.

Spreading ...customer risks unique/timestamp/counter fields being reinserted and sets clickedAt from possibly invalid timestamp.

Apply:

-        return await tx.customer.create({
-          data: {
-            ...customer,
-            id: duplicateCustomerId,
-            linkId: link.id,
-            clickId: clickEventData.click_id,
-            clickedAt: new Date(clickEventData.timestamp),
-            country: clickEventData.country,
-            ...(recordSaleEvents && {
-              sales: totalSales,
-              saleAmount: totalSaleAmount,
-            }),
-          },
-        });
+        return await tx.customer.create({
+          data: {
+            id: duplicateCustomerId,
+            projectId: workspace.id,
+            name: customer.name ?? null,
+            externalId: customer.externalId ?? null,
+            country: clickEventData.country,
+            linkId: link.id,
+            clickId: clickEventData.click_id,
+            clickedAt: new Date(
+              (existingLeadEvent?.timestamp as string | undefined) ??
+                (existingSaleEvents[0]?.timestamp as string | undefined) ??
+                clickEventData.timestamp
+            ),
+            ...(recordSaleEvents && {
+              sales: totalSales,
+              saleAmount: totalSaleAmount,
+            }),
+          },
+        });

apps/web/lib/partners/create-partner-commission.ts (1)

165-176: Use event timestamp (createdAt) for max‑duration checks, not “now”.

Backfills can be incorrectly rejected/accepted when using the current time. Base differenceInMonths on the event’s createdAt when provided.

Apply:

-              const monthsDifference = differenceInMonths(
-                new Date(),
-                firstCommission.createdAt,
-              );
+              const referenceDate = createdAt ?? new Date();
+              const monthsDifference = differenceInMonths(
+                referenceDate,
+                firstCommission.createdAt,
+              );

apps/web/lib/actions/partners/create-manual-commission.ts (3)

334-345: Include country on generated click to preserve customer geo.

Without country, defaults can backfill “Unknown” and desync continent/country.

Apply:

       const generatedClickEvent = recordClickZodSchema.parse({
         timestamp: clickTimestamp.toISOString(),
         identity_hash: customer.externalId || customer.id,
         click_id: clickId,
         link_id: link.id,
         url: link.url,
         ip: "127.0.0.1",
+        country: customer.country || "Unknown",
         continent: customer.country
           ? COUNTRIES_TO_CONTINENTS[customer.country.toUpperCase()] || "NA"
           : "NA",
       });

---

165-176: Remove debug console logs (noise + PII risk).

These print event/customer payloads into server logs. Use structured logging with redaction if needed.

Apply deletions across the selected lines.

Also applies to: 187-191, 251-253, 321-324, 417-419, 427-430, 474-477, 479-480

---

432-456: Non‑reuse path: update customer sales stats when creating sale events.

To keep stats consistent with reuse path, increment customer.sales and saleAmount when saleAmount is provided.

Apply:

         const updatedRes = await Promise.all([
           // update link stats
           prisma.link.update({
             where: {
               id: link.id,
             },
             data: {
               ...(isFirstConversion({
                 customer: useExistingEvents
                   ? { sales: totalSales, linkId: link.id }
                   : customer,
                 linkId,
               }) && {
                 leads: {
                   increment: 1,
                 },
                 conversions: {
                   increment: 1,
                 },
               }),
               sales: {
                 increment: saleAmount ? 1 : totalSales,
               },
               saleAmount: {
                 increment: saleAmount ?? totalSaleAmount,
               },
             },
           }),
+          // keep customer stats in sync for non-reuse sales
+          !useExistingEvents &&
+            saleAmount &&
+            prisma.customer.update({
+              where: { id: customer.id },
+              data: {
+                sales: { increment: 1 },
+                saleAmount: { increment: saleAmount },
+              },
+            }),

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

apps/web/lib/partners/create-partner-commission.ts (1)

229-229: Guard currencyFormatter and redact payload to avoid crash and PII in logs

Passing { currency: undefined } overrides the default USD and makes Intl.NumberFormat throw; also avoid logging the full commission object.

-    console.log(
-      `Created a ${event} commission ${commission.id} (${currencyFormatter(commission.earnings / 100, { currency: commission.currency })}) for ${partnerId}: ${JSON.stringify(commission)}`,
-    );
+    console.log(
+      `Created a ${event} commission ${commission.id} (${
+        currencyFormatter(
+          commission.earnings / 100,
+          commission.currency ? { currency: commission.currency } : undefined,
+        )
+      }) for ${partnerId}`,
+      { commissionId: commission.id, partnerId, programId },
+    );

apps/web/lib/partners/create-partner-commission.ts (2)

25-41: Encode per-event invariants with a discriminated union

This prevents invalid combinations (e.g., sale without amount/currency) at compile time.

-export type CreatePartnerCommissionProps = {
-  event: CommissionType;
-  partnerId: string;
-  programId: string;
-  linkId?: string;
-  customerId?: string;
-  eventId?: string;
-  invoiceId?: string | null;
-  amount?: number;
-  quantity: number;
-  currency?: string;
-  description?: string | null;
-  createdAt?: Date;
-  user?: Session["user"]; // user who created the manual commission
-  context?: RewardContext;
-  skipWorkflow?: boolean;
-};
+type BaseCommissionProps = {
+  partnerId: string;
+  programId: string;
+  linkId?: string;
+  customerId?: string;
+  eventId?: string;
+  invoiceId?: string | null;
+  description?: string | null;
+  createdAt?: Date;
+  user?: Session["user"];
+  context?: RewardContext;
+  skipWorkflow?: boolean;
+};
+
+export type CreatePartnerCommissionProps =
+  | (BaseCommissionProps & {
+      event: "custom";
+      amount: number;
+      quantity: number;
+      currency?: string;
+    })
+  | (BaseCommissionProps & {
+      event: "click";
+      quantity: number;
+    })
+  | (BaseCommissionProps & {
+      event: "lead";
+      quantity: number;
+    })
+  | (BaseCommissionProps & {
+      event: "sale";
+      amount: number;
+      quantity: number;
+      currency: string;
+      invoiceId?: string | null;
+    });

---

211-213: Trim and null-normalize IDs to handle whitespace-only input

Prevents storing " " instead of null.

-        eventId: eventId || null, // empty string should convert to null
-        invoiceId: invoiceId || null, // empty string should convert to null
+        eventId: eventId?.trim() || null, // empty/whitespace string -> null
+        invoiceId: invoiceId?.trim() || null, // empty/whitespace string -> null