The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Add milestone-based approval for social metrics bounties
Kiran K593f0aa41ea7
diff --git a/apps/web/app/(ee)/api/bounties/[bountyId]/sync-social-metrics/route.ts b/apps/web/app/(ee)/api/bounties/[bountyId]/sync-social-metrics/route.tsindex 5ecb517532..7931c33a38 100644--- a/apps/web/app/(ee)/api/bounties/[bountyId]/sync-social-metrics/route.ts+++ b/apps/web/app/(ee)/api/bounties/[bountyId]/sync-social-metrics/route.ts@@ -6,6 +6,7 @@ import { getEffectiveBountyPeriod } from "@/lib/bounty/api/bounty-availability";import { getBountyOrThrow } from "@/lib/bounty/api/get-bounty-or-throw";import { getSocialMetricsUpdates } from "@/lib/bounty/api/get-social-metrics-updates";import { isBountyEnded, isBountyStarted } from "@/lib/bounty/bounty-period";+import { hasReachedSocialMetricsEarningCap } from "@/lib/bounty/social-metrics-milestones";import { resolveBountyDetails } from "@/lib/bounty/utils";import { qstash } from "@/lib/cron";import { prisma } from "@/lib/prisma";@@ -53,6 +54,7 @@ export const POST = withWorkspace(id: true,urls: true,status: true,+ socialMetricCount: true,partner: true,programEnrollment: {select: {@@ -104,10 +106,18 @@ export const POST = withWorkspace(});}- if (submission.status === "approved") {+ if (submission.status === "approved" || submission.status === "rejected") {throw new DubApiError({code: "bad_request",- message: "Social metrics can't be synced for an approved submission.",+ message: `Social metrics can't be synced for ${submission.status === "approved" ? "an approved" : "a rejected"} submission.`,+ });+ }++ if (hasReachedSocialMetricsEarningCap({ bounty, submission })) {+ throw new DubApiError({+ code: "bad_request",+ message:+ "This submission has already reached the maximum reward for this bounty.",});}diff --git a/apps/web/app/(ee)/api/cron/bounties/sync-social-metrics/route.ts b/apps/web/app/(ee)/api/cron/bounties/sync-social-metrics/route.tsindex f1fcced4d9..5c738e8c01 100644--- a/apps/web/app/(ee)/api/cron/bounties/sync-social-metrics/route.ts+++ b/apps/web/app/(ee)/api/cron/bounties/sync-social-metrics/route.ts@@ -1,6 +1,7 @@import { getEffectiveBountyPeriod } from "@/lib/bounty/api/bounty-availability";import { getSocialMetricsUpdates } from "@/lib/bounty/api/get-social-metrics-updates";import { isBountyEnded } from "@/lib/bounty/bounty-period";+import { hasReachedSocialMetricsEarningCap } from "@/lib/bounty/social-metrics-milestones";import { resolveBountyDetails } from "@/lib/bounty/utils";import { qstash } from "@/lib/cron";import { withCron } from "@/lib/cron/with-cron";@@ -113,6 +114,10 @@ export const POST = withCron(async ({ rawBody }) => {return false;}+ if (hasReachedSocialMetricsEarningCap({ bounty, submission })) {+ return false;+ }+const { endsAt } = getEffectiveBountyPeriod({programEnrollment: submission.programEnrollment,bounty,diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/bounties/[bountyId]/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/bounties/[bountyId]/route.tsindex 9d2840f0d5..3e22ab9c27 100644--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/bounties/[bountyId]/route.ts+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/bounties/[bountyId]/route.ts@@ -63,6 +63,7 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {id: true,earnings: true,status: true,+ description: true,createdAt: true,},orderBy: {diff --git a/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-detail.tsx b/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-detail.tsxindex c6fc08b91a..22fc4d2ddb 100644--- a/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-detail.tsx+++ b/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-detail.tsx@@ -281,13 +281,12 @@ function SubmissionRightColumn({</div>)}- {bountyInfo?.hasSocialMetrics &&- ["draft", "submitted"].includes(submission.status) && (- <BountySocialMetricsRewardsTable- bounty={bounty}- submission={submission}- />- )}+ {bountyInfo?.hasSocialMetrics && (+ <BountySocialMetricsRewardsTable+ bounty={bounty}+ submission={submission}+ />+ )}</div>);}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsxindex b860e54c70..43f94fd4e8 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx@@ -2,7 +2,7 @@import { BountySubmissionStatusBadges } from "@/lib/bounty/bounty-submission-status-badges";import { REJECT_BOUNTY_SUBMISSION_REASONS } from "@/lib/bounty/constants";-import { calculateSocialMetricsRewardAmount } from "@/lib/bounty/rewards";+import { calculateSocialMetricsRewardAmount } from "@/lib/bounty/social-metrics-milestones";import { resolveBountyDetails } from "@/lib/bounty/utils";import { clientAccessCheck } from "@/lib/client-access-check";import { mutatePrefix } from "@/lib/swr/mutate";@@ -17,6 +17,7 @@ import { getBountyRewardCriteria } from "@/ui/partners/bounties/bounty-reward-crimport { BountySocialContentPreview } from "@/ui/partners/bounties/bounty-social-content-preview";import { BountySocialMetricsRewardsTable } from "@/ui/partners/bounties/bounty-social-metrics-rewards-table";import { useRejectBountySubmissionModal } from "@/ui/partners/bounties/reject-bounty-submission-modal";+import { useSocialMetricsMilestones } from "@/ui/partners/bounties/use-social-metrics-milestones";import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { ButtonLink } from "@/ui/placeholders/button-link";import { AmountInput } from "@/ui/shared/amount-input";@@ -39,6 +40,7 @@ import {formatDate,getPrettyUrl,nFormatter,+ pluralize,timeAgo,} from "@dub/utils";import Linkify from "linkify-react";@@ -130,7 +132,7 @@ function BountySubmissionDetailsSheetContent({useKeyboardShortcut("a",() => {- if (isValidForm && submission.status !== "draft") {+ if (canApprove) {openConfirmApproveBountySubmissionModal(submission,bounty ?? null,@@ -163,6 +165,16 @@ function BountySubmissionDetailsSheetContent({return true;}, [bounty, rewardAmount]);+ const { isSocialMetricsBounty, pendingMilestones, hasReachedEarningCap } =+ useSocialMetricsMilestones({+ bounty,+ submission,+ });++ const canApprove =+ submission?.status !== "draft" &&+ (isSocialMetricsBounty ? pendingMilestones.length > 0 : isValidForm);+if (!submission || !submission.partner || !bounty) {return null;}@@ -386,25 +398,27 @@ function BountySubmissionDetailsSheetContent({<h2 className="text-base font-semibold text-neutral-900">Submission</h2>- {hasSocialContent && submission.status !== "approved" && (- <div className="flex shrink-0 items-center gap-3">- {submission.socialMetricsLastSyncedAt ? (- <span className="whitespace-nowrap text-xs font-medium text-neutral-500">- Last sync{" "}- {timeAgo(submission.socialMetricsLastSyncedAt, {- withAgo: true,- })}- </span>- ) : null}- <Button- variant="secondary"- text="Refresh"- loading={isRefreshingSocialMetrics}- onClick={refreshSubmissionSocialMetrics}- className="h-8 rounded-lg px-3"- />- </div>- )}+ {hasSocialContent &&+ !["approved", "rejected"].includes(submission.status) &&+ !hasReachedEarningCap && (+ <div className="flex shrink-0 items-center gap-3">+ {submission.socialMetricsLastSyncedAt ? (+ <span className="whitespace-nowrap text-xs font-medium text-neutral-500">+ Last sync{" "}+ {timeAgo(submission.socialMetricsLastSyncedAt, {+ withAgo: true,+ })}+ </span>+ ) : null}+ <Button+ variant="secondary"+ text="Refresh"+ loading={isRefreshingSocialMetrics}+ onClick={refreshSubmissionSocialMetrics}+ className="h-8 rounded-lg px-3"+ />+ </div>+ )}</div><div className="mt-3 flex flex-col gap-6">@@ -446,15 +460,12 @@ function BountySubmissionDetailsSheetContent({</div>)}- {bountyInfo?.hasSocialMetrics &&- ["draft", "submitted", "approved"].includes(- submission.status,- ) && (- <BountySocialMetricsRewardsTable- bounty={bounty}- submission={submission}- />- )}+ {bountyInfo?.hasSocialMetrics && (+ <BountySocialMetricsRewardsTable+ bounty={bounty}+ submission={submission}+ />+ )}{Boolean(submission.files?.length) && (<div>@@ -574,7 +585,7 @@ function BountySubmissionDetailsSheetContent({<Buttontype="button"variant="danger"- text="Reject"+ text={isSocialMetricsBounty ? "Reject all" : "Reject"}shortcut="R"disabledTooltip={permissionsError@@ -592,8 +603,14 @@ function BountySubmissionDetailsSheetContent({<Buttontype="button"variant="primary"- text="Approve"- shortcut="A"+ text={+ !isSocialMetricsBounty+ ? "Approve"+ : pendingMilestones.length > 0+ ? `Approve ${pendingMilestones.length} ${pluralize("milestone", pendingMilestones.length)}`+ : "Waiting for milestone"+ }+ shortcut={canApprove ? "A" : undefined}onClick={() =>openConfirmApproveBountySubmissionModal(submission,@@ -604,11 +621,13 @@ function BountySubmissionDetailsSheetContent({disabledTooltip={permissionsError? permissionsError- : submission.status === "draft"- ? "Bounty submission is in progress."- : undefined+ : isSocialMetricsBounty && !canApprove+ ? "The partner hasn't reached the next milestone yet."+ : submission.status === "draft"+ ? "Bounty submission is in progress."+ : undefined}- disabled={!isValidForm || submission.status === "draft"}+ disabled={!canApprove}/></div></div>diff --git a/apps/web/lib/bounty/rewards.ts b/apps/web/lib/bounty/rewards.tsindex 5ba1afd52e..021253987f 100644--- a/apps/web/lib/bounty/rewards.ts+++ b/apps/web/lib/bounty/rewards.ts@@ -1,103 +1,7 @@import { currencyFormatter } from "@dub/utils";-import { Prisma } from "@prisma/client";-import { BountyProps, BountySubmissionProps } from "../types";+import { BountyProps } from "../types";import { resolveBountyDetails } from "./utils";-interface BountyInfoInput {- submissionRequirements?: Prisma.JsonValue | undefined | null;- rewardAmount?: number | undefined | null;-}--export interface SocialMetricsRewardTier {- threshold: number;- rewardAmount: number;- status: "met" | "unmet";-}--export function getSocialMetricsRewardTiers({- bounty,- submission,-}: {- bounty: BountyInfoInput | undefined | null;- submission: Pick<BountySubmissionProps, "socialMetricCount">;-}): SocialMetricsRewardTier[] {- const bountyInfo = resolveBountyDetails(bounty);- const socialMetrics = bountyInfo?.socialMetrics;- const rewardAmount = bounty?.rewardAmount ?? 0;- const socialMetricCount = submission.socialMetricCount ?? 0;-- if (!socialMetrics?.metric || !socialMetrics.minCount || rewardAmount <= 0) {- return [];- }-- const { minCount, incrementalBonus } = socialMetrics;-- // Base tier- const tiers: SocialMetricsRewardTier[] = [- {- threshold: minCount,- rewardAmount,- status: socialMetricCount >= minCount ? "met" : "unmet",- },- ];-- if (tiers[0].status === "unmet") {- return tiers;- }-- // Incremental bonus tiers- if (incrementalBonus) {- const { incrementCount, bonusPerIncrement, maxCount } = incrementalBonus;-- const hasValidIncrementalBonus =- incrementCount != null &&- bonusPerIncrement != null &&- maxCount != null &&- incrementCount > 0;-- if (hasValidIncrementalBonus) {- for (- let t = minCount + incrementCount;- t <= maxCount;- t += incrementCount- ) {- const status = socialMetricCount >= t ? "met" : "unmet";-- tiers.push({- threshold: t,- rewardAmount: bonusPerIncrement,- status,- });-- // Stop after first unmet- if (status === "unmet") {- break;- }- }- }- }-- return tiers;-}--export function calculateSocialMetricsRewardAmount({- bounty,- submission,-}: {- bounty: BountyInfoInput | undefined | null;- submission: Pick<BountySubmissionProps, "socialMetricCount">;-}) {- const tiers = getSocialMetricsRewardTiers({ bounty, submission });-- if (tiers.length === 0 || submission.socialMetricCount == null) {- return null;- }-- return tiers- .filter((tier) => tier.status === "met")- .reduce((sum, tier) => sum + tier.rewardAmount, 0);-}-export function getBountyRewardDescription(bounty: Pick<BountyProps,diff --git a/apps/web/lib/bounty/social-metrics-milestones.ts b/apps/web/lib/bounty/social-metrics-milestones.tsnew file mode 100644index 0000000000..4bb1074361--- /dev/null+++ b/apps/web/lib/bounty/social-metrics-milestones.ts@@ -0,0 +1,270 @@+import { nFormatter } from "@dub/utils";+import { Prisma } from "@prisma/client";+import { BountySubmissionProps } from "../types";+import { resolveBountyDetails } from "./utils";++interface BountyInfoInput {+ submissionRequirements?: Prisma.JsonValue | undefined | null;+ rewardAmount?: number | undefined | null;+}++interface SocialMetricsMilestone {+ fromThreshold: number; // metric count where this milestone starts (0 for the base milestone, otherwise the previous threshold)+ threshold: number; // metric count the partner must reach to earn this milestone+ rewardAmount: number; // payout in cents for this milestone (base reward for the first, bonusPerIncrement for the rest)+}++export interface SocialMetricsMilestoneRow extends SocialMetricsMilestone {+ reached: boolean;+}++export type SocialMetricsMilestoneStatus =+ | "approved"+ | "pending"+ | "inProgress"+ | "rejected";++export type SubmissionMilestoneInput = Pick<+ BountySubmissionProps,+ "socialMetricCount" | "approvedSocialMetricThreshold"+>;++// All payable milestones for a social metrics bounty (base reward + bonus increments), in ascending order+export function getSocialMetricsMilestones(+ bounty: BountyInfoInput | undefined | null,+): SocialMetricsMilestone[] {+ const bountyInfo = resolveBountyDetails(bounty);+ const socialMetrics = bountyInfo?.socialMetrics;+ const rewardAmount = bounty?.rewardAmount ?? 0;++ if (!socialMetrics?.metric || !socialMetrics.minCount || rewardAmount <= 0) {+ return [];+ }++ const { minCount, incrementalBonus } = socialMetrics;++ // Base tier+ const milestones: SocialMetricsMilestone[] = [+ {+ fromThreshold: 0,+ threshold: minCount,+ rewardAmount,+ },+ ];++ // Incremental bonus tiers+ if (incrementalBonus) {+ const { incrementCount, bonusPerIncrement, maxCount } = incrementalBonus;++ const hasValidIncrementalBonus =+ incrementCount != null &&+ bonusPerIncrement != null &&+ maxCount != null &&+ incrementCount > 0;++ if (hasValidIncrementalBonus) {+ for (+ let t = minCount + incrementCount;+ t <= maxCount;+ t += incrementCount+ ) {+ milestones.push({+ fromThreshold: t - incrementCount,+ threshold: t,+ rewardAmount: bonusPerIncrement,+ });+ }+ }+ }++ return milestones;+}++// Highest metric count that still earns a reward (last milestone threshold), or null for non-social bounties+export function getSocialMetricsEarningCap(+ bounty: BountyInfoInput | undefined | null,+) {+ const milestones = getSocialMetricsMilestones(bounty);++ return milestones.length > 0+ ? milestones[milestones.length - 1].threshold+ : null;+}++// Whether the submission's live metric count has reached the earning cap (no further syncing needed)+export function hasReachedSocialMetricsEarningCap({+ bounty,+ submission,+}: {+ bounty: BountyInfoInput | undefined | null;+ submission: Pick<BountySubmissionProps, "socialMetricCount">;+}) {+ const earningCap = getSocialMetricsEarningCap(bounty);++ if (earningCap == null || submission.socialMetricCount == null) {+ return false;+ }++ return submission.socialMetricCount >= earningCap;+}++// Reached milestones above approvedSocialMetricThreshold, i.e. the ones awaiting approval and payout+export function getPendingSocialMetricsMilestones({+ bounty,+ submission,+}: {+ bounty: BountyInfoInput | undefined | null;+ submission: SubmissionMilestoneInput;+}) {+ const socialMetricCount = submission.socialMetricCount ?? 0;+ const approvedThreshold = submission.approvedSocialMetricThreshold ?? 0;++ return getSocialMetricsMilestones(bounty).filter(+ ({ threshold }) =>+ threshold <= socialMetricCount && threshold > approvedThreshold,+ );+}++// Whether a milestone has been paid; legacy approved submissions (null threshold) count every reached milestone as paid+export function isSocialMetricsMilestoneApproved({+ milestone,+ submission,+}: {+ milestone: Pick<SocialMetricsMilestone, "threshold">;+ submission: SubmissionMilestoneInput & Pick<BountySubmissionProps, "status">;+}) {+ if (submission.approvedSocialMetricThreshold != null) {+ return milestone.threshold <= submission.approvedSocialMetricThreshold;+ }++ return (+ submission.status === "approved" &&+ milestone.threshold <= (submission.socialMetricCount ?? 0)+ );+}++// Commission description for a milestone payout, e.g. `Commission for growing from 1,000 to 2,000 views on "June launch" bounty.`+export function buildMilestonesCommissionDescription({+ bountyName,+ metric,+ milestone,+}: {+ bountyName: string | null;+ metric: string;+ milestone: Pick<SocialMetricsMilestone, "fromThreshold" | "threshold">;+}) {+ const from = nFormatter(milestone.fromThreshold, { full: true });+ const to = `${nFormatter(milestone.threshold, { full: true })} ${metric}`;+ const bountyLabel = bountyName ? `"${bountyName}" bounty` : "the bounty";++ if (milestone.fromThreshold === 0) {+ return `Commission for reaching ${to} on ${bountyLabel}.`;+ }++ return `Commission for growing from ${from} to ${to} on ${bountyLabel}.`;+}++// Merges consecutive milestones with the same reward into ranges (base milestone always stays on its own)+export function groupSocialMetricsMilestones(+ milestones: SocialMetricsMilestone[],+) {+ const groups: (SocialMetricsMilestone & {+ count: number;+ totalRewardAmount: number;+ })[] = [];++ for (const milestone of milestones) {+ const lastGroup = groups[groups.length - 1];++ if (+ lastGroup &&+ lastGroup.fromThreshold !== 0 &&+ lastGroup.rewardAmount === milestone.rewardAmount &&+ lastGroup.threshold === milestone.fromThreshold+ ) {+ lastGroup.threshold = milestone.threshold;+ lastGroup.count += 1;+ lastGroup.totalRewardAmount += milestone.rewardAmount;+ } else {+ groups.push({+ ...milestone,+ count: 1,+ totalRewardAmount: milestone.rewardAmount,+ });+ }+ }++ return groups;+}++// Display status for a milestone row in the rewards table (approved, pending, in progress, or rejected)+export function getSocialMetricsMilestoneStatus({+ milestone,+ submission,+}: {+ milestone: SocialMetricsMilestoneRow;+ submission: SubmissionMilestoneInput & Pick<BountySubmissionProps, "status">;+}): SocialMetricsMilestoneStatus {+ if (isSocialMetricsMilestoneApproved({ milestone, submission })) {+ return "approved";+ }++ if (!milestone.reached) {+ return "inProgress";+ }++ if (submission.status === "rejected") {+ return "rejected";+ }++ return "pending";+}++// Milestones to show in the rewards table: every reached milestone plus the next unreached one+export function getVisibleSocialMetricsMilestones({+ bounty,+ submission,+}: {+ bounty: BountyInfoInput | undefined | null;+ submission: Pick<BountySubmissionProps, "socialMetricCount"> &+ Partial<Pick<BountySubmissionProps, "approvedSocialMetricThreshold">>;+}): SocialMetricsMilestoneRow[] {+ const effectiveCount = Math.max(+ submission.socialMetricCount ?? 0,+ submission.approvedSocialMetricThreshold ?? 0,+ );++ const rows: SocialMetricsMilestoneRow[] = [];++ for (const milestone of getSocialMetricsMilestones(bounty)) {+ const reached = effectiveCount >= milestone.threshold;++ rows.push({ ...milestone, reached });++ // Stop after first unmet+ if (!reached) {+ break;+ }+ }++ return rows;+}++// Total earnings across all reached milestones, or null if the bounty has no social metrics or the count isn't synced yet+export function calculateSocialMetricsRewardAmount({+ bounty,+ submission,+}: {+ bounty: BountyInfoInput | undefined | null;+ submission: Pick<BountySubmissionProps, "socialMetricCount">;+}) {+ const milestones = getVisibleSocialMetricsMilestones({ bounty, submission });++ if (milestones.length === 0 || submission.socialMetricCount == null) {+ return null;+ }++ return milestones+ .filter(({ reached }) => reached)+ .reduce((sum, { rewardAmount }) => sum + rewardAmount, 0);+}diff --git a/apps/web/lib/zod/schemas/bounties.ts b/apps/web/lib/zod/schemas/bounties.tsindex 7012b21cfc..5e39a2682e 100644--- a/apps/web/lib/zod/schemas/bounties.ts+++ b/apps/web/lib/zod/schemas/bounties.ts@@ -307,6 +307,10 @@ export const BountySubmissionSchema = z.object({description:"The date and time the submission's social metrics were last synced",}),+ approvedSocialMetricThreshold: z.number().int().nullable().optional().meta({+ description:+ "The highest social metric milestone that has been approved and paid out for this submission",+ }),createdAt: z.date().meta({ description: "The date and time the submission was created" }),diff --git a/apps/web/lib/zod/schemas/partner-profile.ts b/apps/web/lib/zod/schemas/partner-profile.tsindex 5af81e29ca..8b6c8aa36e 100644--- a/apps/web/lib/zod/schemas/partner-profile.ts+++ b/apps/web/lib/zod/schemas/partner-profile.ts@@ -166,6 +166,8 @@ export const partnerBountySubmissionSchema = BountySubmissionSchema.extend({earnings: true,status: true,createdAt: true,+ }).extend({+ description: z.string().nullish(),}),).default([]),diff --git a/apps/web/prisma/schema/bounty.prisma b/apps/web/prisma/schema/bounty.prismaindex 0cf038e227..da2c84cd5a 100644--- a/apps/web/prisma/schema/bounty.prisma+++ b/apps/web/prisma/schema/bounty.prisma@@ -92,26 +92,27 @@ model BountyPartnerTag {}model BountySubmission {- id String @id- programId String- partnerId String- bountyId String- performanceCount BigInt?- socialMetricCount Int?- commissionId String? @unique // deprecated: kept only for the Commission.bountySubmissionId backfill, drop in a follow-up- userId String?- description String? @db.Text- status BountySubmissionStatus @default(draft)- rejectionReason BountySubmissionRejectionReason?- rejectionNote String? @db.Text- files Json?- urls Json?- periodNumber Int @default(1)- socialMetricsLastSyncedAt DateTime?- completedAt DateTime?- reviewedAt DateTime?- createdAt DateTime @default(now())- updatedAt DateTime @updatedAt+ id String @id+ programId String+ partnerId String+ bountyId String+ performanceCount BigInt?+ socialMetricCount Int?+ approvedSocialMetricThreshold Int? // highest social metrics milestone that has been paid out+ commissionId String? @unique // deprecated: kept only for the Commission.bountySubmissionId backfill, drop in a follow-up+ userId String?+ description String? @db.Text+ status BountySubmissionStatus @default(draft)+ rejectionReason BountySubmissionRejectionReason?+ rejectionNote String? @db.Text+ files Json?+ urls Json?+ periodNumber Int @default(1)+ socialMetricsLastSyncedAt DateTime?+ completedAt DateTime?+ reviewedAt DateTime?+ createdAt DateTime @default(now())+ updatedAt DateTime @updatedAtbounty Bounty @relation(fields: [bountyId], references: [id], onDelete: Cascade)partner Partner @relation(fields: [partnerId], references: [id], onDelete: Cascade)diff --git a/apps/web/scripts/dev/seed.ts b/apps/web/scripts/dev/seed.tsindex 9da1884d56..a716215df7 100644--- a/apps/web/scripts/dev/seed.ts+++ b/apps/web/scripts/dev/seed.ts@@ -515,6 +515,12 @@ const truncate = async () => {});const tables = [+ "Job",+ "jackson_index",+ "jackson_store",+ "jackson_ttl",+ "OAuthCode",+ "OAuthApp","InstalledIntegration","FolderWebhook","LinkWebhook",@@ -529,7 +535,10 @@ const truncate = async () => {"VerificationToken","EmailVerificationToken","NotificationPreference",+ "UserNotificationPreferences","Integration",+ "LinkReward",+ "SubmittedLead","Commission","PartnerComment","Payout",@@ -540,32 +549,57 @@ const truncate = async () => {"Discount","FolderAccessRequest","EmailDomain",+ "MessageAttachment",+ "NotificationEmail","Message","PartnerGroupDefaultLink","FolderUser","Folder","Link","Workflow",+ "BountyPartnerTag","BountyGroup","BountySubmission","Bounty",+ "CampaignPartnerTag","CampaignGroup","Campaign",+ "FraudAlert","FraudEvent","FraudEventGroup","FraudRule","ActivityLog",+ "ProgramPartnerTag","ProgramApplicationEvent","ProgramApplication","ProgramEnrollment","PartnerGroup",+ "PartnerNotificationPreferences","PartnerUser",+ "Postback",+ "PartnerIndustryInterest",+ "PartnerPreferredEarningStructure",+ "PartnerSalesChannel",+ "PartnerPlatform",+ "PartnerRewind","Partner","PartnerInvite","Domain",+ "Account",+ "Session",+ "Dashboard","ProjectUsers","User",+ "PartnerTag",+ "ProgramCategory",+ "ProgramSimilarity",+ "DiscoveredPartner","Program",+ "RegisteredDomain",+ "DefaultDomains",+ "ProjectInvite",+ "SentEmail",+ "YearInReview","Project",];diff --git a/apps/web/tests/bounties/social-metrics-milestones.test.ts b/apps/web/tests/bounties/social-metrics-milestones.test.tsnew file mode 100644index 0000000000..6c0670866c--- /dev/null+++ b/apps/web/tests/bounties/social-metrics-milestones.test.ts@@ -0,0 +1,291 @@+import {+ buildMilestonesCommissionDescription,+ getPendingSocialMetricsMilestones,+ getSocialMetricsEarningCap,+ getSocialMetricsMilestoneStatus,+ getSocialMetricsMilestones,+ getVisibleSocialMetricsMilestones,+ groupSocialMetricsMilestones,+ hasReachedSocialMetricsEarningCap,+ isSocialMetricsMilestoneApproved,+} from "@/lib/bounty/social-metrics-milestones";+import { describe, expect, it } from "vitest";++const baseBounty = {+ rewardAmount: 25_000,+ submissionRequirements: {+ socialMetrics: {+ platform: "youtube",+ metric: "views",+ minCount: 1000,+ },+ },+};++const bonusBounty = {+ rewardAmount: 25_000,+ submissionRequirements: {+ socialMetrics: {+ platform: "youtube",+ metric: "views",+ minCount: 1000,+ incrementalBonus: {+ incrementCount: 1000,+ bonusPerIncrement: 1000,+ maxCount: 6000,+ },+ },+ },+};++describe("groupSocialMetricsMilestones", () => {+ it("keeps the base milestone separate and merges repeated bonus milestones", () => {+ expect(+ groupSocialMetricsMilestones(getSocialMetricsMilestones(bonusBounty)),+ ).toEqual([+ {+ fromThreshold: 0,+ threshold: 1000,+ rewardAmount: 25_000,+ count: 1,+ totalRewardAmount: 25_000,+ },+ {+ fromThreshold: 1000,+ threshold: 6000,+ rewardAmount: 1000,+ count: 5,+ totalRewardAmount: 5000,+ },+ ]);+ });++ it("returns an empty list for no milestones", () => {+ expect(groupSocialMetricsMilestones([])).toEqual([]);+ });+});++describe("getSocialMetricsMilestones", () => {+ it("returns only the base milestone without a variable bonus", () => {+ expect(getSocialMetricsMilestones(baseBounty)).toEqual([+ { fromThreshold: 0, threshold: 1000, rewardAmount: 25_000 },+ ]);+ });++ it("returns every bonus milestone up to the max count", () => {+ const milestones = getSocialMetricsMilestones(bonusBounty);++ expect(milestones.map((m) => m.threshold)).toEqual([+ 1000, 2000, 3000, 4000, 5000, 6000,+ ]);+ expect(milestones[1]).toEqual({+ fromThreshold: 1000,+ threshold: 2000,+ rewardAmount: 1000,+ });+ });+});++describe("getSocialMetricsEarningCap", () => {+ it("is the min count without a variable bonus", () => {+ expect(getSocialMetricsEarningCap(baseBounty)).toBe(1000);+ });++ it("is the last bonus milestone with a variable bonus", () => {+ expect(getSocialMetricsEarningCap(bonusBounty)).toBe(6000);+ });++ it("is null for bounties without social metrics", () => {+ expect(+ getSocialMetricsEarningCap({+ rewardAmount: 100,+ submissionRequirements: null,+ }),+ ).toBeNull();+ });+});++describe("hasReachedSocialMetricsEarningCap", () => {+ it("is false below the cap and true at or above it", () => {+ expect(+ hasReachedSocialMetricsEarningCap({+ bounty: bonusBounty,+ submission: { socialMetricCount: 5999 },+ }),+ ).toBe(false);+ expect(+ hasReachedSocialMetricsEarningCap({+ bounty: bonusBounty,+ submission: { socialMetricCount: 6000 },+ }),+ ).toBe(true);+ });+});++describe("getPendingSocialMetricsMilestones", () => {+ it("returns nothing before the min count is reached", () => {+ expect(+ getPendingSocialMetricsMilestones({+ bounty: baseBounty,+ submission: {+ socialMetricCount: 999,+ approvedSocialMetricThreshold: null,+ },+ }),+ ).toEqual([]);+ });++ it("returns every reached milestone when nothing has been approved", () => {+ const pending = getPendingSocialMetricsMilestones({+ bounty: bonusBounty,+ submission: {+ socialMetricCount: 5500,+ approvedSocialMetricThreshold: null,+ },+ });++ expect(pending.map((m) => m.threshold)).toEqual([+ 1000, 2000, 3000, 4000, 5000,+ ]);+ });++ it("skips milestones at or under the approved threshold", () => {+ const pending = getPendingSocialMetricsMilestones({+ bounty: bonusBounty,+ submission: {+ socialMetricCount: 6200,+ approvedSocialMetricThreshold: 5000,+ },+ });++ expect(pending.map((m) => m.threshold)).toEqual([6000]);+ });+});++describe("isSocialMetricsMilestoneApproved", () => {+ it("uses the approved threshold when it is set", () => {+ const submission = {+ status: "submitted" as const,+ socialMetricCount: 5500,+ approvedSocialMetricThreshold: 3000,+ };++ expect(+ isSocialMetricsMilestoneApproved({+ milestone: { threshold: 3000 },+ submission,+ }),+ ).toBe(true);+ expect(+ isSocialMetricsMilestoneApproved({+ milestone: { threshold: 4000 },+ submission,+ }),+ ).toBe(false);+ });++ it("treats every reached tier as approved for legacy approved submissions", () => {+ const submission = {+ status: "approved" as const,+ socialMetricCount: 3500,+ approvedSocialMetricThreshold: null,+ };++ expect(+ isSocialMetricsMilestoneApproved({+ milestone: { threshold: 3000 },+ submission,+ }),+ ).toBe(true);+ expect(+ isSocialMetricsMilestoneApproved({+ milestone: { threshold: 4000 },+ submission,+ }),+ ).toBe(false);+ });+});++describe("getVisibleSocialMetricsMilestones", () => {+ it("keeps approved milestones reached even if the live count drops", () => {+ const milestones = getVisibleSocialMetricsMilestones({+ bounty: bonusBounty,+ submission: {+ socialMetricCount: 1500,+ approvedSocialMetricThreshold: 3000,+ },+ });++ expect(milestones.map((m) => [m.threshold, m.reached])).toEqual([+ [1000, true],+ [2000, true],+ [3000, true],+ [4000, false],+ ]);+ });+});++describe("getSocialMetricsMilestoneStatus", () => {+ const statusesFor = (submission: {+ status: "submitted" | "approved" | "rejected";+ socialMetricCount: number;+ approvedSocialMetricThreshold: number | null;+ }) =>+ getVisibleSocialMetricsMilestones({ bounty: bonusBounty, submission }).map(+ (milestone) => getSocialMetricsMilestoneStatus({ milestone, submission }),+ );++ it("splits approved, pending, and in-progress milestones", () => {+ expect(+ statusesFor({+ status: "submitted",+ socialMetricCount: 3500,+ approvedSocialMetricThreshold: 2000,+ }),+ ).toEqual(["approved", "approved", "pending", "inProgress"]);+ });++ it("marks unpaid reached milestones as rejected on rejected submissions", () => {+ expect(+ statusesFor({+ status: "rejected",+ socialMetricCount: 2500,+ approvedSocialMetricThreshold: 1000,+ }),+ ).toEqual(["approved", "rejected", "inProgress"]);+ });+});++describe("getSocialMetricsCommissionDescription", () => {+ it("describes the milestone range", () => {+ expect(+ buildMilestonesCommissionDescription({+ bountyName: "June launch",+ metric: "views",+ milestone: { fromThreshold: 1000, threshold: 2000 },+ }),+ ).toBe(+ 'Commission for growing from 1,000 to 2,000 views on "June launch" bounty.',+ );+ });++ it("describes a range starting at zero as reaching the target", () => {+ expect(+ buildMilestonesCommissionDescription({+ bountyName: "B2",+ metric: "views",+ milestone: { fromThreshold: 0, threshold: 17000 },+ }),+ ).toBe('Commission for reaching 17,000 views on "B2" bounty.');+ });++ it("falls back when the bounty has no name", () => {+ expect(+ buildMilestonesCommissionDescription({+ bountyName: null,+ metric: "likes",+ milestone: { fromThreshold: 0, threshold: 500 },+ }),+ ).toBe("Commission for reaching 500 likes on the bounty.");+ });+});diff --git a/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx b/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsxindex ac988fec09..fe0bbe6080 100644--- a/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx+++ b/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx@@ -1,14 +1,14 @@"use client";-import { calculateSocialMetricsRewardAmount } from "@/lib/bounty/rewards";-import { resolveBountyDetails } from "@/lib/bounty/utils";+import { groupSocialMetricsMilestones } from "@/lib/bounty/social-metrics-milestones";import { mutatePrefix } from "@/lib/swr/mutate";import { useApiMutation } from "@/lib/swr/use-api-mutation";import { BountyProps, BountySubmissionProps } from "@/lib/types";+import { useSocialMetricsMilestones } from "@/ui/partners/bounties/use-social-metrics-milestones";import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Modal } from "@dub/ui";-import { currencyFormatter } from "@dub/utils";-import { useMemo, useState } from "react";+import { currencyFormatter, nFormatter, pluralize } from "@dub/utils";+import { useState } from "react";import { toast } from "sonner";type ConfirmApproveBountySubmissionModalProps = {@@ -31,19 +31,22 @@ function ConfirmApproveBountySubmissionModal({const { makeRequest: approveBountySubmission, isSubmitting } =useApiMutation();- const commissionAmountCents = useMemo(() => {- const bountyInfo = bounty ? resolveBountyDetails(bounty) : null;- if (bountyInfo?.hasSocialMetrics && bounty) {- return calculateSocialMetricsRewardAmount({ bounty, submission });- }- if (bounty?.rewardAmount != null) {- return bounty.rewardAmount;- }- if (rewardAmount != null) {- return rewardAmount * 100;- }- return null;- }, [bounty, submission, rewardAmount]);+ const {+ metric,+ pendingMilestones,+ pendingRewardAmount,+ completesEarningCap,+ } = useSocialMetricsMilestones({ bounty, submission });++ let commissionAmountCents: number | null = null;++ if (metric) {+ commissionAmountCents = pendingRewardAmount;+ } else if (bounty?.rewardAmount != null) {+ commissionAmountCents = bounty.rewardAmount;+ } else if (rewardAmount != null) {+ commissionAmountCents = rewardAmount * 100;+ }const handleApprove = async () => {if (!submission?.id || !submission.bountyId) return;@@ -57,8 +60,14 @@ function ConfirmApproveBountySubmissionModal({},onSuccess: async () => {setShowModal(false);- toast.success("Bounty submission approved successfully!");- await mutatePrefix(`/api/bounties/${submission.bountyId}/submissions`);+ toast.success(+ metric && !completesEarningCap+ ? "Bounty milestones approved successfully!"+ : "Bounty submission approved successfully!",+ );+ await mutatePrefix(+ `/api/bounties/${submission.bountyId}/submissions`,+ );onApproveSuccess?.();},},@@ -69,7 +78,7 @@ function ConfirmApproveBountySubmissionModal({<Modal showModal={showModal} setShowModal={setShowModal}><div className="space-y-2 border-b border-neutral-200 px-4 py-4 sm:px-6"><h3 className="text-content-emphasis text-lg font-medium">- Approve bounty submission+ {metric ? "Approve bounty milestones" : "Approve bounty submission"}</h3><p className="text-content-subtle text-sm">This will create a{" "}@@ -81,8 +90,18 @@ function ConfirmApproveBountySubmissionModal({commission for{" "}<span className="font-semibold text-neutral-900">{submission.partner.name}- </span>- and notify them by email.+ </span>{" "}+ {metric ? (+ <>+ across {pendingMilestones.length}{" "}+ {pluralize("milestone", pendingMilestones.length)}.{" "}+ {completesEarningCap+ ? "The partner has reached the maximum reward, so the submission will be marked as approved and they'll be notified by email."+ : "The submission will stay pending so the partner can keep earning future milestones."}+ </>+ ) : (+ "and notify them by email."+ )}</p></div>@@ -119,6 +138,37 @@ function ConfirmApproveBountySubmissionModal({</div></div></div>++ {metric && pendingMilestones.length > 0 && (+ <div className="divide-y divide-neutral-200 rounded-lg border border-neutral-200">+ {groupSocialMetricsMilestones(pendingMilestones).map((group) => (+ <div+ key={group.threshold}+ className="flex items-center justify-between gap-4 px-4 py-2.5 text-sm"+ >+ <div className="flex min-w-0 flex-col">+ <span className="text-content-default">+ {nFormatter(group.fromThreshold, { full: true })} to{" "}+ {nFormatter(group.threshold, { full: true })} {metric}+ </span>+ {group.count > 1 && (+ <span className="text-content-subtle text-xs">+ {group.count} milestones ×{" "}+ {currencyFormatter(group.rewardAmount, {+ trailingZeroDisplay: "stripIfInteger",+ })}+ </span>+ )}+ </div>+ <span className="text-content-emphasis shrink-0 font-medium">+ {currencyFormatter(group.totalRewardAmount, {+ trailingZeroDisplay: "stripIfInteger",+ })}+ </span>+ </div>+ ))}+ </div>+ )}</div><div className="flex items-center justify-end border-t border-neutral-200 px-4 py-4 sm:px-6">diff --git a/apps/web/ui/partners/bounties/bounty-social-metrics-rewards-table.tsx b/apps/web/ui/partners/bounties/bounty-social-metrics-rewards-table.tsxindex e4cabe00ac..efbf4200c5 100644--- a/apps/web/ui/partners/bounties/bounty-social-metrics-rewards-table.tsx+++ b/apps/web/ui/partners/bounties/bounty-social-metrics-rewards-table.tsx@@ -1,9 +1,12 @@"use client";import {- getSocialMetricsRewardTiers,- SocialMetricsRewardTier,-} from "@/lib/bounty/rewards";+ getSocialMetricsMilestoneStatus,+ getVisibleSocialMetricsMilestones,+ SocialMetricsMilestoneRow,+ SocialMetricsMilestoneStatus,+ SubmissionMilestoneInput,+} from "@/lib/bounty/social-metrics-milestones";import { resolveBountyDetails } from "@/lib/bounty/utils";import { BountySubmissionProps, PartnerBountyProps } from "@/lib/types";import { StatusBadge, Table, useTable } from "@dub/ui";@@ -11,7 +14,7 @@ import { capitalize, currencyFormatter } from "@dub/utils";import { ColumnDef } from "@tanstack/react-table";import { useMemo } from "react";-const displayStatusMap = {+const milestoneStatusBadges = {approved: {label: "Approved",variant: "success",@@ -24,70 +27,36 @@ const displayStatusMap = {label: "In progress",variant: "pending",},- draft: {- label: "Draft",- variant: "pending",- },rejected: {label: "Rejected",variant: "error",},-};--interface SubmissionForRewards {- socialMetricCount: number | null;- commissions: { earnings: number }[];- status: BountySubmissionProps["status"];-}--function getDisplayStatus(- tier: SocialMetricsRewardTier,- submission: SubmissionForRewards,-) {- if (tier.status === "unmet") {- return "inProgress";- }-- if (submission.status === "approved" && submission.commissions.length > 0) {- return "approved";- }-- if (submission.status === "draft") {- return "draft";- }-- if (submission.status === "rejected") {- return "rejected";- }-- return "pending";-}+} as const satisfies Record<+ SocialMetricsMilestoneStatus,+ { label: string; variant: string }+>;export function BountySocialMetricsRewardsTable({bounty,submission,titleText = "Rewards",}: {- bounty: Pick<- PartnerBountyProps,- "id" | "submissionRequirements" | "rewardAmount"- >;- submission: SubmissionForRewards;+ bounty: Pick<PartnerBountyProps, "submissionRequirements" | "rewardAmount">;+ submission: SubmissionMilestoneInput & Pick<BountySubmissionProps, "status">;titleText?: string;}) {- const tiers = getSocialMetricsRewardTiers({+ const milestones = getVisibleSocialMetricsMilestones({bounty,submission,});- const bountyInfo = resolveBountyDetails(bounty);- const metricLabel = bountyInfo?.socialMetrics?.metric ?? "Count";+ const metric = resolveBountyDetails(bounty)?.socialMetrics?.metric ?? "";- const columns = useMemo<ColumnDef<SocialMetricsRewardTier>[]>(+ const columns = useMemo<ColumnDef<SocialMetricsMilestoneRow>[]>(() => [{id: "threshold",- header: capitalize(metricLabel)!,+ header: capitalize(metric)!,minSize: 100,size: 120,cell: ({ row: { original } }) => (@@ -112,30 +81,35 @@ export function BountySocialMetricsRewardsTable({minSize: 120,size: 140,cell: ({ row: { original } }) => {- const status =- displayStatusMap[getDisplayStatus(original, submission)];+ const badge =+ milestoneStatusBadges[+ getSocialMetricsMilestoneStatus({+ milestone: original,+ submission,+ })+ ];return (- <StatusBadge variant={status.variant}>{status.label}</StatusBadge>+ <StatusBadge variant={badge.variant}>{badge.label}</StatusBadge>);},},],- [metricLabel, submission],+ [metric, submission],);const table = useTable({- data: tiers,+ data: milestones,columns,getRowId: (row) => String(row.threshold),- resourceName: () => "reward tier",- scrollWrapperClassName: "min-h-0",- thClassName: "border-l-0",+ resourceName: () => "milestone",+ scrollWrapperClassName: "min-h-0 max-h-[300px] overflow-y-auto",+ thClassName: "sticky top-0 z-10 border-l-0 bg-white",tdClassName: "border-l-0",className: "[&_tbody_tr:last-child_td]:border-b-0",});- if (tiers.length === 0) {+ if (milestones.length === 0) {return null;}diff --git a/apps/web/ui/partners/bounties/bounty-submission-details-sheet.tsx b/apps/web/ui/partners/bounties/bounty-submission-details-sheet.tsxindex a46951cd09..f8029a2bde 100644--- a/apps/web/ui/partners/bounties/bounty-submission-details-sheet.tsx+++ b/apps/web/ui/partners/bounties/bounty-submission-details-sheet.tsx@@ -4,6 +4,7 @@ import { BountySubmissionStatusBadges } from "@/lib/bounty/bounty-submission-staimport { REJECT_BOUNTY_SUBMISSION_REASONS } from "@/lib/bounty/constants";import { getPeriodLabel } from "@/lib/bounty/periods";import { resolveBountyDetails } from "@/lib/bounty/utils";+import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";import { PartnerBountyProps, PartnerBountySubmission } from "@/lib/types";import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";import { X } from "@/ui/shared/icons";@@ -14,6 +15,7 @@ import {StatusBadge,Table,TimestampTooltip,+ Tooltip,useKeyboardShortcut,useTable,} from "@dub/ui";@@ -212,13 +214,13 @@ function SubmissionDetailsView({<SubmissionRewardTable submission={submission} />- {bountyInfo?.hasSocialMetrics &&- ["draft", "submitted"].includes(submission.status) && (- <BountySocialMetricsRewardsTable- bounty={bounty}- submission={submission}- />- )}+ {bountyInfo?.hasSocialMetrics && (+ <BountySocialMetricsRewardsTable+ bounty={bounty}+ submission={submission}+ titleText="Milestones"+ />+ )}<SocialContentPreview bounty={bounty} submission={submission} />@@ -314,7 +316,25 @@ export function SubmissionRewardTable({{id: "amount",header: "Amount",- cell: ({ row }) => currencyFormatter(row.original.earnings),+ cell: ({ row }) => {+ const { earnings, description } = row.original;++ if (!description) {+ return currencyFormatter(earnings);+ }++ return (+ <Tooltip+ content={formatCommissionDescriptionTooltip(description, {+ variant: "partner",+ })}+ >+ <span className="cursor-help truncate underline decoration-dotted underline-offset-2">+ {currencyFormatter(earnings)}+ </span>+ </Tooltip>+ );+ },},{id: "status",diff --git a/apps/web/ui/partners/bounties/use-social-metrics-milestones.ts b/apps/web/ui/partners/bounties/use-social-metrics-milestones.tsnew file mode 100644index 0000000000..a4d840b122--- /dev/null+++ b/apps/web/ui/partners/bounties/use-social-metrics-milestones.ts@@ -0,0 +1,54 @@+import {+ getPendingSocialMetricsMilestones,+ getSocialMetricsEarningCap,+ hasReachedSocialMetricsEarningCap,+ SubmissionMilestoneInput,+} from "@/lib/bounty/social-metrics-milestones";+import { resolveBountyDetails } from "@/lib/bounty/utils";+import { BountyProps } from "@/lib/types";++export function useSocialMetricsMilestones({+ bounty,+ submission,+}: {+ bounty:+ | Pick<BountyProps, "submissionRequirements" | "rewardAmount">+ | null+ | undefined;+ submission: SubmissionMilestoneInput | null | undefined;+}) {+ const metric = resolveBountyDetails(bounty)?.socialMetrics?.metric ?? null;+ const isSocialMetricsBounty = metric != null;++ const pendingMilestones =+ isSocialMetricsBounty && submission+ ? getPendingSocialMetricsMilestones({ bounty, submission })+ : [];++ const pendingRewardAmount = pendingMilestones.reduce(+ (total, { rewardAmount }) => total + rewardAmount,+ 0,+ );++ const earningCap = getSocialMetricsEarningCap(bounty);+ const lastPendingMilestone = pendingMilestones[pendingMilestones.length - 1];++ const completesEarningCap =+ earningCap != null &&+ lastPendingMilestone != null &&+ lastPendingMilestone.threshold >= earningCap;++ const hasReachedEarningCap =+ isSocialMetricsBounty &&+ submission != null &&+ hasReachedSocialMetricsEarningCap({ bounty, submission });++ return {+ metric,+ isSocialMetricsBounty,+ pendingMilestones,+ pendingRewardAmount,+ completesEarningCap,+ hasReachedEarningCap,+ };+}