Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Submitted referrals followup (#3369)

Kiran K55cfede27d2f
diff --git a/apps/web/lib/actions/referrals/mark-referral-qualified.ts b/apps/web/lib/actions/referrals/mark-referral-qualified.ts
index 29d8d7a2b9..b86f1d5e0c 100644
--- a/apps/web/lib/actions/referrals/mark-referral-qualified.ts
+++ b/apps/web/lib/actions/referrals/mark-referral-qualified.ts
@@ -18,7 +18,7 @@ export const markReferralQualifiedAction = authActionClient
.inputSchema(markReferralQualifiedSchema)
.action(async ({ parsedInput, ctx }) => {
const { workspace } = ctx;
- const { referralId } = parsedInput;
+ const { referralId, externalId } = parsedInput;
const programId = getDefaultProgramIdOrThrow(workspace);
@@ -72,13 +72,16 @@ export const markReferralQualifiedAction = authActionClient
link: pick(partnerLink, ["id", "url", "domain", "key", "projectId"]),
});
+ // Use provided externalId or fallback to referral email
+ const customerExternalId = externalId || referral.email;
+
// Create a customer
const customer = await prisma.customer.create({
data: {
id: createId({ prefix: "cus_" }),
name: referral.name,
email: referral.email,
- externalId: referral.email,
+ externalId: customerExternalId,
projectId: workspace.id,
projectConnectId: workspace.stripeConnectId,
programId,
@@ -92,7 +95,7 @@ export const markReferralQualifiedAction = authActionClient
await trackLead({
clickId: clickEvent.click_id,
eventName: "Qualified Lead",
- customerExternalId: referral.email,
+ customerExternalId,
customerName: customer.name,
customerEmail: customer.email,
mode: "wait",
diff --git a/apps/web/lib/zod/schemas/referrals.ts b/apps/web/lib/zod/schemas/referrals.ts
index ab8df175b5..f44e0ba651 100644
--- a/apps/web/lib/zod/schemas/referrals.ts
+++ b/apps/web/lib/zod/schemas/referrals.ts
@@ -65,6 +65,7 @@ export const createPartnerReferralSchema = z.object({
export const markReferralQualifiedSchema = z.object({
referralId: z.string(),
workspaceId: z.string(),
+ externalId: z.string().trim().optional(),
});
export const markReferralUnqualifiedSchema = z.object({
diff --git a/apps/web/lib/zod/schemas/rewards.ts b/apps/web/lib/zod/schemas/rewards.ts
index 4a0a36f1ff..0b05de0cb2 100644
--- a/apps/web/lib/zod/schemas/rewards.ts
+++ b/apps/web/lib/zod/schemas/rewards.ts
@@ -206,6 +206,9 @@ export const NUMBER_CONDITION_OPERATORS: (typeof CONDITION_OPERATORS)[number][]
"less_than_or_equal",
];
+export const SOURCE_CONDITION_OPERATORS: (typeof CONDITION_OPERATORS)[number][] =
+ ["equals_to", "not_equals"];
+
export const CONDITION_OPERATOR_LABELS = {
equals_to: "is",
not_equals: "is not",
diff --git a/apps/web/ui/customers/customer-details-column.tsx b/apps/web/ui/customers/customer-details-column.tsx
index d4bdef458f..22106bb40b 100644
--- a/apps/web/ui/customers/customer-details-column.tsx
+++ b/apps/web/ui/customers/customer-details-column.tsx
@@ -126,7 +126,7 @@ export function CustomerDetailsColumn({
{customer && (
<Button
variant="secondary"
- icon={<Pencil className="size-4" />}
+ icon={<Pencil className="size-3.5" />}
text="Edit"
className="h-7 w-fit rounded-lg px-2"
onClick={() => openEditCustomerModal(customer)}
@@ -149,21 +149,21 @@ export function CustomerDetailsColumn({
<div className="flex flex-col gap-2 p-4">
{basicFields.map(({ id, icon, text }) => (
- <div key={id}>
- <div className="text-content-default flex items-center gap-1.5">
- {text !== undefined ? (
- <>
- {icon}
- <span className="min-w-0 truncate text-xs font-medium">
- {text}
- </span>
- </>
- ) : (
- <div className="h-4 w-24 animate-pulse rounded bg-neutral-200" />
- )}
- </div>
+ <div key={id}>
+ <div className="text-content-default flex items-center gap-1.5">
+ {text !== undefined ? (
+ <>
+ {icon}
+ <span className="min-w-0 truncate text-xs font-medium">
+ {text}
+ </span>
+ </>
+ ) : (
+ <div className="h-4 w-24 animate-pulse rounded bg-neutral-200" />
+ )}
</div>
- ))}
+ </div>
+ ))}
</div>
<div className="@md/page:grid-cols-2 @3xl/page:grid-cols-1 grid grid-cols-1 gap-5 p-4 text-xs">
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index 3aedfe6992..b73d3dede8 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -11,6 +11,7 @@ import usePayoutsCount from "@/lib/swr/use-payouts-count";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
import useWorkspaces from "@/lib/swr/use-workspaces";
+import { usePartnerReferralsCount } from "@/ui/referrals/use-partner-referrals-count";
import { useRouterStuff } from "@dub/ui";
import {
Bell,
@@ -70,6 +71,7 @@ type SidebarNavData = {
submittedBountiesCount?: number;
unreadMessagesCount?: number;
pendingFraudEventsCount?: number;
+ pendingReferralsCount?: number;
showConversionGuides?: boolean;
partnerNetworkEnabled?: boolean;
};
@@ -205,7 +207,9 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
submittedBountiesCount,
unreadMessagesCount,
pendingFraudEventsCount,
+ pendingReferralsCount,
partnerNetworkEnabled,
+ pathname,
}) => ({
title: "Partner Program",
showNews,
@@ -291,6 +295,13 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
name: "Customers",
icon: UserCheck,
href: `/${slug}/program/customers`,
+ badge:
+ pathname?.includes("/customers/referrals") &&
+ pendingReferralsCount
+ ? pendingReferralsCount > 99
+ ? "99+"
+ : pendingReferralsCount
+ : undefined,
},
{
name: "Commissions",
@@ -591,6 +602,14 @@ export function AppSidebarNav({
ignoreParams: true,
});
+ const { data: pendingReferralsCount } = usePartnerReferralsCount<number>({
+ query:
+ currentArea === "program" && defaultProgramId
+ ? { status: "pending" }
+ : undefined,
+ includeParams: ["status"],
+ });
+
const { canTrackConversions } = getPlanCapabilities(plan);
return (
@@ -612,6 +631,7 @@ export function AppSidebarNav({
submittedBountiesCount,
unreadMessagesCount,
pendingFraudEventsCount,
+ pendingReferralsCount,
showConversionGuides: canTrackConversions,
partnerNetworkEnabled:
program && program.partnerNetworkEnabledAt !== null,
diff --git a/apps/web/ui/modals/mark-partner-referral-closed-won-modal.tsx b/apps/web/ui/modals/mark-partner-referral-closed-won-modal.tsx
deleted file mode 100644
index 5d5db73756..0000000000
--- a/apps/web/ui/modals/mark-partner-referral-closed-won-modal.tsx
+++ /dev/null
@@ -1,204 +0,0 @@
-"use client";
-
-import { markReferralClosedWonAction } from "@/lib/actions/referrals/mark-referral-closed-won";
-import { handleMoneyInputChange, handleMoneyKeyDown } from "@/lib/form-utils";
-import { mutatePrefix } from "@/lib/swr/mutate";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { referralSchema } from "@/lib/zod/schemas/referrals";
-import { Button, Modal } from "@dub/ui";
-import { cn } from "@dub/utils";
-import { useAction } from "next-safe-action/hooks";
-import { useCallback, useMemo, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import * as z from "zod/v4";
-
-type PartnerReferralProps = z.infer<typeof referralSchema>;
-
-type MarkPartnerReferralClosedWonFormData = {
- saleAmount: number | null;
- stripeCustomerId: string;
-};
-
-export function useMarkPartnerReferralClosedWonModal({
- referral,
-}: {
- referral: PartnerReferralProps;
-}) {
- const { id: workspaceId } = useWorkspace();
- const [showModal, setShowModal] = useState(false);
-
- const {
- register,
- handleSubmit,
- formState: { errors, isSubmitting },
- reset,
- } = useForm<MarkPartnerReferralClosedWonFormData>({
- defaultValues: {
- saleAmount: null,
- stripeCustomerId: "",
- },
- });
-
- const { executeAsync, isPending } = useAction(markReferralClosedWonAction, {
- onSuccess: async () => {
- toast.success("Partner referral marked as closed won successfully!");
- mutatePrefix("/api/programs/referrals");
- setShowModal(false);
- reset();
- },
- onError({ error }) {
- toast.error(error.serverError);
- },
- });
-
- const onSubmit = useCallback(
- async (data: MarkPartnerReferralClosedWonFormData) => {
- if (!workspaceId || !referral.id || data.saleAmount === null) {
- return;
- }
-
- // Convert sale amount from dollars to cents
- const saleAmountInCents = Math.round(data.saleAmount * 100);
-
- await executeAsync({
- workspaceId,
- referralId: referral.id,
- saleAmount: saleAmountInCents,
- stripeCustomerId: data.stripeCustomerId || undefined,
- });
- },
- [executeAsync, referral.id, workspaceId],
- );
-
- const closedWonModal = useMemo(
- () => (
- <Modal showModal={showModal} setShowModal={setShowModal}>
- <form onSubmit={handleSubmit(onSubmit)}>
- <div className="flex flex-col gap-1 border-b border-neutral-200 px-[18px] py-5 text-left">
- <h3 className="text-content-emphasis text-base font-semibold">
- Lead closed won
- </h3>
- <p className="text-content-subtle text-sm">
- Are you sure you want to mark this partner referral as closed won?
- </p>
- </div>
-
- <div className="flex flex-col gap-5 p-5">
- <div className="flex flex-col gap-2">
- <label className="text-content-emphasis block text-sm font-medium">
- Sale Amount (required)
- </label>
- <div className="relative rounded-md shadow-sm">
- <span className="absolute inset-y-0 left-0 flex items-center pl-3 text-sm text-neutral-400">
- $
- </span>
- <input
- type="number"
- step="0.01"
- min="0"
- className={cn(
- "block w-full rounded-md border-neutral-300 pl-6 pr-12 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
- errors.saleAmount &&
- "border-red-600 focus:border-red-500 focus:ring-red-600",
- )}
- placeholder="50000"
- {...register("saleAmount", {
- required: "Sale amount is required",
- min: {
- value: 0,
- message: "Sale amount must be greater than or equal to 0",
- },
- valueAsNumber: true,
- onChange: handleMoneyInputChange,
- })}
- onKeyDown={handleMoneyKeyDown}
- />
- <span className="absolute inset-y-0 right-0 flex items-center pr-3 text-sm text-neutral-400">
- USD
- </span>
- </div>
-
- {errors.saleAmount && (
- <p className="text-xs text-red-600">
- {errors.saleAmount.message}
- </p>
- )}
-
- <p className="text-xs text-neutral-500">
- This will be also recorded as a sale commission (if applicable)
- </p>
- </div>
-
- <div className="flex flex-col gap-2">
- <label className="text-content-emphasis block text-sm font-medium">
- Stripe Customer ID
- </label>
- <div className="relative rounded-md shadow-sm">
- <input
- type="text"
- className={cn(
- "block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
- errors.stripeCustomerId &&
- "border-red-600 focus:border-red-500 focus:ring-red-600",
- )}
- placeholder="cus_NffrFeUfNV2Hib"
- {...register("stripeCustomerId", {
- required: false,
- })}
- />
- </div>
-
- {errors.stripeCustomerId && (
- <p className="text-xs text-red-600">
- {errors.stripeCustomerId.message}
- </p>
- )}
-
- <p className="text-xs text-neutral-500">
- The customer's Stripe Customer ID (optional)
- </p>
- </div>
- </div>
-
- <div className="border-border-subtle flex items-center justify-end gap-2 border-t px-5 py-4">
- <Button
- variant="secondary"
- className="h-8 w-fit px-3"
- text="Cancel"
- shortcut="C"
- onClick={() => {
- setShowModal(false);
- reset();
- }}
- />
- <Button
- type="submit"
- variant="primary"
- className="h-8 w-fit px-3"
- text="Closed won"
- shortcut="W"
- loading={isPending || isSubmitting}
- />
- </div>
- </form>
- </Modal>
- ),
- [
- showModal,
- handleSubmit,
- onSubmit,
- register,
- errors,
- isPending,
- isSubmitting,
- reset,
- ],
- );
-
- return {
- setShowModal,
- ClosedWonModal: closedWonModal,
- isMarkingClosedWon: isPending || isSubmitting,
- };
-}
diff --git a/apps/web/ui/modals/mark-partner-referral-closed-lost-modal.tsx b/apps/web/ui/modals/mark-referral-closed-lost-modal.tsx
similarity index 85%
rename from apps/web/ui/modals/mark-partner-referral-closed-lost-modal.tsx
rename to apps/web/ui/modals/mark-referral-closed-lost-modal.tsx
index 4ce69adf7e..3c5d7bd8f2 100644
--- a/apps/web/ui/modals/mark-partner-referral-closed-lost-modal.tsx
+++ b/apps/web/ui/modals/mark-referral-closed-lost-modal.tsx
@@ -3,18 +3,15 @@
import { markReferralClosedLostAction } from "@/lib/actions/referrals/mark-referral-closed-lost";
import { mutatePrefix } from "@/lib/swr/mutate";
import useWorkspace from "@/lib/swr/use-workspace";
-import { referralSchema } from "@/lib/zod/schemas/referrals";
+import { ReferralProps } from "@/lib/types";
import { useConfirmModal } from "@/ui/modals/confirm-modal";
import { useAction } from "next-safe-action/hooks";
import { toast } from "sonner";
-import * as z from "zod/v4";
-type PartnerReferralProps = z.infer<typeof referralSchema>;
-
-export function useMarkPartnerReferralClosedLostModal({
+export function useMarkReferralClosedLostModal({
referral,
}: {
- referral: PartnerReferralProps;
+ referral: ReferralProps;
}) {
const { id: workspaceId } = useWorkspace();
diff --git a/apps/web/ui/modals/mark-referral-closed-won-modal.tsx b/apps/web/ui/modals/mark-referral-closed-won-modal.tsx
new file mode 100644
index 0000000000..25806a063f
--- /dev/null
+++ b/apps/web/ui/modals/mark-referral-closed-won-modal.tsx
@@ -0,0 +1,245 @@
+"use client";
+
+import { markReferralClosedWonAction } from "@/lib/actions/referrals/mark-referral-closed-won";
+import { handleMoneyInputChange, handleMoneyKeyDown } from "@/lib/form-utils";
+import { mutatePrefix } from "@/lib/swr/mutate";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { ReferralProps } from "@/lib/types";
+import { Button, Modal, useKeyboardShortcut } from "@dub/ui";
+import { cn } from "@dub/utils";
+import { useAction } from "next-safe-action/hooks";
+import { Dispatch, SetStateAction, useCallback, useRef, useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+
+type ReferralClosedWonFormData = {
+ saleAmount: number | null;
+ stripeCustomerId: string;
+};
+
+interface ReferralClosedWonModalProps {
+ showModal: boolean;
+ setShowModal: Dispatch<SetStateAction<boolean>>;
+ referral: ReferralProps;
+ onSubmit: (data: ReferralClosedWonFormData) => Promise<void>;
+ isPending: boolean;
+ onResetRef: React.MutableRefObject<(() => void) | null>;
+}
+
+function ReferralClosedWonModal({
+ showModal,
+ setShowModal,
+ onSubmit,
+ isPending,
+ onResetRef,
+}: ReferralClosedWonModalProps) {
+ const {
+ register,
+ handleSubmit,
+ formState: { errors, isSubmitting },
+ reset,
+ } = useForm<ReferralClosedWonFormData>({
+ defaultValues: {
+ saleAmount: null,
+ stripeCustomerId: "",
+ },
+ });
+
+ // Store reset function in ref so parent can call it
+ onResetRef.current = reset;
+
+ const handleFormSubmit = handleSubmit(onSubmit);
+
+ // Keyboard shortcuts for modal actions
+ useKeyboardShortcut(
+ "w",
+ (e) => {
+ if (showModal && !isPending && !isSubmitting) {
+ e.preventDefault();
+ handleFormSubmit(e as any);
+ }
+ },
+ { modal: true },
+ );
+
+ useKeyboardShortcut(
+ "c",
+ (e) => {
+ if (showModal) {
+ e.preventDefault();
+ setShowModal(false);
+ reset();
+ }
+ },
+ { modal: true },
+ );
+
+ return (
+ <Modal showModal={showModal} setShowModal={setShowModal}>
+ <form onSubmit={handleFormSubmit}>
+ <div className="flex flex-col gap-1 border-b border-neutral-200 px-[18px] py-5 text-left">
+ <h3 className="text-content-emphasis text-base font-semibold">
+ Lead closed won
+ </h3>
+ <p className="text-content-subtle text-sm">
+ Are you sure you want to mark this partner referral as closed won?
+ </p>
+ </div>
+
+ <div className="flex flex-col gap-5 p-5">
+ <div className="flex flex-col gap-2">
+ <label className="text-content-emphasis block text-sm font-medium">
+ Sale Amount (required)
+ </label>
+ <div className="relative rounded-md shadow-sm">
+ <span className="absolute inset-y-0 left-0 flex items-center pl-3 text-sm text-neutral-400">
+ $
+ </span>
+ <input
+ type="number"
+ step="0.01"
+ min="0"
+ className={cn(
+ "block w-full rounded-md border-neutral-300 pl-6 pr-12 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
+ errors.saleAmount &&
+ "border-red-600 focus:border-red-500 focus:ring-red-600",
+ )}
+ placeholder="50000"
+ {...register("saleAmount", {
+ required: "Sale amount is required",
+ min: {
+ value: 0,
+ message: "Sale amount must be greater than or equal to 0",
+ },
+ valueAsNumber: true,
+ onChange: handleMoneyInputChange,
+ })}
+ onKeyDown={handleMoneyKeyDown}
+ />
+ <span className="absolute inset-y-0 right-0 flex items-center pr-3 text-sm text-neutral-400">
+ USD
+ </span>
+ </div>
+
+ {errors.saleAmount && (
+ <p className="text-xs text-red-600">
+ {errors.saleAmount.message}
+ </p>
+ )}
+
+ <p className="text-xs text-neutral-500">
+ This will be also recorded as a sale commission (if applicable)
+ </p>
+ </div>
+
+ <div className="flex flex-col gap-2">
+ <label className="text-content-emphasis block text-sm font-medium">
+ Stripe Customer ID
+ </label>
+ <div className="relative rounded-md shadow-sm">
+ <input
+ type="text"
+ className={cn(
+ "block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
+ errors.stripeCustomerId &&
+ "border-red-600 focus:border-red-500 focus:ring-red-600",
+ )}
+ placeholder="cus_NffrFeUfNV2Hib"
+ {...register("stripeCustomerId", {
+ required: false,
+ })}
+ />
+ </div>
+
+ {errors.stripeCustomerId && (
+ <p className="text-xs text-red-600">
+ {errors.stripeCustomerId.message}
+ </p>
+ )}
+
+ <p className="text-xs text-neutral-500">
+ The customer's Stripe Customer ID (optional)
+ </p>
+ </div>
+ </div>
+
+ <div className="border-border-subtle flex items-center justify-end gap-2 border-t px-5 py-4">
+ <Button
+ variant="secondary"
+ className="h-8 w-fit px-3"
+ text="Cancel"
+ shortcut="C"
+ onClick={() => {
+ setShowModal(false);
+ reset();
+ }}
+ />
+ <Button
+ type="submit"
+ variant="primary"
+ className="h-8 w-fit px-3"
+ text="Closed won"
+ shortcut="W"
+ loading={isPending || isSubmitting}
+ />
+ </div>
+ </form>
+ </Modal>
+ );
+}
+
+export function useMarkReferralClosedWonModal({
+ referral,
+}: {
+ referral: ReferralProps;
+}) {
+ const { id: workspaceId } = useWorkspace();
+ const [showModal, setShowModal] = useState(false);
+ const resetFormRef = useRef<(() => void) | null>(null);
+
+ const { executeAsync, isPending } = useAction(markReferralClosedWonAction, {
+ onSuccess: async () => {
+ toast.success("Partner referral marked as closed won successfully!");
+ mutatePrefix("/api/programs/referrals");
+ setShowModal(false);
+ resetFormRef.current?.();
+ },
+ onError({ error }) {
+ toast.error(error.serverError);
+ },
+ });
+
+ const onSubmit = useCallback(
+ async (data: ReferralClosedWonFormData) => {
+ if (!workspaceId || !referral.id || data.saleAmount === null) {
+ return;
+ }
+
+ // Convert sale amount from dollars to cents
+ const saleAmountInCents = Math.round(data.saleAmount * 100);
+
+ await executeAsync({
+ workspaceId,
+ referralId: referral.id,
+ saleAmount: saleAmountInCents,
+ stripeCustomerId: data.stripeCustomerId || undefined,
+ });
+ },
+ [executeAsync, referral.id, workspaceId],
+ );
+
+ return {
+ setShowModal,
+ ClosedWonModal: (
+ <ReferralClosedWonModal
+ showModal={showModal}
+ setShowModal={setShowModal}
+ referral={referral}
+ onSubmit={onSubmit}
+ isPending={isPending}
+ onResetRef={resetFormRef}
+ />
+ ),
+ isMarkingClosedWon: isPending,
+ };
+}
diff --git a/apps/web/ui/modals/mark-referral-qualified-modal.tsx b/apps/web/ui/modals/mark-referral-qualified-modal.tsx
new file mode 100644
index 0000000000..3fc136bdc4
--- /dev/null
+++ b/apps/web/ui/modals/mark-referral-qualified-modal.tsx
@@ -0,0 +1,201 @@
+"use client";
+
+import { markReferralQualifiedAction } from "@/lib/actions/referrals/mark-referral-qualified";
+import { mutatePrefix } from "@/lib/swr/mutate";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { ReferralProps } from "@/lib/types";
+import { Button, Modal, useKeyboardShortcut } from "@dub/ui";
+import { cn } from "@dub/utils";
+import { useAction } from "next-safe-action/hooks";
+import { Dispatch, SetStateAction, useCallback, useEffect, useRef, useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+
+type ReferralQualifiedFormData = {
+ externalId: string;
+};
+
+interface ReferralQualifiedModalProps {
+ showModal: boolean;
+ setShowModal: Dispatch<SetStateAction<boolean>>;
+ referral: ReferralProps;
+ onSubmit: (data: ReferralQualifiedFormData) => Promise<void>;
+ isPending: boolean;
+ onResetRef: React.MutableRefObject<(() => void) | null>;
+}
+
+function ReferralQualifiedModal({
+ showModal,
+ setShowModal,
+ onSubmit,
+ isPending,
+ onResetRef,
+}: ReferralQualifiedModalProps) {
+ const {
+ register,
+ handleSubmit,
+ formState: { errors, isSubmitting },
+ reset,
+ } = useForm<ReferralQualifiedFormData>({
+ defaultValues: {
+ externalId: "",
+ },
+ });
+
+ // Store reset function in ref so parent can call it
+ onResetRef.current = reset;
+
+ // Reset form when modal is closed
+ useEffect(() => {
+ if (!showModal) {
+ reset();
+ }
+ }, [showModal, reset]);
+
+ const handleFormSubmit = handleSubmit(onSubmit);
+
+ // Keyboard shortcuts for modal actions
+ useKeyboardShortcut(
+ "q",
+ (e) => {
+ if (showModal && !isPending && !isSubmitting) {
+ e.preventDefault();
+ handleFormSubmit(e as any);
+ }
+ },
+ { modal: true },
+ );
+
+ useKeyboardShortcut(
+ "c",
+ (e) => {
+ if (showModal) {
+ e.preventDefault();
+ setShowModal(false);
+ reset();
+ }
+ },
+ { modal: true },
+ );
+
+ return (
+ <Modal showModal={showModal} setShowModal={setShowModal}>
+ <form onSubmit={handleFormSubmit}>
+ <div className="flex flex-col gap-1 border-b border-neutral-200 px-[18px] py-5 text-left">
+ <h3 className="text-content-emphasis text-base font-semibold">
+ Qualify lead
+ </h3>
+ <p className="text-content-subtle text-sm">
+ Are you sure you want to qualify this partner referral?
+ </p>
+ </div>
+
+ <div className="flex flex-col gap-5 p-5">
+ <div className="flex flex-col gap-2">
+ <label className="text-content-emphasis block text-sm font-medium">
+ External ID (optional)
+ </label>
+ <div className="relative rounded-md shadow-sm">
+ <input
+ type="text"
+ className={cn(
+ "block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
+ errors.externalId &&
+ "border-red-600 focus:border-red-500 focus:ring-red-600",
+ )}
+ placeholder="External customer ID"
+ {...register("externalId", {
+ required: false,
+ })}
+ />
+ </div>
+
+ {errors.externalId && (
+ <p className="text-xs text-red-600">
+ {errors.externalId.message}
+ </p>
+ )}
+
+ <p className="text-xs text-neutral-500">
+ The customer's external ID. If not provided, the referral email
+ will be used.
+ </p>
+ </div>
+ </div>
+
+ <div className="border-border-subtle flex items-center justify-end gap-2 border-t px-5 py-4">
+ <Button
+ variant="secondary"
+ className="h-8 w-fit px-3"
+ text="Cancel"
+ shortcut="C"
+ onClick={() => {
+ setShowModal(false);
+ reset();
+ }}
+ />
+ <Button
+ type="submit"
+ variant="primary"
+ className="h-8 w-fit px-3"
+ text="Qualify"
+ shortcut="Q"
+ loading={isPending || isSubmitting}
+ />
+ </div>
+ </form>
+ </Modal>
+ );
+}
+
+export function useMarkReferralQualifiedModal({
+ referral,
+}: {
+ referral: ReferralProps;
+}) {
+ const { id: workspaceId } = useWorkspace();
+ const [showModal, setShowModal] = useState(false);
+ const resetFormRef = useRef<(() => void) | null>(null);
+
+ const { executeAsync, isPending } = useAction(markReferralQualifiedAction, {
+ onSuccess: async () => {
+ toast.success("Partner referral qualified successfully!");
+ mutatePrefix("/api/programs/referrals");
+ setShowModal(false);
+ resetFormRef.current?.();
+ },
+ onError({ error }) {
+ toast.error(error.serverError);
+ },
+ });
+
+ const onSubmit = useCallback(
+ async (data: ReferralQualifiedFormData) => {
+ if (!workspaceId || !referral.id) {
+ return;
+ }
+
+ await executeAsync({
+ workspaceId,
+ referralId: referral.id,
+ externalId: data.externalId || undefined,
+ });
+ },
+ [executeAsync, referral.id, workspaceId],
+ );
+
+ return {
+ setShowModal,
+ QualifiedModal: (
+ <ReferralQualifiedModal
+ showModal={showModal}
+ setShowModal={setShowModal}
+ referral={referral}
+ onSubmit={onSubmit}
+ isPending={isPending}
+ onResetRef={resetFormRef}
+ />
+ ),
+ isMarkingQualified: isPending,
+ };
+}
diff --git a/apps/web/ui/modals/qualify-partner-referral-modal.tsx b/apps/web/ui/modals/qualify-partner-referral-modal.tsx
deleted file mode 100644
index f253b5c4bd..0000000000
--- a/apps/web/ui/modals/qualify-partner-referral-modal.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-"use client";
-
-import { markReferralQualifiedAction } from "@/lib/actions/referrals/mark-referral-qualified";
-import { mutatePrefix } from "@/lib/swr/mutate";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { referralSchema } from "@/lib/zod/schemas/referrals";
-import { useConfirmModal } from "@/ui/modals/confirm-modal";
-import { useAction } from "next-safe-action/hooks";
-import { toast } from "sonner";
-import * as z from "zod/v4";
-
-type PartnerReferralProps = z.infer<typeof referralSchema>;
-
-export function useQualifyPartnerReferralModal({
- referral,
-}: {
- referral: PartnerReferralProps;
-}) {
- const { id: workspaceId } = useWorkspace();
-
- const { executeAsync, isPending } = useAction(markReferralQualifiedAction, {
- onSuccess: async () => {
- toast.success("Partner referral qualified successfully!");
- mutatePrefix("/api/programs/referrals");
- },
- onError({ error }) {
- toast.error(error.serverError);
- },
- });
-
- const { setShowConfirmModal, confirmModal } = useConfirmModal({
- title: "Qualify lead",
- description: "Are you sure you want to qualify this partner referral?",
- confirmText: "Qualify",
- cancelText: "Cancel",
- confirmShortcut: "Q",
- confirmShortcutOptions: { modal: true },
- onConfirm: async () => {
- if (!workspaceId || !referral.id) {
- return;
- }
-
- await executeAsync({
- workspaceId,
- referralId: referral.id,
- });
- },
- });
-
- return {
- setShowQualifyModal: setShowConfirmModal,
- QualifyModal: confirmModal,
- isQualifying: isPending,
- };
-}
diff --git a/apps/web/ui/modals/unqualify-partner-referral-modal.tsx b/apps/web/ui/modals/unqualify-referral-modal.tsx
similarity index 85%
rename from apps/web/ui/modals/unqualify-partner-referral-modal.tsx
rename to apps/web/ui/modals/unqualify-referral-modal.tsx
index 5d80d9c3ab..eea235221d 100644
--- a/apps/web/ui/modals/unqualify-partner-referral-modal.tsx
+++ b/apps/web/ui/modals/unqualify-referral-modal.tsx
@@ -3,18 +3,15 @@
import { markReferralUnqualifiedAction } from "@/lib/actions/referrals/mark-referral-unqualified";
import { mutatePrefix } from "@/lib/swr/mutate";
import useWorkspace from "@/lib/swr/use-workspace";
-import { referralSchema } from "@/lib/zod/schemas/referrals";
+import { ReferralProps } from "@/lib/types";
import { useConfirmModal } from "@/ui/modals/confirm-modal";
import { useAction } from "next-safe-action/hooks";
import { toast } from "sonner";
-import * as z from "zod/v4";
-type PartnerReferralProps = z.infer<typeof referralSchema>;
-
-export function useUnqualifyPartnerReferralModal({
+export function useUnqualifyReferralModal({
referral,
}: {
- referral: PartnerReferralProps;
+ referral: ReferralProps;
}) {
const { id: workspaceId } = useWorkspace();
diff --git a/apps/web/ui/partners/rewards/rewards-logic.tsx b/apps/web/ui/partners/rewards/rewards-logic.tsx
index 4fbc1f48ea..5a81648e3b 100644
--- a/apps/web/ui/partners/rewards/rewards-logic.tsx
+++ b/apps/web/ui/partners/rewards/rewards-logic.tsx
@@ -11,6 +11,7 @@ import {
NUMBER_CONDITION_OPERATORS,
REWARD_CONDITIONS,
RewardConditionEntityAttribute,
+ SOURCE_CONDITION_OPERATORS,
STRING_CONDITION_OPERATORS,
} from "@/lib/zod/schemas/rewards";
import { X } from "@/ui/shared/icons";
@@ -403,9 +404,12 @@ function ConditionLogic({
},
)
}
- items={(["number", "currency"].includes(attributeType)
- ? NUMBER_CONDITION_OPERATORS
- : STRING_CONDITION_OPERATORS
+ items={(condition.entity === "customer" &&
+ condition.attribute === "source"
+ ? SOURCE_CONDITION_OPERATORS
+ : ["number", "currency"].includes(attributeType)
+ ? NUMBER_CONDITION_OPERATORS
+ : STRING_CONDITION_OPERATORS
).map((operator) => ({
text: CONDITION_OPERATOR_LABELS[operator],
value: operator,
diff --git a/apps/web/ui/referrals/partner-referral-sheet.tsx b/apps/web/ui/referrals/partner-referral-sheet.tsx
index 3d80b51472..ff8ab493f2 100644
--- a/apps/web/ui/referrals/partner-referral-sheet.tsx
+++ b/apps/web/ui/referrals/partner-referral-sheet.tsx
@@ -1,8 +1,8 @@
import { ReferralProps } from "@/lib/types";
-import { useMarkPartnerReferralClosedLostModal } from "@/ui/modals/mark-partner-referral-closed-lost-modal";
-import { useMarkPartnerReferralClosedWonModal } from "@/ui/modals/mark-partner-referral-closed-won-modal";
-import { useQualifyPartnerReferralModal } from "@/ui/modals/qualify-partner-referral-modal";
-import { useUnqualifyPartnerReferralModal } from "@/ui/modals/unqualify-partner-referral-modal";
+import { useMarkReferralClosedLostModal } from "@/ui/modals/mark-referral-closed-lost-modal";
+import { useMarkReferralClosedWonModal } from "@/ui/modals/mark-referral-closed-won-modal";
+import { useMarkReferralQualifiedModal } from "@/ui/modals/mark-referral-qualified-modal";
+import { useUnqualifyReferralModal } from "@/ui/modals/unqualify-referral-modal";
import { X } from "@/ui/shared/icons";
import {
Button,
@@ -30,20 +30,23 @@ function ReferralSheetContent({
onNext,
setIsOpen,
}: ReferralSheetProps) {
- const { setShowQualifyModal, QualifyModal, isQualifying } =
- useQualifyPartnerReferralModal({ referral });
+ const {
+ setShowModal: setShowQualifyModal,
+ QualifiedModal,
+ isMarkingQualified: isQualifying,
+ } = useMarkReferralQualifiedModal({ referral });
const { setShowUnqualifyModal, UnqualifyModal, isUnqualifying } =
- useUnqualifyPartnerReferralModal({ referral });
+ useUnqualifyReferralModal({ referral });
const {
setShowModal: setShowClosedWonModal,
ClosedWonModal,
isMarkingClosedWon,
- } = useMarkPartnerReferralClosedWonModal({ referral });
+ } = useMarkReferralClosedWonModal({ referral });
const { setShowClosedLostModal, ClosedLostModal, isMarkingClosedLost } =
- useMarkPartnerReferralClosedLostModal({ referral });
+ useMarkReferralClosedLostModal({ referral });
// right arrow key onNext
useKeyboardShortcut(
@@ -126,7 +129,7 @@ function ReferralSheetContent({
return (
<>
- {QualifyModal}
+ {QualifiedModal}
{UnqualifyModal}
{ClosedWonModal}
{ClosedLostModal}