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 `partnerFraudReport` fraud flag (#3662)

Steven Teyb2f5b158f117
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
index d0cfaa7096..b4c28819a5 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
@@ -9,6 +9,7 @@ import useWorkspace from "@/lib/swr/use-workspace";
import { EnrolledPartnerProps, PartnerPlatformProps } from "@/lib/types";
import { useBulkApprovePartnersModal } from "@/ui/modals/bulk-approve-partners-modal";
import { useBulkRejectPartnersModal } from "@/ui/modals/bulk-reject-partners-modal";
+import { useApprovePartnerApplicationModal } from "@/ui/modals/approve-partner-application-modal";
import { useRejectPartnerApplicationModal } from "@/ui/modals/reject-partner-application-modal";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
import { PartnerApplicationSheet } from "@/ui/partners/partner-application-sheet";
@@ -30,7 +31,7 @@ import {
useRouterStuff,
useTable,
} from "@dub/ui";
-import { Dots, Users, UserXmark } from "@dub/ui/icons";
+import { Dots, UserCheck, Users, UserXmark } from "@dub/ui/icons";
import { COUNTRIES, fetcher, formatDate } from "@dub/utils";
import { Row } from "@tanstack/react-table";
import { Command } from "cmdk";
@@ -512,6 +513,17 @@ function RowMenuButton({
}) {
const [isOpen, setIsOpen] = useState(false);
+ const {
+ ApprovePartnerApplicationModal,
+ setShowApprovePartnerApplicationModal,
+ } = useApprovePartnerApplicationModal({
+ partner: row.original,
+ groupId: row.original.groupId,
+ onConfirm: async () => {
+ await mutatePrefix(["/api/partners", "/api/partners/count"]);
+ },
+ });
+
const {
RejectPartnerApplicationModal,
setShowRejectPartnerApplicationModal,
@@ -524,6 +536,7 @@ function RowMenuButton({
return (
<>
+ {ApprovePartnerApplicationModal}
{RejectPartnerApplicationModal}
<Popover
openPopover={isOpen}
@@ -531,6 +544,16 @@ function RowMenuButton({
content={
<Command tabIndex={0} loop className="focus:outline-none">
<Command.List className="flex w-screen flex-col gap-1 p-1.5 text-sm focus-visible:outline-none sm:w-auto sm:min-w-[200px]">
+ <MenuItem
+ as={Command.Item}
+ icon={UserCheck}
+ onSelect={() => {
+ setIsOpen(false);
+ setShowApprovePartnerApplicationModal(true);
+ }}
+ >
+ Approve application
+ </MenuItem>
<MenuItem
as={Command.Item}
icon={UserXmark}
diff --git a/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts b/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts
index b36c5fe4d4..ec744ce0a3 100644
--- a/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts
+++ b/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts
@@ -1,7 +1,6 @@
"use server";
import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
-import { reportFraudToNetwork } from "@/lib/api/fraud/report-fraud-to-network";
import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { bulkRejectPartnersSchema } from "@/lib/zod/schemas/partners";
@@ -16,7 +15,7 @@ export const bulkRejectPartnerApplicationsAction = authActionClient
.inputSchema(bulkRejectPartnersSchema)
.action(async ({ parsedInput, ctx }) => {
const { workspace, user } = ctx;
- const { partnerIds, reportFraud } = parsedInput;
+ const { partnerIds } = parsedInput;
throwIfNoPermission({
role: workspace.role,
@@ -71,10 +70,6 @@ export const bulkRejectPartnerApplicationsAction = authActionClient
"Resolved automatically because the partner application was rejected.",
});
- const rejectedPartnerIds = [
- ...new Set(programEnrollments.map((pe) => pe.partner.id)),
- ];
-
waitUntil(
(async () => {
await Promise.allSettled([
@@ -94,13 +89,6 @@ export const bulkRejectPartnerApplicationsAction = authActionClient
],
})),
),
-
- reportFraud && rejectedPartnerIds.length > 0
- ? reportFraudToNetwork({
- programId,
- partnerIds: rejectedPartnerIds,
- })
- : Promise.resolve(),
]);
})(),
);
diff --git a/apps/web/lib/actions/partners/reject-partner-application.ts b/apps/web/lib/actions/partners/reject-partner-application.ts
index 3a4ca5468c..480071f782 100644
--- a/apps/web/lib/actions/partners/reject-partner-application.ts
+++ b/apps/web/lib/actions/partners/reject-partner-application.ts
@@ -1,7 +1,6 @@
"use server";
import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
-import { reportFraudToNetwork } from "@/lib/api/fraud/report-fraud-to-network";
import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { rejectPartnerSchema } from "@/lib/zod/schemas/partners";
@@ -16,7 +15,7 @@ export const rejectPartnerApplicationAction = authActionClient
.inputSchema(rejectPartnerSchema)
.action(async ({ parsedInput, ctx }) => {
const { workspace, user } = ctx;
- const { partnerId, reportFraud } = parsedInput;
+ const { partnerId } = parsedInput;
throwIfNoPermission({
role: workspace.role,
@@ -84,13 +83,6 @@ export const rejectPartnerApplicationAction = authActionClient
resolutionReason:
"Resolved automatically because the partner application was rejected.",
}),
-
- reportFraud
- ? reportFraudToNetwork({
- programId,
- partnerIds: [partnerId],
- })
- : Promise.resolve(),
]);
})(),
);
diff --git a/apps/web/lib/api/fraud/constants.ts b/apps/web/lib/api/fraud/constants.ts
index a10433b5ed..bd8239ce17 100644
--- a/apps/web/lib/api/fraud/constants.ts
+++ b/apps/web/lib/api/fraud/constants.ts
@@ -38,15 +38,6 @@ export const FRAUD_RULES: FraudRuleInfo[] = [
},
// Partner rules
- {
- type: "partnerFraudReport",
- name: "Fraud report",
- description:
- "This partner was rejected from another program due to suspected fraud during their application.",
- scope: "partner",
- severity: "high",
- configurable: true,
- },
{
type: "partnerCrossProgramBan",
name: "Cross-program ban",
diff --git a/apps/web/lib/api/fraud/execute-fraud-rule.ts b/apps/web/lib/api/fraud/execute-fraud-rule.ts
index 01644cd5e2..421adda3a8 100644
--- a/apps/web/lib/api/fraud/execute-fraud-rule.ts
+++ b/apps/web/lib/api/fraud/execute-fraud-rule.ts
@@ -23,7 +23,6 @@ const FRAUD_RULES_REGISTRY: Record<
referralSourceBanned: checkReferralSourceBanned,
paidTrafficDetected: checkPaidTrafficDetected,
partnerCrossProgramBan: defineFraudRuleStub("partnerCrossProgramBan"),
- partnerFraudReport: defineFraudRuleStub("partnerFraudReport"),
partnerDuplicatePayoutMethod: defineFraudRuleStub(
"partnerDuplicatePayoutMethod",
),
diff --git a/apps/web/lib/api/fraud/report-fraud-to-network.ts b/apps/web/lib/api/fraud/report-fraud-to-network.ts
deleted file mode 100644
index 72a07d0d2f..0000000000
--- a/apps/web/lib/api/fraud/report-fraud-to-network.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { createFraudEvents } from "@/lib/api/fraud/create-fraud-events";
-import { isFraudRuleEnabled } from "@/lib/api/fraud/get-merged-fraud-rules";
-import { INACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
-import { prisma } from "@dub/prisma";
-import { FraudRuleType } from "@dub/prisma/client";
-
-// Creates fraud report events in other programs where the given partners are enrolled.
-// Used when a program rejects (and reports) a partner so that other programs can be
-// alerted about suspected fraud. Only programs with the partnerFraudReport rule
-// enabled receive events.
-export async function reportFraudToNetwork({
- programId,
- partnerIds,
-}: {
- programId: string; // The program that reported the fraud,
- partnerIds: string[];
-}) {
- if (partnerIds.length === 0) {
- return;
- }
-
- let affectedProgramEnrollments = await prisma.programEnrollment.findMany({
- where: {
- partnerId: {
- in: partnerIds,
- },
- programId: {
- not: programId,
- },
- status: {
- notIn: INACTIVE_ENROLLMENT_STATUSES,
- },
- },
- select: {
- programId: true,
- partnerId: true,
- program: {
- select: {
- fraudRules: true,
- },
- },
- },
- });
-
- if (affectedProgramEnrollments.length === 0) {
- return;
- }
-
- // Filter out programs where the partnerFraudReport rule is disabled
- affectedProgramEnrollments = affectedProgramEnrollments.filter((enrollment) =>
- isFraudRuleEnabled({
- fraudRules: enrollment.program.fraudRules,
- ruleType: FraudRuleType.partnerFraudReport,
- }),
- );
-
- if (affectedProgramEnrollments.length === 0) {
- return;
- }
-
- await createFraudEvents(
- affectedProgramEnrollments.map((affectedEnrollment) => ({
- programId: affectedEnrollment.programId,
- partnerId: affectedEnrollment.partnerId,
- type: FraudRuleType.partnerFraudReport,
- sourceProgramId: programId,
- })),
- );
-}
diff --git a/apps/web/lib/api/fraud/utils.ts b/apps/web/lib/api/fraud/utils.ts
index 4369f9ebaf..05f00bf715 100644
--- a/apps/web/lib/api/fraud/utils.ts
+++ b/apps/web/lib/api/fraud/utils.ts
@@ -102,9 +102,6 @@ function getIdentityFieldsForFraudEvent({
return {
sourceProgramId,
};
-
- case "partnerFraudReport":
- return {};
}
}
diff --git a/apps/web/lib/zod/schemas/fraud.ts b/apps/web/lib/zod/schemas/fraud.ts
index 532cbb04bc..6647d13003 100644
--- a/apps/web/lib/zod/schemas/fraud.ts
+++ b/apps/web/lib/zod/schemas/fraud.ts
@@ -247,7 +247,6 @@ export const updateFraudRuleSettingsSchema = z.object({
customerEmailSuspiciousDomain: toggleOnlyFraudRuleSchema,
partnerCrossProgramBan: toggleOnlyFraudRuleSchema,
partnerDuplicatePayoutMethod: toggleOnlyFraudRuleSchema,
- partnerFraudReport: toggleOnlyFraudRuleSchema,
});
const baseFraudEventSchema = z.object({
@@ -322,6 +321,4 @@ export const fraudEventSchemas = {
}),
partnerDuplicatePayoutMethod: baseFraudEventSchema,
-
- partnerFraudReport: baseFraudEventSchema,
};
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index 3b6fd97f8d..98e886161e 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -847,13 +847,6 @@ export const bulkApprovePartnersSchema = z.object({
export const rejectPartnerSchema = z.object({
workspaceId: z.string(),
partnerId: z.string(),
- reportFraud: z
- .boolean()
- .optional()
- .default(false)
- .describe(
- "Whether to report this partner for suspected fraud to help keep the network safe.",
- ),
});
export const bulkRejectPartnersSchema = z.object({
@@ -863,13 +856,6 @@ export const bulkRejectPartnersSchema = z.object({
.max(100)
.min(1)
.transform((v) => [...new Set(v)]),
- reportFraud: z
- .boolean()
- .optional()
- .default(false)
- .describe(
- "Whether to report these partners for suspected fraud to help keep the network safe.",
- ),
});
export const retrievePartnerLinksSchema = partnerIdTenantIdSchema;
diff --git a/apps/web/scripts/migrations/remove-partner-fraud-report-fraud-data.ts b/apps/web/scripts/migrations/remove-partner-fraud-report-fraud-data.ts
new file mode 100644
index 0000000000..aec50affc7
--- /dev/null
+++ b/apps/web/scripts/migrations/remove-partner-fraud-report-fraud-data.ts
@@ -0,0 +1,46 @@
+/**
+ * One-off: removes FraudRule rows, FraudEventGroup rows, and FraudEvent rows
+ * for the retired `partnerFraudReport` rule type.
+ *
+ * Run **before** deploying the schema that drops `partnerFraudReport` from
+ * `FraudRuleType` (so the Prisma client still knows the value), or use the
+ * `as any` casts below so it still type-checks after the enum is removed.
+ *
+ * Usage (from `apps/web`):
+ * pnpm script migrations/remove-partner-fraud-report-fraud-data
+ */
+import { prisma } from "@dub/prisma";
+import "dotenv-flow/config";
+
+async function main() {
+ const legacyGroupWhere = { type: "partnerFraudReport" } as any;
+
+ const eventDelete = await prisma.fraudEvent.deleteMany({
+ where: {
+ fraudEventGroup: legacyGroupWhere,
+ },
+ });
+
+ console.log(`Deleted ${eventDelete.count} fraud events`);
+
+ const groupDelete = await prisma.fraudEventGroup.deleteMany({
+ where: legacyGroupWhere,
+ });
+
+ console.log(`Deleted ${groupDelete.count} fraud event groups`);
+
+ const ruleDelete = await prisma.fraudRule.deleteMany({
+ where: legacyGroupWhere,
+ });
+
+ console.log(`Deleted ${ruleDelete.count} fraud rules`);
+}
+
+main()
+ .catch((e) => {
+ console.error(e);
+ process.exit(1);
+ })
+ .finally(async () => {
+ await prisma.$disconnect();
+ });
diff --git a/apps/web/ui/modals/approve-partner-application-modal.tsx b/apps/web/ui/modals/approve-partner-application-modal.tsx
new file mode 100644
index 0000000000..6f72cf2c43
--- /dev/null
+++ b/apps/web/ui/modals/approve-partner-application-modal.tsx
@@ -0,0 +1,175 @@
+import { approvePartnerAction } from "@/lib/actions/partners/approve-partner";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { PartnerProps } from "@/lib/types";
+import { PartnerAvatar } from "@/ui/partners/partner-avatar";
+import { Button, Modal, useKeyboardShortcut } from "@dub/ui";
+import { useAction } from "next-safe-action/hooks";
+import {
+ Dispatch,
+ SetStateAction,
+ useCallback,
+ useMemo,
+ useState,
+} from "react";
+import { toast } from "sonner";
+
+interface ApprovePartnerApplicationModalProps {
+ showApprovePartnerApplicationModal: boolean;
+ setShowApprovePartnerApplicationModal: Dispatch<SetStateAction<boolean>>;
+ partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
+ groupId?: string | null;
+ onConfirm?: () => void | Promise<void>;
+ confirmShortcutOptions?: {
+ modal?: boolean;
+ sheet?: boolean;
+ };
+}
+
+export function ApprovePartnerApplicationModal({
+ showApprovePartnerApplicationModal,
+ setShowApprovePartnerApplicationModal,
+ partner,
+ groupId,
+ onConfirm,
+ confirmShortcutOptions,
+}: ApprovePartnerApplicationModalProps) {
+ const { id: workspaceId } = useWorkspace();
+
+ const { executeAsync: approvePartnerApplication, isPending } = useAction(
+ approvePartnerAction,
+ {
+ onSuccess: async () => {
+ toast.success(
+ `Partner ${partner.email} has been approved to your program.`,
+ );
+ setShowApprovePartnerApplicationModal(false);
+ await onConfirm?.();
+ },
+ onError: ({ error }) => {
+ toast.error(error.serverError || "Failed to approve partner.");
+ },
+ },
+ );
+
+ const handleConfirm = useCallback(async () => {
+ if (!workspaceId || !partner) return;
+
+ await approvePartnerApplication({
+ workspaceId,
+ partnerId: partner.id,
+ groupId: groupId ?? undefined,
+ });
+ }, [workspaceId, partner, groupId, approvePartnerApplication]);
+
+ const handleClose = useCallback(() => {
+ setShowApprovePartnerApplicationModal(false);
+ }, [setShowApprovePartnerApplicationModal]);
+
+ useKeyboardShortcut("a", handleConfirm, {
+ enabled: showApprovePartnerApplicationModal,
+ ...(confirmShortcutOptions || { modal: true }),
+ });
+
+ return (
+ <Modal
+ showModal={showApprovePartnerApplicationModal}
+ setShowModal={setShowApprovePartnerApplicationModal}
+ onClose={handleClose}
+ >
+ <div className="border-b border-neutral-200 p-4 sm:p-6">
+ <h3 className="text-lg font-medium leading-none">
+ Approve application
+ </h3>
+ </div>
+
+ {partner && (
+ <div className="flex flex-col gap-6 bg-neutral-50 p-4 sm:p-6">
+ <div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3">
+ <div className="flex items-center gap-4">
+ <PartnerAvatar partner={partner} className="size-10 bg-white" />
+ <div className="flex min-w-0 flex-col">
+ <h4 className="truncate text-sm font-medium text-neutral-900">
+ {partner.name}
+ </h4>
+ <p className="truncate text-xs text-neutral-500">
+ {partner.email}
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ )}
+
+ <div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 p-4">
+ <Button
+ variant="secondary"
+ text="Cancel"
+ className="h-8 w-fit px-3"
+ onClick={handleClose}
+ disabled={isPending}
+ />
+ <Button
+ className="h-8 w-fit px-3"
+ text="Approve"
+ variant="primary"
+ loading={isPending}
+ autoFocus
+ shortcut="A"
+ onClick={handleConfirm}
+ />
+ </div>
+ </Modal>
+ );
+}
+
+export function useApprovePartnerApplicationModal({
+ partner,
+ groupId,
+ onConfirm,
+ confirmShortcutOptions,
+}: {
+ partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
+ groupId?: string | null;
+ onConfirm?: () => void | Promise<void>;
+ confirmShortcutOptions?: {
+ modal?: boolean;
+ sheet?: boolean;
+ };
+}) {
+ const [
+ showApprovePartnerApplicationModal,
+ setShowApprovePartnerApplicationModal,
+ ] = useState(false);
+
+ const ApprovePartnerApplicationModalCallback = useMemo(() => {
+ return (
+ <ApprovePartnerApplicationModal
+ showApprovePartnerApplicationModal={showApprovePartnerApplicationModal}
+ setShowApprovePartnerApplicationModal={
+ setShowApprovePartnerApplicationModal
+ }
+ partner={partner}
+ groupId={groupId}
+ onConfirm={onConfirm}
+ confirmShortcutOptions={confirmShortcutOptions}
+ />
+ );
+ }, [
+ showApprovePartnerApplicationModal,
+ partner,
+ groupId,
+ onConfirm,
+ confirmShortcutOptions,
+ ]);
+
+ return useMemo(
+ () => ({
+ setShowApprovePartnerApplicationModal,
+ ApprovePartnerApplicationModal: ApprovePartnerApplicationModalCallback,
+ }),
+ [
+ setShowApprovePartnerApplicationModal,
+ ApprovePartnerApplicationModalCallback,
+ ],
+ );
+}
diff --git a/apps/web/ui/modals/bulk-ban-partners-modal.tsx b/apps/web/ui/modals/bulk-ban-partners-modal.tsx
index c527ed1622..f59cee2029 100644
--- a/apps/web/ui/modals/bulk-ban-partners-modal.tsx
+++ b/apps/web/ui/modals/bulk-ban-partners-modal.tsx
@@ -104,7 +104,6 @@ function BulkBanPartnersModal({
? executeReject({
workspaceId,
partnerIds: pendingPartners.map((p) => p.id),
- reportFraud: false,
})
: Promise.resolve(null),
]);
diff --git a/apps/web/ui/modals/bulk-reject-partners-modal.tsx b/apps/web/ui/modals/bulk-reject-partners-modal.tsx
index 3a464dd413..a707f89b1e 100644
--- a/apps/web/ui/modals/bulk-reject-partners-modal.tsx
+++ b/apps/web/ui/modals/bulk-reject-partners-modal.tsx
@@ -3,7 +3,7 @@ import { mutatePrefix } from "@/lib/swr/mutate";
import useWorkspace from "@/lib/swr/use-workspace";
import { EnrolledPartnerProps } from "@/lib/types";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
-import { Button, Checkbox, Modal } from "@dub/ui";
+import { Button, Modal } from "@dub/ui";
import { cn, pluralize } from "@dub/utils";
import { useAction } from "next-safe-action/hooks";
import {
@@ -25,14 +25,12 @@ function BulkRejectPartnersModal({
partners: EnrolledPartnerProps[];
}) {
const { id: workspaceId } = useWorkspace();
- const [reportFraud, setReportFraud] = useState(false);
const { executeAsync, isPending } = useAction(
bulkRejectPartnerApplicationsAction,
{
onSuccess: async () => {
setShowBulkRejectPartnersModal(false);
- setReportFraud(false);
await mutatePrefix(["/api/partners", "/api/partners/count"]);
toast.success(`${pluralize("Partner", partners.length)} rejected.`);
},
@@ -52,13 +50,11 @@ function BulkRejectPartnersModal({
await executeAsync({
workspaceId,
partnerIds,
- reportFraud,
});
};
const handleClose = useCallback(() => {
setShowBulkRejectPartnersModal(false);
- setReportFraud(false);
}, [setShowBulkRejectPartnersModal]);
return (
@@ -105,22 +101,6 @@ function BulkRejectPartnersModal({
{pluralize("application", partners.length)} and prevent them from
joining your program.
</p>
-
- <label className="flex items-start gap-2.5">
- <Checkbox
- className="mt-1 size-4 rounded border-neutral-300 focus:border-neutral-500 focus:ring-neutral-500 focus-visible:border-neutral-500 focus-visible:ring-neutral-500 data-[state=checked]:bg-black data-[state=indeterminate]:bg-black"
- checked={reportFraud}
- onCheckedChange={(checked) => setReportFraud(Boolean(checked))}
- />
- <span className="text-sm text-neutral-600">
- Select this if you believe{" "}
- {pluralize("this application", partners.length, {
- plural: "these applications",
- })}{" "}
- {pluralize("shows", partners.length, { plural: "show" })} signs of
- fraud. This helps keep the network safe.
- </span>
- </label>
</div>
<div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 px-4 py-5 sm:px-6">
diff --git a/apps/web/ui/modals/reject-partner-application-modal.tsx b/apps/web/ui/modals/reject-partner-application-modal.tsx
index 18120d8a06..8ae3f9f5c6 100644
--- a/apps/web/ui/modals/reject-partner-application-modal.tsx
+++ b/apps/web/ui/modals/reject-partner-application-modal.tsx
@@ -2,7 +2,7 @@ import { rejectPartnerApplicationAction } from "@/lib/actions/partners/reject-pa
import useWorkspace from "@/lib/swr/use-workspace";
import { PartnerProps } from "@/lib/types";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
-import { Button, Checkbox, Modal, useKeyboardShortcut } from "@dub/ui";
+import { Button, Modal, useKeyboardShortcut } from "@dub/ui";
import { useAction } from "next-safe-action/hooks";
import {
Dispatch,
@@ -32,7 +32,6 @@ export function RejectPartnerApplicationModal({
confirmShortcutOptions,
}: RejectPartnerApplicationModalProps) {
const { id: workspaceId } = useWorkspace();
- const [reportFraud, setReportFraud] = useState(false);
const { executeAsync: rejectPartnerApplication, isPending } = useAction(
rejectPartnerApplicationAction,
@@ -42,7 +41,6 @@ export function RejectPartnerApplicationModal({
`Partner ${partner.email} has been rejected from your program.`,
);
setShowRejectPartnerApplicationModal(false);
- setReportFraud(false);
await onConfirm?.();
},
onError: ({ error }) => {
@@ -57,13 +55,11 @@ export function RejectPartnerApplicationModal({
await rejectPartnerApplication({
workspaceId,
partnerId: partner.id,
- reportFraud,
});
- }, [workspaceId, partner, reportFraud, rejectPartnerApplication]);
+ }, [workspaceId, partner, rejectPartnerApplication]);
const handleClose = useCallback(() => {
setShowRejectPartnerApplicationModal(false);
- setReportFraud(false);
}, [setShowRejectPartnerApplicationModal]);
useKeyboardShortcut("r", handleConfirm, {
@@ -96,27 +92,10 @@ export function RejectPartnerApplicationModal({
</div>
</div>
</div>
-
- <p className="text-sm text-neutral-600">
- This will reject the partner application and prevent them from
- joining your program.
- </p>
-
- <label className="flex items-start gap-2.5">
- <Checkbox
- className="mt-1 size-4 rounded border-neutral-300 focus:border-neutral-500 focus:ring-neutral-500 focus-visible:border-neutral-500 focus-visible:ring-neutral-500 data-[state=checked]:bg-black data-[state=indeterminate]:bg-black"
- checked={reportFraud}
- onCheckedChange={(checked) => setReportFraud(Boolean(checked))}
- />
- <span className="text-sm text-neutral-600">
- Select this if you believe the application shows signs of fraud.
- This helps keep the network safe.
- </span>
- </label>
</div>
)}
- <div className="flex items-center justify-end gap-2 bg-neutral-50 px-4 pb-5 sm:px-6">
+ <div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 p-4">
<Button
variant="secondary"
text="Cancel"
diff --git a/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-partner-info-table.tsx b/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-partner-info-table.tsx
index fd2e8a4127..f3b7a7c6c2 100644
--- a/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-partner-info-table.tsx
+++ b/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-partner-info-table.tsx
@@ -9,9 +9,9 @@ import { formatDateTimeSmart } from "@dub/utils";
import Link from "next/link";
import * as z from "zod/v4";
-// Both partnerFraudReport and partnerDuplicatePayoutMethod have the same schema
-// We can use either one since they're identical
-type EventDataProps = z.infer<(typeof fraudEventSchemas)["partnerFraudReport"]>;
+type EventDataProps = z.infer<
+ (typeof fraudEventSchemas)["partnerDuplicatePayoutMethod"]
+>;
export function FraudPartnerInfoTable() {
const { slug: workspaceSlug } = useWorkspace();
diff --git a/apps/web/ui/partners/fraud-risks/fraud-events-tables/index.tsx b/apps/web/ui/partners/fraud-risks/fraud-events-tables/index.tsx
index 9f6c65f364..7a6a73aa7c 100644
--- a/apps/web/ui/partners/fraud-risks/fraud-events-tables/index.tsx
+++ b/apps/web/ui/partners/fraud-risks/fraud-events-tables/index.tsx
@@ -13,7 +13,6 @@ const FRAUD_EVENTS_TABLES: Partial<Record<FraudRuleType, React.ComponentType>> =
customerEmailSuspiciousDomain: FraudMatchingCustomerEmailTable,
referralSourceBanned: FraudReferralSourceBannedTable,
paidTrafficDetected: FraudPaidTrafficDetectedTable,
- partnerFraudReport: FraudPartnerInfoTable,
partnerCrossProgramBan: FraudCrossProgramBanTable,
partnerDuplicatePayoutMethod: FraudPartnerInfoTable,
};
diff --git a/apps/web/ui/partners/partner-application-sheet.tsx b/apps/web/ui/partners/partner-application-sheet.tsx
index 207a62d0ae..8e9bdb79ec 100644
--- a/apps/web/ui/partners/partner-application-sheet.tsx
+++ b/apps/web/ui/partners/partner-application-sheet.tsx
@@ -1,9 +1,7 @@
-import { approvePartnerAction } from "@/lib/actions/partners/approve-partner";
import { mutatePrefix } from "@/lib/swr/mutate";
-import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
import { EnrolledPartnerProps } from "@/lib/types";
-import { useConfirmModal } from "@/ui/modals/confirm-modal";
+import { useApprovePartnerApplicationModal } from "@/ui/modals/approve-partner-application-modal";
import { useRejectPartnerApplicationModal } from "@/ui/modals/reject-partner-application-modal";
import { X } from "@/ui/shared/icons";
import {
@@ -15,10 +13,8 @@ import {
useKeyboardShortcut,
useRouterStuff,
} from "@dub/ui";
-import { useAction } from "next-safe-action/hooks";
import Link from "next/link";
import { Dispatch, SetStateAction, useEffect, useState } from "react";
-import { toast } from "sonner";
import { PartnerAbout } from "./partner-about";
import { PartnerApplicationDetails } from "./partner-application-details";
import { PartnerComments } from "./partner-comments";
@@ -232,42 +228,26 @@ function PartnerApproval({
setIsOpen: Dispatch<SetStateAction<boolean>>;
onNext?: () => void;
}) {
- const { id: workspaceId } = useWorkspace();
- const { program } = useProgram();
-
- const { executeAsync, isPending } = useAction(approvePartnerAction, {
- onSuccess: () => {
+ const {
+ ApprovePartnerApplicationModal,
+ setShowApprovePartnerApplicationModal,
+ } = useApprovePartnerApplicationModal({
+ partner,
+ groupId,
+ onConfirm: async () => {
onNext ? onNext() : setIsOpen(false);
- toast.success(`Successfully approved ${partner.email} to your program.`);
- mutatePrefix("/api/partners");
- },
- onError({ error }) {
- toast.error(error.serverError || "Failed to approve partner.");
+ await mutatePrefix("/api/partners");
},
- });
-
- const { setShowConfirmModal, confirmModal } = useConfirmModal({
- title: "Approve Partner",
- description: "Are you sure you want to approve this partner application?",
- confirmText: "Approve",
- confirmShortcut: "a",
confirmShortcutOptions: { sheet: true, modal: true },
- onConfirm: async () => {
- if (!program || !workspaceId) return;
-
- await executeAsync({
- workspaceId: workspaceId,
- partnerId: partner.id,
- groupId,
- });
- },
});
- useKeyboardShortcut("a", () => setShowConfirmModal(true), { sheet: true });
+ useKeyboardShortcut("a", () => setShowApprovePartnerApplicationModal(true), {
+ sheet: true,
+ });
return (
<>
- {confirmModal}
+ {ApprovePartnerApplicationModal}
<div className="flex justify-end gap-2">
{partner.status !== "rejected" && (
<div className="flex-shrink-0">
@@ -283,8 +263,7 @@ function PartnerApproval({
variant="primary"
text="Approve"
shortcut="A"
- loading={isPending}
- onClick={() => setShowConfirmModal(true)}
+ onClick={() => setShowApprovePartnerApplicationModal(true)}
className="w-fit shrink-0"
/>
</div>
diff --git a/packages/prisma/schema/fraud.prisma b/packages/prisma/schema/fraud.prisma
index da4e7c8d9e..57c752aa48 100644
--- a/packages/prisma/schema/fraud.prisma
+++ b/packages/prisma/schema/fraud.prisma
@@ -10,7 +10,6 @@ enum FraudRuleType {
paidTrafficDetected
partnerCrossProgramBan // Cross-program ban from other programs
partnerDuplicatePayoutMethod // Duplicate payout method with other partners
- partnerFraudReport // Fraud report from other programs
}
model FraudRule {