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.

Align payout eligibility with server and fix commission hold/release edge cases

Kiran Kd77909c9e8bb
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx
index 8b4fddf9a5..9bb05b35b8 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx
@@ -51,13 +51,9 @@ function isPayoutEligibleForBatchConfirm(
{
minPayoutAmount,
programPayoutMode,
- canManageFraudEvents,
- partnersWithPendingFraud,
}: {
minPayoutAmount: number;
programPayoutMode: ProgramPayoutMode;
- canManageFraudEvents: boolean;
- partnersWithPendingFraud: Set<string>;
},
) {
if (payout.status !== PayoutStatus.pending) {
@@ -82,10 +78,6 @@ function isPayoutEligibleForBatchConfirm(
return false;
}
- if (canManageFraudEvents && partnersWithPendingFraud.has(payout.partner.id)) {
- return false;
- }
-
if (
payout.partner.defaultPayoutMethod === PartnerPayoutMethod.tremendous &&
payout.amount > TREMENDOUS_MAX_PAYOUT_AMOUNT_CENTS
@@ -274,15 +266,7 @@ export function PayoutTable() {
{
id: "amount",
header: "Amount",
- cell: ({ row }) => (
- <AmountRowItem
- payout={row.original}
- hasPendingFraudEvents={
- canManageFraudEvents &&
- fraudGroupCountMap.has(row.original.partner.id)
- }
- />
- ),
+ cell: ({ row }) => <AmountRowItem payout={row.original} />,
},
{
id: "menu",
@@ -337,8 +321,6 @@ export function PayoutTable() {
const eligibilityCtx = {
minPayoutAmount,
programPayoutMode: program?.payoutMode ?? "internal",
- canManageFraudEvents,
- partnersWithPendingFraud: fraudGroupCountMap,
};
const hasIneligibleAmongSelection =
@@ -383,15 +365,6 @@ export function PayoutTable() {
Exceeds the {maxGiftCardPayoutAmount} cap for gift card
payouts
</li>
- <li>
- On hold due to{" "}
- <Link
- href={`/${workspaceSlug}/program/payouts?status=hold`}
- className="cursor-alias underline decoration-dotted underline-offset-2"
- >
- unresolved risk events
- </Link>
- </li>
</ul>
</div>
) : undefined
@@ -495,10 +468,8 @@ function PayoutFilters() {
function AmountRowItem({
payout,
- hasPendingFraudEvents,
}: {
payout: Pick<PayoutResponse, "amount" | "status" | "mode" | "partner">;
- hasPendingFraudEvents: boolean;
}) {
const { slug } = useParams();
const { program } = useProgram();
@@ -569,18 +540,6 @@ function AmountRowItem({
);
}
- if (hasPendingFraudEvents) {
- return (
- <Tooltip
- content={`This partner's payouts are on hold due to [unresolved risk events](${`/${slug}/program/risks?partnerId=${payout.partner.id}`}). They cannot be paid out until resolved.`}
- >
- <span className="cursor-help truncate text-neutral-400 underline decoration-dotted underline-offset-2">
- {display}
- </span>
- </Tooltip>
- );
- }
-
if (
payout.partner.defaultPayoutMethod === PartnerPayoutMethod.tremendous &&
payout.amount > TREMENDOUS_MAX_PAYOUT_AMOUNT_CENTS
diff --git a/apps/web/lib/api/fraud/hold-pending-commissions.ts b/apps/web/lib/api/fraud/hold-pending-commissions.ts
index 58623f8224..409b59957f 100644
--- a/apps/web/lib/api/fraud/hold-pending-commissions.ts
+++ b/apps/web/lib/api/fraud/hold-pending-commissions.ts
@@ -27,6 +27,9 @@ export async function holdPendingCommissions(
partnerId,
})),
status: CommissionStatus.pending,
+ earnings: {
+ gt: 0,
+ },
// Only hold commissions for workspaces whose plan can manage fraud events,
// Other plans have no way to review or resolve fraud groups, so their commissions should never be frozen.
program: {
diff --git a/apps/web/lib/api/fraud/release-hold-commissions.ts b/apps/web/lib/api/fraud/release-hold-commissions.ts
index 69ae2341c6..8664d03b36 100644
--- a/apps/web/lib/api/fraud/release-hold-commissions.ts
+++ b/apps/web/lib/api/fraud/release-hold-commissions.ts
@@ -90,9 +90,16 @@ export async function releaseHoldCommissions(riskGroupIds: string[]) {
};
if (blockedCustomerIds.size > 0) {
- releaseWhere.customerId = {
- notIn: [...blockedCustomerIds],
- };
+ releaseWhere.OR = [
+ {
+ customerId: null,
+ },
+ {
+ customerId: {
+ notIn: [...blockedCustomerIds],
+ },
+ },
+ ];
}
const commissionsToRelease = await prisma.commission.findMany({