The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Reuse hold eligibility filter and fix hold badge tooltip
Kiran Kf62a236fecaf
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsxindex 895ccc0c56..df7aaa6ebc 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx@@ -3,7 +3,6 @@ import useCustomers from "@/lib/swr/use-customers";import useGroups from "@/lib/swr/use-groups";import { usePartnerTags } from "@/lib/swr/use-partner-tags";import usePartners from "@/lib/swr/use-partners";-import useWorkspace from "@/lib/swr/use-workspace";import { CustomerProps, EnrolledPartnerProps } from "@/lib/types";import { CustomerAvatar } from "@/ui/customers/customer-avatar";import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";@@ -24,7 +23,6 @@ import { useCallback, useMemo, useState } from "react";import { useDebounce } from "use-debounce";export function useCommissionFilters() {- const { slug } = useWorkspace();const { commissionsCount } = useCommissionsCount({ exclude: ["status"] });const { searchParamsObj, queryParams } = useRouterStuff();diff --git a/apps/web/lib/api/fraud/hold-pending-commissions.ts b/apps/web/lib/api/fraud/hold-pending-commissions.tsindex 12dc01691f..8fab2712de 100644--- a/apps/web/lib/api/fraud/hold-pending-commissions.ts+++ b/apps/web/lib/api/fraud/hold-pending-commissions.ts@@ -1,7 +1,7 @@import { trackCommissionStatusUpdate } from "@/lib/api/commissions/track-commission-update-activity-log";import { prisma } from "@/lib/prisma";import { chunk, groupBy } from "@dub/utils";-import { CommissionStatus, ProgramEnrollment } from "@prisma/client";+import { CommissionStatus, Prisma, ProgramEnrollment } from "@prisma/client";import { syncTotalCommissions } from "../partners/sync-total-commissions";// Bulk-hold pending commissions for partner-program pairs flagged by partner-level fraud@@ -22,6 +22,20 @@ export async function holdPendingCommissions(const chunks = chunk(uniquePairs, 50);+ const holdEligibleWhere: Prisma.CommissionWhereInput = {+ status: CommissionStatus.pending,+ earnings: {+ gt: 0,+ },+ program: {+ workspace: {+ plan: {+ in: ["enterprise", "advanced"],+ },+ },+ },+ };+for (const chunk of chunks) {const pendingCommissions = await prisma.commission.findMany({where: {@@ -29,19 +43,7 @@ export async function holdPendingCommissions(programId,partnerId,})),- status: CommissionStatus.pending,- // Clawbacks (earnings <= 0) are never held — matches create-partner-commission.- earnings: {- gt: 0,- },- // Fraud holds are an advanced/enterprise capability (canManageFraudEvents).- program: {- workspace: {- plan: {- in: ["enterprise", "advanced"],- },- },- },+ ...holdEligibleWhere,},select: {id: true,@@ -69,7 +71,7 @@ export async function holdPendingCommissions(id: {in: pendingCommissions.map((c) => c.id),},- status: CommissionStatus.pending,+ ...holdEligibleWhere,},data: {status: CommissionStatus.hold,@@ -80,7 +82,7 @@ export async function holdPendingCommissions(continue;}- // updateMany re-checks status: pending, so a commission can change between findMany+ // updateMany re-checks eligibility, so a commission can change between findMany// and updateMany (e.g. payout processing). Only log/sync rows we actually held.let heldCommissions = pendingCommissions;diff --git a/apps/web/ui/partners/commission-status-badges.tsx b/apps/web/ui/partners/commission-status-badges.tsxindex d10e94947a..054ae9b962 100644--- a/apps/web/ui/partners/commission-status-badges.tsx+++ b/apps/web/ui/partners/commission-status-badges.tsx@@ -145,7 +145,7 @@ export const CommissionStatusBadges = {return title;}- return `This partner's commissions are on hold due to [unresolved risk events](${`/${data.workspace?.slug}/program/risks${data.partner?.id ? `?partnerId=${data.partner.id}` : ""}`}). They cannot be paid out until resolved.`;+ return `This commission is on hold due to [unresolved risk events](${`/${data.workspace?.slug}/program/risks${data.partner?.id ? `?partnerId=${data.partner.id}` : ""}`}). They cannot be paid out until resolved.`;},},};