dubinc · steven-tey · Jul 30, 2025 · Jul 22, 2025 · Jul 24, 2025 · Jul 24, 2025
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/rewards/rewards.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/rewards/rewards.tsx
@@ -4,9 +4,9 @@ import usePartnersCount from "@/lib/swr/use-partners-count";
 import useRewards from "@/lib/swr/use-rewards";
 import type { RewardProps } from "@/lib/types";
 import { REWARD_EVENT_COLUMN_MAPPING } from "@/lib/zod/schemas/rewards";
-import { useRewardSheet } from "@/ui/partners/add-edit-reward-sheet";
 import { REWARD_EVENTS } from "@/ui/partners/constants";
 import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";
+import { useRewardSheet } from "@/ui/partners/rewards/add-edit-reward-sheet";
 import { EventType } from "@dub/prisma/client";
 import { Badge, Button, Popover, useKeyboardShortcut } from "@dub/ui";
 import { pluralize } from "@dub/utils";

diff --git a/apps/web/lib/actions/partners/create-reward.ts b/apps/web/lib/actions/partners/create-reward.ts
@@ -3,11 +3,13 @@
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { createId } from "@/lib/api/create-id";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import {
   createRewardSchema,
   REWARD_EVENT_COLUMN_MAPPING,
 } from "@/lib/zod/schemas/rewards";
 import { prisma } from "@dub/prisma";
+import { Prisma } from "@dub/prisma/client";
 import { waitUntil } from "@vercel/functions";
 import { authActionClient } from "../safe-action";
 
@@ -23,6 +25,7 @@ export const createRewardAction = authActionClient
       isDefault,
       includedPartnerIds,
       excludedPartnerIds,
+      modifiers,
     } = parsedInput;
 
     includedPartnerIds = includedPartnerIds || [];
@@ -47,6 +50,14 @@ export const createRewardAction = authActionClient
       }
     }
 
+    if (
+      modifiers &&
+      !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic
+    )
+      throw new Error(
+        "Advanced reward structures are only available on the Advanced plan and above.",
+      );
-    if (
-      modifiers &&
-      !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic
-    )
-      throw new Error(
-        "Advanced reward structures are only available on the Advanced plan and above.",
-      );
+    // Refresh workspace to ensure latest plan data
+    const refreshedWorkspace = await prisma.workspace.findUnique({
+      where: { id: workspace.id },
+      select: { plan: true },
+    });
+
+    if (
+      modifiers &&
+      !getPlanCapabilities(refreshedWorkspace?.plan || workspace.plan).canUseAdvancedRewardLogic
+    )
+      throw new Error(
+        "Advanced reward structures are only available on the Advanced plan and above.",
+      );
-    if (
-      modifiers &&
-      !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic
-    )
-      throw new Error(
-        "Advanced reward structures are only available on the Advanced plan and above.",
-      );
+    // Refresh workspace to ensure latest plan data
+    const refreshedWorkspace = await prisma.workspace.findUnique({
+      where: { id: workspace.id },
+      select: { plan: true },
+    });
+
+    if (
+      modifiers &&
+      !getPlanCapabilities(refreshedWorkspace?.plan || workspace.plan).canUseAdvancedRewardLogic
+    )
+      throw new Error(
+        "Advanced reward structures are only available on the Advanced plan and above.",
+      );
+
     const finalPartnerIds = [...includedPartnerIds, ...excludedPartnerIds];
 
     if (finalPartnerIds && finalPartnerIds.length > 0) {
@@ -83,6 +94,7 @@ export const createRewardAction = authActionClient
         amount,
         maxDuration,
         default: isDefault,
+        modifiers: modifiers || Prisma.JsonNull,
       },
     });
 

diff --git a/apps/web/lib/actions/partners/update-reward.ts b/apps/web/lib/actions/partners/update-reward.ts
@@ -3,11 +3,13 @@
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { getRewardOrThrow } from "@/lib/api/partners/get-reward-or-throw";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import {
   REWARD_EVENT_COLUMN_MAPPING,
   updateRewardSchema,
 } from "@/lib/zod/schemas/rewards";
 import { prisma } from "@dub/prisma";
+import { Prisma } from "@dub/prisma/client";
 import { Reward } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import { authActionClient } from "../safe-action";
@@ -23,6 +25,7 @@ export const updateRewardAction = authActionClient
       type,
       includedPartnerIds,
       excludedPartnerIds,
+      modifiers,
     } = parsedInput;
 
     includedPartnerIds = includedPartnerIds || [];
@@ -35,6 +38,14 @@ export const updateRewardAction = authActionClient
       programId,
     });
 
+    if (
+      modifiers &&
+      !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic
+    )
+      throw new Error(
+        "Advanced reward structures are only available on the Advanced plan and above.",
+      );
-    if (
-      modifiers &&
-      !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic
-    )
-      throw new Error(
-        "Advanced reward structures are only available on the Advanced plan and above.",
-      );
+    // Refresh workspace to ensure latest plan data
+    const refreshedWorkspace = await prisma.workspace.findUnique({
+      where: { id: workspace.id },
+      select: { plan: true }
+    });
+
+    if (
+      modifiers &&
+      !getPlanCapabilities(refreshedWorkspace?.plan || workspace.plan).canUseAdvancedRewardLogic
+    )
+      throw new Error(
+        "Advanced reward structures are only available on the Advanced plan and above.",
+      );
-    if (
-      modifiers &&
-      !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic
-    )
-      throw new Error(
-        "Advanced reward structures are only available on the Advanced plan and above.",
-      );
+    // Refresh workspace to ensure latest plan data
+    const refreshedWorkspace = await prisma.workspace.findUnique({
+      where: { id: workspace.id },
+      select: { plan: true }
+    });
+
+    if (
+      modifiers &&
+      !getPlanCapabilities(refreshedWorkspace?.plan || workspace.plan).canUseAdvancedRewardLogic
+    )
+      throw new Error(
+        "Advanced reward structures are only available on the Advanced plan and above.",
+      );
+
     const finalPartnerIds = [...includedPartnerIds, ...excludedPartnerIds];
 
     if (finalPartnerIds && finalPartnerIds.length > 0) {
@@ -66,6 +77,7 @@ export const updateRewardAction = authActionClient
         type,
         amount,
         maxDuration,
+        modifiers: modifiers === null ? Prisma.JsonNull : modifiers,
       },
     });
 

diff --git a/apps/web/lib/plan-capabilities.ts b/apps/web/lib/plan-capabilities.ts
@@ -11,5 +11,7 @@ export const getPlanCapabilities = (
     canManageProgram: !!plan && !["free", "pro"].includes(plan),
     canTrackConversions: !!plan && !["free", "pro"].includes(plan),
     canExportAuditLogs: !!plan && ["enterprise"].includes(plan),
+    canUseAdvancedRewardLogic:
+      !!plan && ["enterprise", "advanced"].includes(plan),
   };
 };
diff --git a/apps/web/lib/zod/schemas/rewards.ts b/apps/web/lib/zod/schemas/rewards.ts
@@ -15,6 +15,46 @@ export const COMMISSION_TYPES = [
   },
 ] as const;
 
+export const CONDITION_ENTITIES = ["customer", "sale"] as const;
+
+export const CONDITION_CUSTOMER_ATTRIBUTES = ["country"] as const;
+export const CONDITION_SALE_ATTRIBUTES = ["productId"] as const;
+export const CONDITION_ATTRIBUTES = [
+  ...CONDITION_CUSTOMER_ATTRIBUTES,
+  ...CONDITION_SALE_ATTRIBUTES,
+] as const;
+
+export const CONDITION_OPERATORS = [
+  "equals_to",
+  "not_equals",
+  "starts_with",
+  "ends_with",
+  "in",
+  "not_in",
+] as const;
+
+export const rewardConditionSchema = z.object({
+  entity: z.enum(CONDITION_ENTITIES),
+  attribute: z.enum(CONDITION_ATTRIBUTES),
+  operator: z.enum(CONDITION_OPERATORS),
+  value: z.union([
+    z.string(),
+    z.number(),
+    z.array(z.string()),
+    z.array(z.number()),
+  ]),
+});
+
+export const rewardConditionsSchema = z.object({
+  operator: z.enum(["AND", "OR"]).default("AND"),
+  conditions: z.array(rewardConditionSchema).min(1),
+  amount: z.number().int().min(0),
+});
+
+export const rewardConditionsArraySchema = z
+  .array(rewardConditionsSchema)
+  .min(1);
+
 export const RewardSchema = z.object({
   id: z.string(),
   event: z.nativeEnum(EventType),
@@ -42,6 +82,7 @@ export const createOrUpdateRewardSchema = z.object({
     .array(z.string())
     .nullish()
     .describe("Only applicable for default rewards"),
+  modifiers: rewardConditionsArraySchema.nullish(),
 });
 
 export const createRewardSchema = createOrUpdateRewardSchema.superRefine(
@@ -80,35 +121,6 @@ export const REWARD_EVENT_COLUMN_MAPPING = Object.freeze({
   sale: "saleRewardId",
 });
 
-export const rewardConditionSchema = z.object({
-  entity: z.enum(["customer", "sale"]),
-  attribute: z.enum(["country", "productId"]),
-  operator: z.enum([
-    "equals_to",
-    "not_equals",
-    "starts_with",
-    "ends_with",
-    "in",
-    "not_in",
-  ]),
-  value: z.union([
-    z.string(),
-    z.number(),
-    z.array(z.string()),
-    z.array(z.number()),
-  ]),
-});
-
-export const rewardConditionsSchema = z.object({
-  operator: z.enum(["AND", "OR"]).default("AND"),
-  conditions: z.array(rewardConditionSchema).min(1),
-  amount: z.number().int().min(0),
-});
-
-export const rewardConditionsArraySchema = z
-  .array(rewardConditionsSchema)
-  .min(1);
-
 export const rewardContextSchema = z.object({
   customer: z
     .object({