The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
improve create commission sheet to be more intuitive
Steven Tey1b41f323a502
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsxindex 9ef71ff31d..eecb9af7ea 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx@@ -1,6 +1,7 @@import { createManualCommissionAction } from "@/lib/actions/partners/create-manual-commission";import { handleMoneyKeyDown } from "@/lib/form-utils";import { mutatePrefix } from "@/lib/swr/mutate";+import useRewards from "@/lib/swr/use-rewards";import useWorkspace from "@/lib/swr/use-workspace";import { CustomerActivityResponse } from "@/lib/types";import { createCommissionSchema } from "@/lib/zod/schemas/commissions";@@ -54,6 +55,7 @@ function CreateCommissionSheetContent({const { id: workspaceId, defaultProgramId, slug } = useWorkspace();const [hasInvoiceId, setHasInvoiceId] = useState(false);const [hasProductId, setHasProductId] = useState(false);+ const [hasDate, setHasDate] = useState(false);const [hasCustomLeadEventDate, setHasCustomLeadEventDate] = useState(false);const [hasCustomLeadEventName, setHasCustomLeadEventName] = useState(false);@@ -107,6 +109,33 @@ function CreateCommissionSheetContent({"description",]);+ const { rewards } = useRewards();+ const hasLeadRewards = rewards?.some((reward) => reward.event === "lead");++ const commissionTypeOptions = [+ {+ value: "custom",+ label: "One-time",+ description:+ "Pay a one-time commission to a partner (e.g. bonuses, reimbursements, etc.)",+ },+ ...(hasLeadRewards+ ? [+ {+ value: "lead",+ label: "Lead",+ description: "Reward a partner for a qualified signup/referral.",+ },+ ]+ : []),+ {+ value: "sale",+ label: "Recurring sale",+ description:+ "Reward a partner for a recurring subscription from a referred customer.",+ },+ ];+// Fetch customer activity data when customer is selected and we're using existing eventsconst { data: customerActivity, isLoading: isCustomerActivityLoading } =useSWR<CustomerActivityResponse>(@@ -128,6 +157,12 @@ function CreateCommissionSheetContent({}}, [hasCustomLeadEventDate, setValue]);+ useEffect(() => {+ if (!hasDate) {+ setValue("date", null);+ }+ }, [hasDate, setValue]);+useEffect(() => {if (commissionType === "custom") {setOpenAccordions(["partner-and-type", "commission"]);@@ -342,18 +377,21 @@ function CreateCommissionSheetContent({</label><ToggleGroupclassName="mt-2 flex w-full items-center gap-1 rounded-md border border-neutral-200 bg-neutral-50 p-1"- optionClassName="h-8 flex items-center justify-center rounded-md flex-1 text-sm"+ optionClassName="h-8 flex items-center justify-center rounded-md flex-1 text-sm normal-case"indicatorClassName="bg-white"- options={[- { value: "custom", label: "One-time" },- { value: "lead", label: "Lead" },- { value: "sale", label: "Sale" },- ]}+ options={commissionTypeOptions}selected={commissionType}selectAction={(id: CommissionType) =>setCommissionType(id)}/>+ <p className="mt-2 text-xs text-neutral-500">+ {+ commissionTypeOptions.find(+ (option) => option.value === commissionType,+ )?.description+ }+ </p></div>{commissionType !== "custom" && (@@ -406,19 +444,6 @@ function CreateCommissionSheetContent({</ProgramSheetAccordionTrigger><ProgramSheetAccordionContent><div className="grid grid-cols-1 gap-6">- <div>- <SmartDateTimePicker- value={date}- onChange={(date) => {- setValue("date", date, {- shouldDirty: true,- });- }}- label="Date"- placeholder='E.g. "2024-03-01", "Last Thursday", "2 hours ago"'- />- </div>-<div><labelhtmlFor="amount"@@ -503,6 +528,36 @@ function CreateCommissionSheetContent({/></div></div>++ <div>+ <div className="flex items-center gap-4">+ <Switch+ fn={setHasDate}+ checked={hasDate}+ trackDimensions="w-8 h-4"+ thumbDimensions="w-3 h-3"+ thumbTranslate="translate-x-4"+ />+ <h3 className="text-sm font-medium text-neutral-700">+ Add a custom date+ </h3>+ </div>++ {hasDate && (+ <div className="mt-4">+ <SmartDateTimePicker+ value={date}+ onChange={(date) => {+ setValue("date", date, {+ shouldDirty: true,+ });+ }}+ label="Custom date"+ placeholder='E.g. "2024-03-01", "Last Thursday", "2 hours ago"'+ />+ </div>+ )}+ </div></div></ProgramSheetAccordionContent></ProgramSheetAccordionItem>@@ -683,19 +738,6 @@ function CreateCommissionSheetContent({</>) : commissionType === "sale" ? (<div className="grid grid-cols-1 gap-6">- <div>- <SmartDateTimePicker- value={saleEventDate}- onChange={(date) => {- setValue("saleEventDate", date, {- shouldDirty: true,- });- }}- label="Sale date"- placeholder='E.g. "2024-03-01", "Last Thursday", "2 hours ago"'- />- </div>-<div><labelhtmlFor="saleAmount"@@ -746,6 +788,19 @@ function CreateCommissionSheetContent({</div></div>+ <div>+ <SmartDateTimePicker+ value={saleEventDate}+ onChange={(date) => {+ setValue("saleEventDate", date, {+ shouldDirty: true,+ });+ }}+ label="Sale date"+ placeholder='E.g. "2024-03-01", "Last Thursday", "2 hours ago"'+ />+ </div>+<div><div className="flex items-center gap-4"><Switch