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.

Remove fraud hold blocking from payout detail and clean up export filters

Kiran K0006d35d0aaa
diff --git a/apps/web/app/(ee)/api/cron/export/payouts/fetch-payouts-batch.ts b/apps/web/app/(ee)/api/cron/export/payouts/fetch-payouts-batch.ts
index 1eb622a176..79488556d5 100644
--- a/apps/web/app/(ee)/api/cron/export/payouts/fetch-payouts-batch.ts
+++ b/apps/web/app/(ee)/api/cron/export/payouts/fetch-payouts-batch.ts
@@ -1,16 +1,23 @@
import { getPayouts } from "@/lib/api/payouts/get-payouts";
-import { PayoutsQueryFilters } from "@/lib/types";
+import { payoutsQuerySchema } from "@/lib/zod/schemas/payouts";
+import * as z from "zod/v4";
+
+type PayoutFilters = Omit<
+ z.infer<typeof payoutsQuerySchema>,
+ "page" | "pageSize"
+>;
export async function* fetchPayoutsBatch({
workspaceId,
programId,
filters,
+ pageSize = 1000,
}: {
workspaceId: string;
programId: string;
- filters: PayoutsQueryFilters;
+ filters: PayoutFilters;
+ pageSize?: number;
}) {
- const pageSize = filters.pageSize ?? 1000;
let page = 1;
let hasMore = true;
diff --git a/apps/web/app/(ee)/api/cron/export/payouts/route.ts b/apps/web/app/(ee)/api/cron/export/payouts/route.ts
index b15e2ce98f..f1bdc0bf7a 100644
--- a/apps/web/app/(ee)/api/cron/export/payouts/route.ts
+++ b/apps/web/app/(ee)/api/cron/export/payouts/route.ts
@@ -26,6 +26,7 @@ export const POST = withCron(async ({ rawBody }) => {
payoutsExportCronInputSchema.parse(payload);
const filters = payoutsQuerySchema.parse(payload);
+ const { page: _page, pageSize: _pageSize, ...exportFilters } = filters;
const user = await prisma.user.findUnique({
where: {
@@ -62,7 +63,7 @@ export const POST = withCron(async ({ rawBody }) => {
for await (const { payouts } of fetchPayoutsBatch({
workspaceId,
programId,
- filters,
+ filters: exportFilters,
})) {
const formatted = formatPayoutsForExport(payouts, columns);
const remaining = MAX_PAYOUTS_EXPORT_LIMIT - allRows.length;
diff --git a/apps/web/app/(ee)/api/cron/payouts/process/route.ts b/apps/web/app/(ee)/api/cron/payouts/process/route.ts
index f27b86fcdf..ba3385a311 100644
--- a/apps/web/app/(ee)/api/cron/payouts/process/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/process/route.ts
@@ -82,7 +82,6 @@ export async function POST(req: Request) {
if (cutoffPeriod) {
await splitPayouts({
program,
- workspace,
cutoffPeriod,
selectedPayoutIds,
excludedPayoutIds,
diff --git a/apps/web/app/(ee)/api/cron/payouts/process/split-payouts.ts b/apps/web/app/(ee)/api/cron/payouts/process/split-payouts.ts
index 0e249568ce..55f741848b 100644
--- a/apps/web/app/(ee)/api/cron/payouts/process/split-payouts.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/process/split-payouts.ts
@@ -6,18 +6,16 @@ import {
CUTOFF_PERIOD_TYPES,
} from "@/lib/partners/cutoff-period";
import { prisma } from "@/lib/prisma";
-import { Program, Project } from "@prisma/client";
+import { Program } from "@prisma/client";
import { endOfMonth } from "date-fns";
export async function splitPayouts({
program,
- workspace,
cutoffPeriod,
selectedPayoutIds,
excludedPayoutIds,
}: {
program: Pick<Program, "id" | "name" | "minPayoutAmount" | "payoutMode">;
- workspace: Pick<Project, "plan">;
cutoffPeriod: CUTOFF_PERIOD_TYPES;
selectedPayoutIds?: string[];
excludedPayoutIds?: string[];
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx
index bcd6285876..635e833b69 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx
@@ -1,15 +1,9 @@
"use client";
import { clientAccessCheck } from "@/lib/client-access-check";
-import { getPlanCapabilities } from "@/lib/plan-capabilities";
-import { useFraudGroupCount } from "@/lib/swr/use-fraud-groups-count";
import { usePayout } from "@/lib/swr/use-payout";
import useWorkspace from "@/lib/swr/use-workspace";
-import {
- CommissionResponse,
- FraudGroupCountByPartner,
- PayoutResponse,
-} from "@/lib/types";
+import { CommissionResponse, PayoutResponse } from "@/lib/types";
import { CustomerAvatar } from "@/ui/customers/customer-avatar";
import { PageContent } from "@/ui/layout/page-content";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
@@ -476,27 +470,10 @@ function PayoutDetailsskeleton() {
}
function PayoutConfirmButton() {
- const { slug, role, plan } = useWorkspace();
+ const { slug, role } = useWorkspace();
const { payout } = usePayout();
const router = useRouter();
- const { canManageFraudEvents } = getPlanCapabilities(plan);
-
- const { fraudGroupCount } = useFraudGroupCount<FraudGroupCountByPartner[]>({
- ignoreParams: true,
- enabled: !!payout?.partner?.id,
- query: {
- groupBy: "partnerId",
- status: "pending",
- ...(payout?.partner?.id && { partnerId: payout.partner.id }),
- },
- });
-
- const hasHold =
- payout?.status === "pending" &&
- canManageFraudEvents &&
- (fraudGroupCount?.length ?? 0) > 0;
-
const { error: _permissionsError } = clientAccessCheck({
action: "payouts.write",
role,
@@ -509,10 +486,7 @@ function PayoutConfirmButton() {
useKeyboardShortcut("c", () => router.push(url), {
enabled:
- !hasHold &&
- !!payout?.id &&
- !!payout.partner.payoutsEnabledAt &&
- !permissionsError,
+ !!payout?.id && !!payout.partner.payoutsEnabledAt && !permissionsError,
});
if (payout?.status !== "pending") {
@@ -527,11 +501,9 @@ function PayoutConfirmButton() {
className="h-8 px-3 sm:h-9"
shortcut="C"
disabledTooltip={
- hasHold
- ? `This partner's payouts are on hold due to [unresolved risk events](${APP_DOMAIN}/${slug}/program/risks?partnerId=${payout.partner.id}). They cannot be paid out until resolved.`
- : !payout.partner.payoutsEnabledAt
- ? "This partner has not [connected a bank account](https://dub.co/help/article/receiving-payouts) to receive payouts yet, which means they won't be able to receive payouts from your program."
- : permissionsError || undefined
+ !payout.partner.payoutsEnabledAt
+ ? "This partner has not [connected a bank account](https://dub.co/help/article/receiving-payouts) to receive payouts yet, which means they won't be able to receive payouts from your program."
+ : permissionsError || undefined
}
/>
</Link>