[pull] main from dubinc:main

apps/web/app/(ee)/api/admin/revenue/get-rolling-payout-fees.ts

@@ -13,7 +13,10 @@ export function computeRollingAveragePayoutFees(
   for (let i = 0; i < timeseries.length; i++) {
     const windowStart = subMonths(timeseries[i].date, windowMonths);
 
-    while (windowStartIdx < i && timeseries[windowStartIdx].date < windowStart) {
+    while (
+      windowStartIdx < i &&
+      timeseries[windowStartIdx].date < windowStart
+    ) {
       windowSum -= timeseries[windowStartIdx].fees;
       windowStartIdx++;
     }

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/page.tsx

@@ -6,7 +6,7 @@ import PlanUsage from "./plan-usage";
 export default function WorkspaceBilling() {
   return (
     <PageContent title="Billing">
-      <PageWidthWrapper className="grid gap-8">
+      <PageWidthWrapper className="grid gap-8 pb-12">
         <PlanUsage />
         <PaymentMethods />
       </PageWidthWrapper>

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/payment-methods.tsx

@@ -32,7 +32,7 @@ export default function PaymentMethods() {
   const router = useRouter();
   const { paymentMethods, defaultPaymentMethodId } = usePaymentMethods();
   const [isLoading, setIsLoading] = useState(false);
-  const { slug, stripeId, plan, role } = useWorkspace();
+  const { slug, stripeId, role } = useWorkspace();
 
   const regularPaymentMethods = paymentMethods?.filter(
     (pm) => !DIRECT_DEBIT_PAYMENT_METHOD_TYPES.includes(pm.type),
@@ -55,7 +55,7 @@ export default function PaymentMethods() {
     router.push(url);
   };
 
-  if (plan === "free") {
+  if (!stripeId) {
     return null;
   }
 

apps/web/lib/actions/partners/program-resources/add-program-resource.ts

@@ -4,59 +4,18 @@ import { createId } from "@/lib/api/create-id";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { prisma } from "@/lib/prisma";
 import {
+  addProgramResourceSchema,
   programResourceColorSchema,
   programResourceFileSchema,
   programResourceLinkSchema,
-  programResourceLinkUrlSchema,
 } from "@/lib/zod/schemas/program-resources";
 import { R2_URL } from "@dub/utils";
-import * as z from "zod/v4";
 import { authActionClient } from "../../safe-action";
 import { throwIfNoPermission } from "../../throw-if-no-permission";
 import { MAX_PROGRAM_RESOURCE_FILE_SIZE_BYTES } from "./constants";
 
-// Base schema for all resource types
-const baseResourceSchema = z.object({
-  workspaceId: z.string(),
-  name: z.string().min(1, "Name is required"),
-});
-
-// Schema for logo resources
-const logoResourceSchema = baseResourceSchema.extend({
-  resourceType: z.literal("logo"),
-  key: z.string(),
-  fileSize: z.number().int().positive(),
-});
-
-// Schema for file resources
-const fileResourceSchema = baseResourceSchema.extend({
-  resourceType: z.literal("file"),
-  key: z.string(),
-  fileSize: z.number().int().positive(),
-});
-
-// Schema for color resources
-const colorResourceSchema = baseResourceSchema.extend({
-  resourceType: z.literal("color"),
-  color: z.string(), // Hex color code
-});
-
-// Schema for link resources
-const linkResourceSchema = baseResourceSchema.extend({
-  resourceType: z.literal("link"),
-  url: programResourceLinkUrlSchema,
-});
-
-// Combined schema that can handle any resource type
-const addResourceSchema = z.discriminatedUnion("resourceType", [
-  logoResourceSchema,
-  fileResourceSchema,
-  colorResourceSchema,
-  linkResourceSchema,
-]);
-
 export const addProgramResourceAction = authActionClient
-  .inputSchema(addResourceSchema)
+  .inputSchema(addProgramResourceSchema)
   .action(async ({ ctx, parsedInput }) => {
     const { workspace } = ctx;
     const { name, resourceType } = parsedInput;
@@ -68,20 +27,16 @@ export const addProgramResourceAction = authActionClient
 
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    // Verify the program exists and belongs to the workspace
-    const program = await prisma.program.findUnique({
+    const program = await prisma.program.findUniqueOrThrow({
       where: {
         id: programId,
-        workspaceId: workspace.id,
       },
       select: {
         id: true,
         resources: true,
       },
     });
 
-    if (!program) throw new Error("Program not found");
-
     const currentResources = (program.resources as any) || {
       logos: [],
       colors: [],

apps/web/lib/actions/partners/program-resources/delete-program-resource.ts

@@ -4,21 +4,13 @@ import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-progr
 import { prisma } from "@/lib/prisma";
 import { storage } from "@/lib/storage";
 import {
-  PROGRAM_RESOURCE_TYPES,
+  deleteProgramResourceSchema,
   programResourcesSchema,
 } from "@/lib/zod/schemas/program-resources";
 import { R2_URL } from "@dub/utils";
-import * as z from "zod/v4";
 import { authActionClient } from "../../safe-action";
 import { throwIfNoPermission } from "../../throw-if-no-permission";
 
-// Schema for deleting a program resource
-const deleteProgramResourceSchema = z.object({
-  workspaceId: z.string(),
-  resourceType: z.enum(PROGRAM_RESOURCE_TYPES),
-  resourceId: z.string(),
-});
-
 export const deleteProgramResourceAction = authActionClient
   .inputSchema(deleteProgramResourceSchema)
   .action(async ({ ctx, parsedInput }) => {
@@ -32,20 +24,19 @@ export const deleteProgramResourceAction = authActionClient
 
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    // Verify the program exists and belongs to the workspace
-    const program = await prisma.program.findUnique({
+    const program = await prisma.program.findUniqueOrThrow({
       where: {
         id: programId,
-        workspaceId: workspace.id,
       },
       select: {
         id: true,
         resources: true,
       },
     });
 
-    if (!program) throw new Error("Program not found");
-    if (!program.resources) throw new Error("Program resources not found");
+    if (!program.resources) {
+      throw new Error("Program resources not found");
+    }
 
     // Create a copy of the current resources to update
     const updatedResources = { ...(program.resources as any) };

apps/web/lib/actions/partners/program-resources/update-program-resource.ts

@@ -7,61 +7,16 @@ import {
   programResourceColorSchema,
   programResourceFileSchema,
   programResourceLinkSchema,
-  programResourceLinkUrlSchema,
   programResourcesSchema,
+  updateProgramResourceSchema,
 } from "@/lib/zod/schemas/program-resources";
 import { R2_URL } from "@dub/utils";
-import * as z from "zod/v4";
 import { authActionClient } from "../../safe-action";
 import { throwIfNoPermission } from "../../throw-if-no-permission";
 import { MAX_PROGRAM_RESOURCE_FILE_SIZE_BYTES } from "./constants";
 
-// Base schema for all resource types
-const baseUpdateSchema = z.object({
-  workspaceId: z.string(),
-  resourceId: z.string(),
-});
-
-// Schema for logo resources
-const updateLogoSchema = baseUpdateSchema.extend({
-  resourceType: z.literal("logo"),
-  name: z.string().min(1).optional(),
-  key: z.string().optional(),
-  fileSize: z.number().int().positive().optional(),
-});
-
-// Schema for file resources
-const updateFileSchema = baseUpdateSchema.extend({
-  resourceType: z.literal("file"),
-  name: z.string().min(1).optional(),
-  key: z.string().optional(),
-  fileSize: z.number().int().positive().optional(),
-});
-
-// Schema for color resources
-const updateColorSchema = baseUpdateSchema.extend({
-  resourceType: z.literal("color"),
-  name: z.string().min(1).optional(),
-  color: z.string().optional(),
-});
-
-// Schema for link resources
-const updateLinkSchema = baseUpdateSchema.extend({
-  resourceType: z.literal("link"),
-  name: z.string().min(1).optional(),
-  url: programResourceLinkUrlSchema.optional(),
-});
-
-// Combined schema that can handle any resource type
-const updateResourceSchema = z.discriminatedUnion("resourceType", [
-  updateLogoSchema,
-  updateFileSchema,
-  updateColorSchema,
-  updateLinkSchema,
-]);
-
 export const updateProgramResourceAction = authActionClient
-  .inputSchema(updateResourceSchema)
+  .inputSchema(updateProgramResourceSchema)
   .action(async ({ ctx, parsedInput }) => {
     const { workspace } = ctx;
     const { resourceId, resourceType } = parsedInput;
@@ -73,20 +28,19 @@ export const updateProgramResourceAction = authActionClient
 
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    // Verify the program exists and belongs to the workspace
-    const program = await prisma.program.findUnique({
+    const program = await prisma.program.findUniqueOrThrow({
       where: {
         id: programId,
-        workspaceId: workspace.id,
       },
       select: {
         id: true,
         resources: true,
       },
     });
 
-    if (!program) throw new Error("Program not found");
-    if (!program.resources) throw new Error("Program resources not found");
+    if (!program.resources) {
+      throw new Error("Program resources not found.");
+    }
 
     const currentResources = program.resources as any;
     const updatedResources = { ...currentResources };
@@ -172,7 +126,7 @@ export const updateProgramResourceAction = authActionClient
         id: program.id,
       },
       data: {
-        resources: programResourcesSchema.parse(updatedResources) as any,
+        resources: programResourcesSchema.parse(updatedResources),
       },
     });
 
@@ -189,8 +143,4 @@ export const updateProgramResourceAction = authActionClient
         );
       }
     }
-
-    return {
-      success: true,
-    };
   });

apps/web/lib/partners/get-partner-bank-account.ts

@@ -1,6 +1,4 @@
-import { prisma } from "@/lib/prisma";
 import { stripe } from "@/lib/stripe";
-import { waitUntil } from "@vercel/functions";
 import Stripe from "stripe";
 import * as z from "zod/v4";
 
@@ -41,7 +39,9 @@ export const getPartnerBankAccount = async (stripeAccount: string) => {
 
     if (isApplicationAccessRevoked) {
       // TODO: recompute payout state + reset payoutsEnabledAt / payoutMethodHash if needed
-      console.warn("No account connected – application access may have been revoked.")
+      console.warn(
+        "No account connected – application access may have been revoked.",
+      );
     }
 
     return null;

apps/web/lib/webhook/failure.ts

@@ -3,11 +3,11 @@ import { sendEmail } from "@dub/email";
 import WebhookDisabled from "@dub/email/templates/webhook-disabled";
 import WebhookFailed from "@dub/email/templates/webhook-failed";
 import { Webhook } from "@prisma/client";
+import { syncWorkspaceWebhookStatus } from "./click-webhook-workspaces";
 import {
   WEBHOOK_FAILURE_DISABLE_THRESHOLD,
   WEBHOOK_FAILURE_NOTIFY_THRESHOLDS,
 } from "./constants";
-import { syncWorkspaceWebhookStatus } from "./click-webhook-workspaces";
 
 export const handleWebhookFailure = async (webhookId: string) => {
   const webhook = await prisma.webhook.update({

apps/web/lib/webhook/sample-events/lead-created.json

@@ -36,7 +36,7 @@
     "partnerId": "pn_cm0lcuvtz000xcutmqw4a7wi3",
     "programId": "prog_CYCu7IMAapjkRpTnr8F1azjN",
     "archived": false,
-    "expiresAt": "1970-01-01T00:00:00.000Z",
+    "expiresAt": null,
     "expiredUrl": null,
     "disabledAt": null,
     "password": null,

apps/web/lib/webhook/sample-events/link-clicked.json

@@ -27,7 +27,7 @@
     "partnerId": "pn_cm0lcuvtz000xcutmqw4a7wi3",
     "programId": "prog_CYCu7IMAapjkRpTnr8F1azjN",
     "archived": false,
-    "expiresAt": "1970-01-01T00:00:00.000Z",
+    "expiresAt": null,
     "expiredUrl": null,
     "disabledAt": null,
     "password": null,

apps/web/lib/webhook/sample-events/sale-created.json

@@ -36,7 +36,7 @@
     "partnerId": "pn_cm0lcuvtz000xcutmqw4a7wi3",
     "programId": "prog_CYCu7IMAapjkRpTnr8F1azjN",
     "archived": false,
-    "expiresAt": "1970-01-01T00:00:00.000Z",
+    "expiresAt": null,
     "expiredUrl": null,
     "disabledAt": null,
     "password": null,

apps/web/lib/webhook/transform.ts

@@ -6,10 +6,10 @@ import { nanoid, toCamelCase } from "@dub/utils";
 import { ExpandedLink, transformLink } from "../api/links/utils/transform-link";
 import { generateRandomName } from "../names";
 import { ClickEventTB } from "../types";
-import type { WebhookTrigger } from "./types";
 import { clickEventSchema } from "../zod/schemas/clicks";
 import { WEBHOOK_EVENT_ID_PREFIX } from "./constants";
 import { leadWebhookEventSchema, saleWebhookEventSchema } from "./schemas";
+import type { WebhookTrigger } from "./types";
 
 export const transformClickEventData = (
   data: ClickEventTB & {

apps/web/lib/zod/schemas/links.ts

@@ -861,11 +861,11 @@ export const linkEventSchema = LinkSchema.extend({
   // coerce date fields
   createdAt: z.coerce.date(),
   updatedAt: z.coerce.date(),
-  lastClicked: z.coerce.date(),
-  expiresAt: z.coerce.date(),
-  disabledAt: z.coerce.date(),
-  testCompletedAt: z.coerce.date(),
-  testStartedAt: z.coerce.date(),
+  lastClicked: z.coerce.date().nullable(),
+  expiresAt: z.coerce.date().nullable(),
+  disabledAt: z.coerce.date().nullable(),
+  testCompletedAt: z.coerce.date().nullable(),
+  testStartedAt: z.coerce.date().nullable(),
   // userId can be null
   userId: z.string().nullable(),
 });