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.

Show bounties on application page (#3557)

Marcus Farrell6a8ea7015d66
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 6aafcfd57a..14148a72a7 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -14,8 +14,6 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v3
- with:
- version: 8
- name: Setup Node.js environment
uses: actions/setup-node@v4
diff --git a/.github/workflows/prettier.yaml b/.github/workflows/prettier.yaml
index d04fb108c0..c1dbaa4e0d 100644
--- a/.github/workflows/prettier.yaml
+++ b/.github/workflows/prettier.yaml
@@ -18,8 +18,6 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v3
- with:
- version: 8
- name: Install dependencies
run: pnpm install
diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
index 8c34ad0a82..18dbe2e02e 100644
--- a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
+++ b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
@@ -28,6 +28,7 @@ export const GET = withWorkspace(
programId,
groupId: params.groupIdOrSlug,
includeExpandedFields: true,
+ includeBounties: true,
});
return NextResponse.json(GroupWithProgramSchema.parse(group));
diff --git a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
index e3b8b29fd1..d2d8ee7756 100644
--- a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
+++ b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
@@ -1,6 +1,6 @@
import { createDiscountCode } from "@/lib/api/discounts/create-discount-code";
import { createPartnerDefaultLinks } from "@/lib/api/partners/create-partner-default-links";
-import { getPartnerInviteRewardsAndBounties } from "@/lib/api/partners/get-partner-invite-rewards-and-bounties";
+import { getGroupRewardsAndBounties } from "@/lib/api/partners/get-group-rewards-and-bounties";
import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
import { triggerDraftBountySubmissionCreation } from "@/lib/bounty/api/trigger-draft-bounty-submissions";
@@ -275,7 +275,7 @@ export const { POST } = serve<Payload>(
data: partnerUsers,
});
- const rewardsAndBounties = await getPartnerInviteRewardsAndBounties({
+ const rewardsAndBounties = await getGroupRewardsAndBounties({
programId,
groupId: programEnrollment.groupId || program.defaultGroupId,
});
diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx
index d92a9a7c78..867a5717ee 100644
--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx
@@ -62,6 +62,7 @@ export default async function ApplicationPage(props: {
className="mt-10"
rewards={program.rewards}
discount={program.discount}
+ bounties={program.group.bounties}
/>
{/* Application form */}
diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx
index dfc21b821e..715f73099a 100644
--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx
@@ -56,6 +56,7 @@ export default async function ApplyPage(props: {
className="mt-4"
rewards={program.rewards}
discount={program.discount}
+ bounties={program.group.bounties}
/>
{/* Buttons */}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/apply/program-sidebar.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/apply/program-sidebar.tsx
index 9ddc8d060b..031cd515e3 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/apply/program-sidebar.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/apply/program-sidebar.tsx
@@ -1,10 +1,15 @@
"use client";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
-import { DiscountProps, ProgramProps, RewardProps } from "@/lib/types";
+import {
+ DiscountProps,
+ GroupBountySummaryProps,
+ ProgramProps,
+ RewardProps,
+} from "@/lib/types";
+import { LanderRewards } from "@/ui/partners/lander/lander-rewards";
import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";
import { useProgramApplicationSheet } from "@/ui/partners/program-application-sheet";
-import { ProgramRewardList } from "@/ui/partners/program-reward-list";
import { BlurImage, Button, CircleCheck, Link4, StatusBadge } from "@dub/ui";
import { capitalize, cn, OG_AVATAR_URL } from "@dub/utils";
import { redirect } from "next/navigation";
@@ -15,7 +20,12 @@ export function ProgramSidebar({
applicationRewards,
applicationDiscount,
}: {
- program: Omit<ProgramProps, "referralFormData">;
+ program: Omit<ProgramProps, "referralFormData"> & {
+ group?: {
+ id: string;
+ bounties?: GroupBountySummaryProps[];
+ } | null;
+ };
applicationRewards: RewardProps[];
applicationDiscount: DiscountProps | null;
}) {
@@ -94,11 +104,7 @@ export function ProgramSidebar({
</div>
<div className="mt-8">
- <h2 className="mb-2 text-base font-semibold text-neutral-800">
- Rewards
- </h2>
-
- <ProgramRewardList
+ <LanderRewards
rewards={
(programEnrollment?.status === "approved"
? programEnrollment.rewards
@@ -108,11 +114,17 @@ export function ProgramSidebar({
[]
}
discount={
- programEnrollment?.discount ?? applicationDiscount !== undefined
- ? applicationDiscount
- : program.discounts?.[0] ?? null
+ programEnrollment?.discount ??
+ applicationDiscount ??
+ program.discounts?.[0] ??
+ null
+ }
+ bounties={
+ programEnrollment?.status === "approved" &&
+ programEnrollment.groupId !== program.group?.id
+ ? undefined
+ : program.group?.bounties
}
- className="bg-neutral-100"
/>
</div>
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsx
index fc9a00db25..b66b61b6ab 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsx
@@ -1,3 +1,4 @@
+import { getGroupBountySummaries } from "@/lib/bounty/api/get-group-bounty-summaries";
import { serializeReward } from "@/lib/api/partners/serialize-reward";
import { getSession } from "@/lib/auth";
import { programLanderSchema } from "@/lib/zod/schemas/program-lander";
@@ -67,6 +68,11 @@ export default async function ProgramInvitePage(props: {
.filter((r) => r !== null)
.map((r) => serializeReward(r as Reward));
+ const bounties = await getGroupBountySummaries({
+ programId: program.id,
+ groupId: group.id,
+ });
+
const landerData = group.landerData
? programLanderSchema.parse(group.landerData)
: null;
@@ -131,6 +137,7 @@ export default async function ProgramInvitePage(props: {
className="mt-4"
rewards={rewards}
discount={discount}
+ bounties={bounties}
/>
{landerData?.blocks && landerData.blocks.length > 0 && (
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/page.tsx
index e47cd7b053..121f5ccb27 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/page.tsx
@@ -237,6 +237,7 @@ export default async function MarketplaceProgramPage(props: {
className="mt-4"
rewards={program.rewards || []}
discount={program.discount || null}
+ bounties={program.bounties}
/>
{program.landerData && (
diff --git a/apps/web/lib/actions/partners/bulk-invite-partners.ts b/apps/web/lib/actions/partners/bulk-invite-partners.ts
index c8987a57f5..a6d4da6b8d 100644
--- a/apps/web/lib/actions/partners/bulk-invite-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-invite-partners.ts
@@ -3,7 +3,7 @@
import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
import { createId } from "@/lib/api/create-id";
import { bulkCreateLinks } from "@/lib/api/links";
-import { getPartnerInviteRewardsAndBounties } from "@/lib/api/partners/get-partner-invite-rewards-and-bounties";
+import { getGroupRewardsAndBounties } from "@/lib/api/partners/get-group-rewards-and-bounties";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
@@ -168,7 +168,7 @@ export const bulkInvitePartnersAction = authActionClient
);
}
- const rewardsAndBounties = await getPartnerInviteRewardsAndBounties({
+ const rewardsAndBounties = await getGroupRewardsAndBounties({
programId,
groupId: groupId || program.defaultGroupId,
});
diff --git a/apps/web/lib/actions/partners/create-program.ts b/apps/web/lib/actions/partners/create-program.ts
index dd8c4e2fa6..339fd78d6e 100644
--- a/apps/web/lib/actions/partners/create-program.ts
+++ b/apps/web/lib/actions/partners/create-program.ts
@@ -2,7 +2,7 @@ import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
import { createId } from "@/lib/api/create-id";
import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
import { createAndEnrollPartner } from "@/lib/api/partners/create-and-enroll-partner";
-import { getPartnerInviteRewardsAndBounties } from "@/lib/api/partners/get-partner-invite-rewards-and-bounties";
+import { getGroupRewardsAndBounties } from "@/lib/api/partners/get-group-rewards-and-bounties";
import { generateRandomString } from "@/lib/api/utils/generate-random-string";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import { storage } from "@/lib/storage";
@@ -319,7 +319,7 @@ async function invitePartner({
slug: program.slug,
logo: program.logo,
},
- ...(await getPartnerInviteRewardsAndBounties({
+ ...(await getGroupRewardsAndBounties({
programId: program.id,
groupId: program.defaultGroupId,
})),
diff --git a/apps/web/lib/actions/partners/invite-partner-from-network.ts b/apps/web/lib/actions/partners/invite-partner-from-network.ts
index bf4eb4c9b4..a23b2437ad 100644
--- a/apps/web/lib/actions/partners/invite-partner-from-network.ts
+++ b/apps/web/lib/actions/partners/invite-partner-from-network.ts
@@ -3,8 +3,8 @@
import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
import { createId } from "@/lib/api/create-id";
import { createAndEnrollPartner } from "@/lib/api/partners/create-and-enroll-partner";
+import { getGroupRewardsAndBounties } from "@/lib/api/partners/get-group-rewards-and-bounties";
import { getNetworkInvitesUsage } from "@/lib/api/partners/get-network-invites-usage";
-import { getPartnerInviteRewardsAndBounties } from "@/lib/api/partners/get-partner-invite-rewards-and-bounties";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { invitePartnerFromNetworkSchema } from "@/lib/zod/schemas/partner-network";
import { sendEmail } from "@dub/email";
@@ -91,7 +91,7 @@ export const invitePartnerFromNetworkAction = authActionClient
Promise.allSettled([
(async () => {
if (!partner.email) return;
- const rewardsAndBounties = await getPartnerInviteRewardsAndBounties({
+ const rewardsAndBounties = await getGroupRewardsAndBounties({
programId,
groupId: enrolledPartner.groupId || program.defaultGroupId,
});
diff --git a/apps/web/lib/actions/partners/invite-partner.ts b/apps/web/lib/actions/partners/invite-partner.ts
index f3fca65496..9869437d69 100644
--- a/apps/web/lib/actions/partners/invite-partner.ts
+++ b/apps/web/lib/actions/partners/invite-partner.ts
@@ -2,7 +2,7 @@
import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
import { createAndEnrollPartner } from "@/lib/api/partners/create-and-enroll-partner";
-import { getPartnerInviteRewardsAndBounties } from "@/lib/api/partners/get-partner-invite-rewards-and-bounties";
+import { getGroupRewardsAndBounties } from "@/lib/api/partners/get-group-rewards-and-bounties";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { invitePartnerSchema } from "@/lib/zod/schemas/partners";
import { sendEmail } from "@dub/email";
@@ -83,7 +83,7 @@ export const invitePartnerAction = authActionClient
const sendPartnerInvitePromise = (async () => {
try {
- const rewardsAndBounties = await getPartnerInviteRewardsAndBounties({
+ const rewardsAndBounties = await getGroupRewardsAndBounties({
programId,
groupId: enrolledPartner.groupId || program.defaultGroupId,
});
diff --git a/apps/web/lib/actions/partners/resend-program-invite.ts b/apps/web/lib/actions/partners/resend-program-invite.ts
index 5bb428abb5..701700dde1 100644
--- a/apps/web/lib/actions/partners/resend-program-invite.ts
+++ b/apps/web/lib/actions/partners/resend-program-invite.ts
@@ -1,7 +1,7 @@
"use server";
import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
-import { getPartnerInviteRewardsAndBounties } from "@/lib/api/partners/get-partner-invite-rewards-and-bounties";
+import { getGroupRewardsAndBounties } from "@/lib/api/partners/get-group-rewards-and-bounties";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { sendEmail } from "@dub/email";
import ProgramInvite from "@dub/email/templates/program-invite";
@@ -71,7 +71,7 @@ export const resendProgramInviteAction = authActionClient
slug: program.slug,
logo: program.logo,
},
- ...(await getPartnerInviteRewardsAndBounties({
+ ...(await getGroupRewardsAndBounties({
programId,
groupId: programEnrollment.groupId || program.defaultGroupId,
})),
diff --git a/apps/web/lib/api/groups/get-group-or-throw.ts b/apps/web/lib/api/groups/get-group-or-throw.ts
index 2d216f8efa..a0e27105bd 100644
--- a/apps/web/lib/api/groups/get-group-or-throw.ts
+++ b/apps/web/lib/api/groups/get-group-or-throw.ts
@@ -1,3 +1,4 @@
+import { getGroupBountySummaries } from "@/lib/bounty/api/get-group-bounty-summaries";
import { prisma } from "@dub/prisma";
import { DubApiError } from "../errors";
@@ -5,10 +6,12 @@ export const getGroupOrThrow = async ({
programId,
groupId,
includeExpandedFields = false,
+ includeBounties = false,
}: {
programId: string;
groupId: string;
includeExpandedFields?: boolean;
+ includeBounties?: boolean;
}) => {
const group = await prisma.partnerGroup.findUnique({
where: {
@@ -51,6 +54,12 @@ export const getGroupOrThrow = async ({
return {
...group,
+ ...(includeBounties && {
+ bounties: await getGroupBountySummaries({
+ programId,
+ groupId: group.id,
+ }),
+ }),
moveRules: group.workflow?.triggerConditions,
};
};
diff --git a/apps/web/lib/api/partners/get-partner-invite-rewards-and-bounties.ts b/apps/web/lib/api/partners/get-group-rewards-and-bounties.ts
similarity index 56%
rename from apps/web/lib/api/partners/get-partner-invite-rewards-and-bounties.ts
rename to apps/web/lib/api/partners/get-group-rewards-and-bounties.ts
index ee1d50b21f..ad6972a41f 100644
--- a/apps/web/lib/api/partners/get-partner-invite-rewards-and-bounties.ts
+++ b/apps/web/lib/api/partners/get-group-rewards-and-bounties.ts
@@ -1,6 +1,5 @@
import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
import { formatRewardDescription } from "@/ui/partners/format-reward-description";
-import { prisma } from "@dub/prisma";
import { BountyType, EventType, Reward } from "@dub/prisma/client";
import { getGroupOrThrow } from "../groups/get-group-or-throw";
import { serializeReward } from "./serialize-reward";
@@ -16,62 +15,19 @@ const BOUNTY_ICONS: Record<BountyType, string> = {
performance: "https://assets.dub.co/email-assets/icons/trophy.png",
};
-export async function getPartnerInviteRewardsAndBounties({
+export async function getGroupRewardsAndBounties({
programId,
groupId,
}: {
programId: string;
groupId: string;
}) {
- const now = new Date();
-
- const [group, bounties] = await Promise.all([
- getGroupOrThrow({
- programId,
- groupId,
- includeExpandedFields: true,
- }),
-
- prisma.bounty.findMany({
- where: {
- programId,
- startsAt: {
- lte: now,
- },
- // Check if the bounty is active
- OR: [
- {
- endsAt: null,
- },
- {
- endsAt: {
- gt: now,
- },
- },
- ],
- // If bounty has no groups, it's available to all partners
- // If bounty has groups, only partners in those groups can see it
- AND: [
- {
- OR: [
- {
- groups: {
- none: {},
- },
- },
- {
- groups: {
- some: {
- groupId,
- },
- },
- },
- ],
- },
- ],
- },
- }),
- ]);
+ const group = await getGroupOrThrow({
+ programId,
+ groupId,
+ includeExpandedFields: true,
+ includeBounties: true,
+ });
return {
rewards: [
@@ -90,7 +46,7 @@ export async function getPartnerInviteRewardsAndBounties({
]
: []),
],
- bounties: bounties.map((bounty) => ({
+ bounties: (group.bounties ?? []).map((bounty) => ({
icon: BOUNTY_ICONS[bounty.type],
label: bounty.name,
})),
diff --git a/apps/web/lib/api/partners/notify-partner-group-change.ts b/apps/web/lib/api/partners/notify-partner-group-change.ts
index 6c8010adf6..b30dd834fd 100644
--- a/apps/web/lib/api/partners/notify-partner-group-change.ts
+++ b/apps/web/lib/api/partners/notify-partner-group-change.ts
@@ -1,6 +1,6 @@
import { queueBatchEmail } from "@/lib/email/queue-batch-email";
import type PartnerGroupChanged from "@dub/email/templates/partner-group-changed";
-import { getPartnerInviteRewardsAndBounties } from "./get-partner-invite-rewards-and-bounties";
+import { getGroupRewardsAndBounties } from "./get-group-rewards-and-bounties";
import { getPartnerUsers } from "./get-partner-users";
interface NotifyPartnerGroupChangeParams {
@@ -27,7 +27,7 @@ export async function notifyPartnerGroupChange({
},
partnerUsers,
] = await Promise.all([
- getPartnerInviteRewardsAndBounties({
+ getGroupRewardsAndBounties({
programId,
groupId,
}),
diff --git a/apps/web/lib/bounty/api/get-group-bounty-summaries.ts b/apps/web/lib/bounty/api/get-group-bounty-summaries.ts
new file mode 100644
index 0000000000..1fdfc5b614
--- /dev/null
+++ b/apps/web/lib/bounty/api/get-group-bounty-summaries.ts
@@ -0,0 +1,88 @@
+import { prisma } from "@dub/prisma";
+import { BountyType } from "@dub/prisma/client";
+
+export type GroupBountySummary = {
+ id: string;
+ name: string;
+ type: BountyType;
+};
+
+type BountyEligibilityCandidate = {
+ id: string;
+ name: string | null;
+ type: BountyType;
+ startsAt: Date;
+ endsAt: Date | null;
+ archivedAt: Date | null;
+ groups: { groupId: string }[];
+};
+
+export function filterActiveGroupBounties(
+ bounties: BountyEligibilityCandidate[],
+ {
+ groupId,
+ now = new Date(),
+ }: {
+ groupId: string;
+ now?: Date;
+ },
+) {
+ return bounties.filter((bounty) => {
+ if (bounty.archivedAt) {
+ return false;
+ }
+
+ if (bounty.startsAt > now) {
+ return false;
+ }
+
+ if (bounty.endsAt && bounty.endsAt <= now) {
+ return false;
+ }
+
+ return (
+ bounty.groups.length === 0 ||
+ bounty.groups.some((group) => group.groupId === groupId)
+ );
+ });
+}
+
+export async function getGroupBountySummaries({
+ programId,
+ groupId,
+ now = new Date(),
+}: {
+ programId: string;
+ groupId: string;
+ now?: Date;
+}) {
+ const bounties = await prisma.bounty.findMany({
+ where: {
+ programId,
+ },
+ select: {
+ id: true,
+ name: true,
+ type: true,
+ startsAt: true,
+ endsAt: true,
+ archivedAt: true,
+ groups: {
+ select: {
+ groupId: true,
+ },
+ },
+ },
+ orderBy: {
+ startsAt: "asc",
+ },
+ });
+
+ return filterActiveGroupBounties(bounties, { groupId, now }).map(
+ (bounty) => ({
+ id: bounty.id,
+ name: bounty.name || "Untitled bounty",
+ type: bounty.type,
+ }),
+ );
+}
diff --git a/apps/web/lib/fetchers/get-network-program.ts b/apps/web/lib/fetchers/get-network-program.ts
index 276cd9fe57..e6d6cb0d5a 100644
--- a/apps/web/lib/fetchers/get-network-program.ts
+++ b/apps/web/lib/fetchers/get-network-program.ts
@@ -1,3 +1,4 @@
+import { getGroupBountySummaries } from "@/lib/bounty/api/get-group-bounty-summaries";
import { prisma } from "@dub/prisma";
import { cache } from "react";
import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
@@ -32,6 +33,15 @@ export const getNetworkProgram = cache(async ({ slug }: { slug: string }) => {
return null;
}
+ const defaultGroup = program.groups[0];
+
+ const bounties = defaultGroup
+ ? await getGroupBountySummaries({
+ programId: program.id,
+ groupId: defaultGroup.id,
+ })
+ : [];
+
return NetworkProgramExtendedSchema.parse({
...program,
rewards:
@@ -47,5 +57,6 @@ export const getNetworkProgram = cache(async ({ slug }: { slug: string }) => {
landerData: program.groups?.[0]?.landerData
? programLanderSchema.parse(program.groups[0].landerData)
: null,
+ bounties,
});
});
diff --git a/apps/web/lib/fetchers/get-program.ts b/apps/web/lib/fetchers/get-program.ts
index 2b7b24eb5b..3220c33bd9 100644
--- a/apps/web/lib/fetchers/get-program.ts
+++ b/apps/web/lib/fetchers/get-program.ts
@@ -1,3 +1,4 @@
+import { getGroupBountySummaries } from "@/lib/bounty/api/get-group-bounty-summaries";
import { prisma } from "@dub/prisma";
import { Program, Reward } from "@dub/prisma/client";
import { cache } from "react";
@@ -55,6 +56,11 @@ export const getProgram = cache(
const group = groups[0];
+ const bounties = await getGroupBountySummaries({
+ programId: program.id,
+ groupId: group.id,
+ });
+
const rewards = [group.clickReward, group.leadReward, group.saleReward]
.filter((r) => r !== null)
.map((r) => serializeReward(r as Reward));
@@ -63,7 +69,10 @@ export const getProgram = cache(
return {
...program,
- group,
+ group: {
+ ...group,
+ bounties,
+ },
rewards: rewards as RewardProps[],
discount: discount as DiscountProps | null,
};
diff --git a/apps/web/lib/types.ts b/apps/web/lib/types.ts
index 9c1918c63a..32670b9df3 100644
--- a/apps/web/lib/types.ts
+++ b/apps/web/lib/types.ts
@@ -83,6 +83,7 @@ import { dashboardSchema } from "./zod/schemas/dashboard";
import { DiscountCodeSchema, DiscountSchema } from "./zod/schemas/discount";
import { EmailDomainSchema } from "./zod/schemas/email-domains";
import { FolderSchema } from "./zod/schemas/folders";
+import { GroupBountySummarySchema } from "./zod/schemas/group-bounties";
import {
fraudGroupSchema,
fraudRuleSchema,
@@ -668,6 +669,7 @@ export type PartnerCommentProps = z.infer<typeof PartnerCommentSchema>;
export type BountyProps = z.infer<typeof BountySchema>;
export type BountyListProps = z.infer<typeof BountyListSchema>;
+export type GroupBountySummaryProps = z.infer<typeof GroupBountySummarySchema>;
export type PartnerBountyProps = z.infer<typeof PartnerBountySchema>;
diff --git a/apps/web/lib/zod/schemas/group-bounties.ts b/apps/web/lib/zod/schemas/group-bounties.ts
new file mode 100644
index 0000000000..814228d052
--- /dev/null
+++ b/apps/web/lib/zod/schemas/group-bounties.ts
@@ -0,0 +1,8 @@
+import { BountyType } from "@dub/prisma/client";
+import * as z from "zod/v4";
+
+export const GroupBountySummarySchema = z.object({
+ id: z.string(),
+ name: z.string().default("Untitled bounty"),
+ type: z.enum(BountyType),
+});
diff --git a/apps/web/lib/zod/schemas/groups.ts b/apps/web/lib/zod/schemas/groups.ts
index ea9399e76a..39fd1378d4 100644
--- a/apps/web/lib/zod/schemas/groups.ts
+++ b/apps/web/lib/zod/schemas/groups.ts
@@ -6,6 +6,7 @@ import { validSlugRegex } from "@dub/utils";
import slugify from "@sindresorhus/slugify";
import * as z from "zod/v4";
import { DiscountSchema } from "./discount";
+import { GroupBountySummarySchema } from "./group-bounties";
import { booleanQuerySchema, getPaginationQuerySchema } from "./misc";
import { programApplicationFormSchema } from "./program-application-form";
import { programLanderSchema } from "./program-lander";
@@ -79,6 +80,7 @@ export const GroupWithFormDataSchema = GroupSchema.extend({
applicationFormPublishedAt: z.date().nullable(),
landerData: programLanderSchema.nullable(),
landerPublishedAt: z.date().nullable(),
+ bounties: z.array(GroupBountySummarySchema).optional(),
});
export const GroupSchemaExtended = GroupSchema.extend({
diff --git a/apps/web/lib/zod/schemas/program-network.ts b/apps/web/lib/zod/schemas/program-network.ts
index d68bc40d60..6e2a864300 100644
--- a/apps/web/lib/zod/schemas/program-network.ts
+++ b/apps/web/lib/zod/schemas/program-network.ts
@@ -1,6 +1,7 @@
import { Category, ProgramEnrollmentStatus } from "@dub/prisma/client";
import * as z from "zod/v4";
import { DiscountSchema } from "./discount";
+import { GroupBountySummarySchema } from "./group-bounties";
import { getPaginationQuerySchema } from "./misc";
import { programLanderSchema } from "./program-lander";
import { ProgramSchema } from "./programs";
@@ -25,6 +26,7 @@ export const NetworkProgramSchema = ProgramSchema.pick({
export const NetworkProgramExtendedSchema = NetworkProgramSchema.extend({
landerData: programLanderSchema.nullable(),
+ bounties: z.array(GroupBountySummarySchema).optional(),
});
export const PROGRAM_NETWORK_MAX_PAGE_SIZE = 100;
diff --git a/apps/web/tests/misc/filter-active-group-bounties.test.ts b/apps/web/tests/misc/filter-active-group-bounties.test.ts
new file mode 100644
index 0000000000..2978d33a30
--- /dev/null
+++ b/apps/web/tests/misc/filter-active-group-bounties.test.ts
@@ -0,0 +1,109 @@
+import { filterActiveGroupBounties } from "@/lib/bounty/api/get-group-bounty-summaries";
+import { BountyType } from "@dub/prisma/client";
+import { describe, expect, it } from "vitest";
+
+const GROUP_ID = "grp_test_123";
+const OTHER_GROUP_ID = "grp_other_456";
+
+const NOW = new Date("2025-06-01T12:00:00.000Z");
+
+function makeCandidate(
+ overrides: Partial<{
+ id: string;
+ name: string | null;
+ type: BountyType;
+ startsAt: Date;
+ endsAt: Date | null;
+ archivedAt: Date | null;
+ groups: { groupId: string }[];
+ }> = {},
+) {
+ return {
+ id: "bnty_1",
+ name: "Test Bounty",
+ type: "submission" as BountyType,
+ startsAt: new Date("2025-01-01T00:00:00.000Z"),
+ endsAt: null,
+ archivedAt: null,
+ groups: [],
+ ...overrides,
+ };
+}
+
+describe("filterActiveGroupBounties", () => {
+ it("excludes archived bounties", () => {
+ const bounty = makeCandidate({ archivedAt: new Date("2025-05-01T00:00:00.000Z") });
+ const result = filterActiveGroupBounties([bounty], { groupId: GROUP_ID, now: NOW });
+ expect(result).toHaveLength(0);
+ });
+
+ it("excludes bounties that have not started yet (startsAt > now)", () => {
+ const bounty = makeCandidate({ startsAt: new Date("2025-06-02T00:00:00.000Z") });
+ const result = filterActiveGroupBounties([bounty], { groupId: GROUP_ID, now: NOW });
+ expect(result).toHaveLength(0);
+ });
+
+ it("includes bounties that start exactly at now (startsAt === now, boundary is exclusive >)", () => {
+ const bounty = makeCandidate({ startsAt: NOW });
+ const result = filterActiveGroupBounties([bounty], { groupId: GROUP_ID, now: NOW });
+ expect(result).toHaveLength(1);
+ });
+
+ it("excludes bounties whose endsAt is exactly now (endsAt === now, exclusive boundary)", () => {
+ const bounty = makeCandidate({ endsAt: NOW });
+ const result = filterActiveGroupBounties([bounty], { groupId: GROUP_ID, now: NOW });
+ expect(result).toHaveLength(0);
+ });
+
+ it("excludes bounties that expired before now (endsAt < now)", () => {
+ const bounty = makeCandidate({ endsAt: new Date("2025-05-31T00:00:00.000Z") });
+ const result = filterActiveGroupBounties([bounty], { groupId: GROUP_ID, now: NOW });
+ expect(result).toHaveLength(0);
+ });
+
+ it("includes bounties with no endsAt (never expires)", () => {
+ const bounty = makeCandidate({ endsAt: null });
+ const result = filterActiveGroupBounties([bounty], { groupId: GROUP_ID, now: NOW });
+ expect(result).toHaveLength(1);
+ });
+
+ it("includes global bounties (groups is empty) regardless of groupId", () => {
+ const bounty = makeCandidate({ groups: [] });
+ const result = filterActiveGroupBounties([bounty], { groupId: GROUP_ID, now: NOW });
+ expect(result).toHaveLength(1);
+ });
+
+ it("includes group-scoped bounties when groups contains the matching groupId", () => {
+ const bounty = makeCandidate({ groups: [{ groupId: GROUP_ID }] });
+ const result = filterActiveGroupBounties([bounty], { groupId: GROUP_ID, now: NOW });
+ expect(result).toHaveLength(1);
+ });
+
+ it("excludes group-scoped bounties when groups contains only a different groupId", () => {
+ const bounty = makeCandidate({ groups: [{ groupId: OTHER_GROUP_ID }] });
+ const result = filterActiveGroupBounties([bounty], { groupId: GROUP_ID, now: NOW });
+ expect(result).toHaveLength(0);
+ });
+
+ it("includes group-scoped bounties when groups contains the matching groupId alongside others", () => {
+ const bounty = makeCandidate({
+ groups: [{ groupId: OTHER_GROUP_ID }, { groupId: GROUP_ID }],
+ });
+ const result = filterActiveGroupBounties([bounty], { groupId: GROUP_ID, now: NOW });
+ expect(result).toHaveLength(1);
+ });
+
+ it("filters multiple bounties correctly in a mixed set", () => {
+ const bounties = [
+ makeCandidate({ id: "bnty_1", archivedAt: new Date("2025-01-01T00:00:00.000Z") }),
+ makeCandidate({ id: "bnty_2", startsAt: new Date("2025-07-01T00:00:00.000Z") }),
+ makeCandidate({ id: "bnty_3", endsAt: NOW }),
+ makeCandidate({ id: "bnty_4", groups: [] }),
+ makeCandidate({ id: "bnty_5", groups: [{ groupId: GROUP_ID }] }),
+ makeCandidate({ id: "bnty_6", groups: [{ groupId: OTHER_GROUP_ID }] }),
+ ];
+
+ const result = filterActiveGroupBounties(bounties, { groupId: GROUP_ID, now: NOW });
+ expect(result.map((b) => b.id)).toEqual(["bnty_4", "bnty_5"]);
+ });
+});
diff --git a/apps/web/tests/partner-groups/index.test.ts b/apps/web/tests/partner-groups/index.test.ts
index 972eca311e..090cf2189c 100644
--- a/apps/web/tests/partner-groups/index.test.ts
+++ b/apps/web/tests/partner-groups/index.test.ts
@@ -87,6 +87,7 @@ describe.sequential("/groups/**", async () => {
const {
applicationFormData,
applicationFormPublishedAt,
+ bounties,
landerData,
landerPublishedAt,
program,
diff --git a/apps/web/ui/partners/groups/design/previews/application-preview.tsx b/apps/web/ui/partners/groups/design/previews/application-preview.tsx
index 0ed607afc9..bb3730369c 100644
--- a/apps/web/ui/partners/groups/design/previews/application-preview.tsx
+++ b/apps/web/ui/partners/groups/design/previews/application-preview.tsx
@@ -245,7 +245,11 @@ export function ApplicationPreview({
{/* Program rewards */}
<div className="mx-auto mb-1 mt-6 max-w-screen-sm">
<div className="px-6">
- <LanderRewards rewards={rewards} discount={discount} />
+ <LanderRewards
+ rewards={rewards}
+ discount={discount}
+ bounties={group.bounties}
+ />
</div>
</div>
diff --git a/apps/web/ui/partners/groups/design/previews/lander-preview.tsx b/apps/web/ui/partners/groups/design/previews/lander-preview.tsx
index e0edb1c952..3d45c7508b 100644
--- a/apps/web/ui/partners/groups/design/previews/lander-preview.tsx
+++ b/apps/web/ui/partners/groups/design/previews/lander-preview.tsx
@@ -242,7 +242,11 @@ export function LanderPreview({ group }: { group: GroupWithProgramProps }) {
{/* Program rewards */}
<div className="mx-auto mb-1 mt-6 max-w-screen-sm">
<div className="px-6">
- <LanderRewards rewards={rewards} discount={discount} />
+ <LanderRewards
+ rewards={rewards}
+ discount={discount}
+ bounties={group.bounties}
+ />
</div>
</div>
diff --git a/apps/web/ui/partners/lander/lander-rewards.tsx b/apps/web/ui/partners/lander/lander-rewards.tsx
index 99cdee57e0..f11679af3c 100644
--- a/apps/web/ui/partners/lander/lander-rewards.tsx
+++ b/apps/web/ui/partners/lander/lander-rewards.tsx
@@ -1,27 +1,147 @@
-import { DiscountProps, RewardProps } from "@/lib/types";
-import { ProgramRewardList } from "../program-reward-list";
+"use client";
+
+import { constructRewardAmount } from "@/lib/api/sales/construct-reward-amount";
+import { getRewardAmount } from "@/lib/partners/get-reward-amount";
+import {
+ DiscountProps,
+ GroupBountySummaryProps,
+ RewardProps,
+} from "@/lib/types";
+import { Gift, Heart, Icon, Trophy } from "@dub/ui";
+import { cn } from "@dub/utils";
+import { PropsWithChildren, useState } from "react";
+import { REWARD_EVENTS } from "../constants";
+import { formatDiscountDescription } from "../format-discount-description";
+import { ProgramRewardModifiersTooltip } from "../program-reward-modifiers-tooltip";
+
+const MAX_VISIBLE_BOUNTIES = 3;
export function LanderRewards({
rewards,
discount,
+ bounties = [],
className,
}: {
rewards: RewardProps[];
discount: DiscountProps | null;
+ bounties?: GroupBountySummaryProps[];
className?: string;
}) {
- if (!rewards.length && !discount) {
+ const sortedFilteredRewards = rewards.filter((reward) => {
+ const rawAmount =
+ reward.type === "flat" ? reward.amountInCents : reward.amountInPercentage;
+
+ return rawAmount != null && getRewardAmount(reward) > 0;
+ });
+ const [showAllBounties, setShowAllBounties] = useState(false);
+ const shouldCollapseBounties = bounties.length > MAX_VISIBLE_BOUNTIES;
+ const visibleBounties =
+ shouldCollapseBounties && !showAllBounties
+ ? bounties.slice(0, MAX_VISIBLE_BOUNTIES)
+ : bounties;
+
+ if (
+ sortedFilteredRewards.length === 0 &&
+ !discount &&
+ bounties.length === 0
+ ) {
return null;
}
return (
- <div className={className}>
- <h2 className="mb-2 text-base font-semibold text-neutral-800">Rewards</h2>
- <ProgramRewardList
- rewards={rewards}
- discount={discount}
- className="bg-neutral-100"
- />
+ <div
+ className={cn(
+ "rounded-[10px] border border-neutral-200 bg-neutral-50 px-5 py-4",
+ className,
+ )}
+ >
+ {Boolean(sortedFilteredRewards.length || discount) && (
+ <div className={cn(bounties.length > 0 && "mb-5")}>
+ <h2 className="text-base font-semibold tracking-[-0.02em] text-neutral-800">
+ Rewards
+ </h2>
+ <ul className="mt-2 flex flex-col gap-2 text-sm font-medium tracking-[-0.02em] text-neutral-600">
+ {sortedFilteredRewards.map((reward) => (
+ <Item key={reward.id} icon={REWARD_EVENTS[reward.event].icon}>
+ {reward.description || (
+ <>
+ {constructRewardAmount(reward)}{" "}
+ {reward.event === "sale" && reward.maxDuration === 0 ? (
+ <>for the first sale</>
+ ) : (
+ <>per {reward.event}</>
+ )}
+ {reward.maxDuration === null ? (
+ <> for the customer's lifetime</>
+ ) : reward.maxDuration && reward.maxDuration >= 1 ? (
+ <>
+ {" "}
+ for{" "}
+ {reward.maxDuration % 12 === 0
+ ? `${reward.maxDuration / 12} year${reward.maxDuration / 12 > 1 ? "s" : ""}`
+ : `${reward.maxDuration} month${reward.maxDuration > 1 ? "s" : ""}`}
+ </>
+ ) : null}
+ </>
+ )}
+ {(!!reward.modifiers?.length ||
+ Boolean(reward.tooltipDescription)) && (
+ <>
+ {" "}
+ <ProgramRewardModifiersTooltip reward={reward} />
+ </>
+ )}
+ </Item>
+ ))}
+
+ {discount && (
+ <Item icon={Gift}>{formatDiscountDescription(discount)}</Item>
+ )}
+ </ul>
+ </div>
+ )}
+
+ {bounties.length > 0 && (
+ <div>
+ <h2 className="text-base font-semibold tracking-[-0.02em] text-neutral-800">
+ Bounties
+ </h2>
+ <ul className="mt-2 flex flex-col gap-2 text-sm font-medium tracking-[-0.02em] text-neutral-600">
+ {visibleBounties.map((bounty) => (
+ <Item
+ key={bounty.id}
+ icon={bounty.type === "performance" ? Trophy : Heart}
+ >
+ {bounty.name}
+ </Item>
+ ))}
+ </ul>
+ {shouldCollapseBounties && (
+ <button
+ type="button"
+ className={cn(
+ "mt-3 flex h-6 w-fit items-center justify-center rounded-md px-1.5 text-xs font-medium tracking-[-0.02em] text-neutral-900 transition-colors",
+ "bg-neutral-200/50 hover:bg-neutral-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-300",
+ )}
+ onClick={() => setShowAllBounties((current) => !current)}
+ >
+ {showAllBounties ? "View less bounties" : "View all bounties"}
+ </button>
+ )}
+ </div>
+ )}
</div>
);
}
+
+const Item = ({
+ icon: IconComponent,
+ children,
+}: PropsWithChildren<{ icon: Icon }>) => {
+ return (
+ <li className="flex items-center gap-2 leading-5">
+ <IconComponent className="size-4 shrink-0 text-neutral-600" />
+ <div>{children}</div>
+ </li>
+ );
+};