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.

Standardize `payouts/count` API response shape (#3730)

Steven Teycf93fd726e08
diff --git a/apps/web/app/(ee)/api/partner-profile/payouts/count/route.ts b/apps/web/app/(ee)/api/partner-profile/payouts/count/route.ts
index e4090cf0a1..7875d552e7 100644
--- a/apps/web/app/(ee)/api/partner-profile/payouts/count/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/payouts/count/route.ts
@@ -43,12 +43,22 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
return NextResponse.json(counts);
}
- const count = await prisma.payout.count({
+ const count = await prisma.payout.aggregate({
where: {
...where,
status,
},
+ _count: true,
+ _sum: {
+ amount: true,
+ },
});
- return NextResponse.json(count);
+ return NextResponse.json([
+ {
+ count: count._count ?? 0,
+ amount: count._sum?.amount ?? 0,
+ status: status ?? "all",
+ },
+ ]);
});
diff --git a/apps/web/app/(ee)/api/payouts/count/route.ts b/apps/web/app/(ee)/api/payouts/count/route.ts
index dc8e2e269d..808302e663 100644
--- a/apps/web/app/(ee)/api/payouts/count/route.ts
+++ b/apps/web/app/(ee)/api/payouts/count/route.ts
@@ -76,12 +76,22 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
return NextResponse.json(counts);
}
- const count = await prisma.payout.count({
+ const count = await prisma.payout.aggregate({
where: {
...where,
status,
},
+ _count: true,
+ _sum: {
+ amount: true,
+ },
});
- return NextResponse.json(count);
+ return NextResponse.json([
+ {
+ count: count._count ?? 0,
+ amount: count._sum?.amount ?? 0,
+ status: status ?? "all",
+ },
+ ]);
});
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-stats.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-stats.tsx
index 60a62c60aa..427a87fdef 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-stats.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-stats.tsx
@@ -115,7 +115,7 @@ function PayoutStatsCard({
export function PayoutStats() {
const { partner } = usePartnerProfile();
- const { payoutsCount, error } = usePartnerPayoutsCount<PayoutsCount[]>({
+ const { payoutsCount, error } = usePartnerPayoutsCount({
groupBy: "status",
});
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx
index 764527a32e..dd938824dc 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx
@@ -44,7 +44,7 @@ export function PayoutTable() {
const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";
const { payouts, error, loading } = usePartnerPayouts();
- const { payoutsCount } = usePartnerPayoutsCount<number>();
+ const { payoutsCount } = usePartnerPayoutsCount();
const [detailsSheetState, setDetailsSheetState] = useState<
| { open: false; payout: PartnerPayoutResponse | null }
@@ -216,7 +216,7 @@ export function PayoutTable() {
thClassName: "border-l-0",
tdClassName: "border-l-0",
resourceName: (p) => `payout${p ? "s" : ""}`,
- rowCount: payoutsCount || 0,
+ rowCount: payoutsCount?.[0]?.count ?? 0,
});
return (
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/use-payout-filters.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/use-payout-filters.tsx
index 00a9250d6c..82bccb74f9 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/use-payout-filters.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/use-payout-filters.tsx
@@ -1,6 +1,5 @@
import usePartnerPayoutsCount from "@/lib/swr/use-partner-payouts-count";
import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
-import { PayoutsCount } from "@/lib/types";
import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";
import { useRouterStuff } from "@dub/ui";
import { CircleDotted, GridIcon } from "@dub/ui/icons";
@@ -10,7 +9,7 @@ import { useCallback, useMemo } from "react";
export function usePayoutFilters() {
const { searchParamsObj, queryParams } = useRouterStuff();
- const { payoutsCount } = usePartnerPayoutsCount<PayoutsCount[]>({
+ const { payoutsCount } = usePartnerPayoutsCount({
groupBy: "status",
});
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/identity-verification-section.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/identity-verification-section.tsx
index 87d4fdd497..d2fa3d0437 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/identity-verification-section.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/identity-verification-section.tsx
@@ -13,14 +13,17 @@ import {
Veriff,
VerifiedBadge,
} from "@dub/ui/icons";
-import { cn } from "@dub/utils";
+import { cn, DUPLICATE_IDENTITY_DECLINE_REASON } from "@dub/utils";
import { useAction } from "next-safe-action/hooks";
+import { Dispatch, SetStateAction } from "react";
import { toast } from "sonner";
export function IdentityVerificationSection({
partner,
+ setShowMergePartnerAccountsModal,
}: {
partner?: PartnerProps;
+ setShowMergePartnerAccountsModal: Dispatch<SetStateAction<boolean>>;
}) {
const { mutate } = usePartnerProfile();
@@ -111,6 +114,10 @@ export function IdentityVerificationSection({
}
}
+ const IS_DUPLICATE_IDENTITY_DECLINE =
+ identityVerificationStatus === "declined" &&
+ failedReason === DUPLICATE_IDENTITY_DECLINE_REASON;
+
switch (identityVerificationStatus) {
case "started":
buttonText = "Complete verification";
@@ -134,6 +141,27 @@ export function IdentityVerificationSection({
<p className="leading-0 text-sm font-medium text-amber-900">
<span className="font-semibold">Verification failed:</span>{" "}
{failedReason}
+ {IS_DUPLICATE_IDENTITY_DECLINE && (
+ <span>
+ {" "}
+ Please{" "}
+ <button
+ onClick={() => setShowMergePartnerAccountsModal(true)}
+ className="font-semibold underline underline-offset-2"
+ >
+ merge your accounts
+ </button>{" "}
+ or{" "}
+ <a
+ href="https://dub.co/support"
+ className="font-semibold underline underline-offset-2"
+ target="_blank"
+ >
+ contact support
+ </a>{" "}
+ if you believe this is a mistake.
+ </span>
+ )}
</p>
</div>
)}
@@ -146,9 +174,9 @@ export function IdentityVerificationSection({
<div className="relative flex flex-col items-center gap-3 px-6 py-3">
{identityVerificationStatus === "approved" ? (
<VerifiedBadge className="size-6" />
- ) : (
+ ) : !IS_DUPLICATE_IDENTITY_DECLINE ? (
<ShieldCheck className="size-6 text-neutral-400" />
- )}
+ ) : null}
{identityVerificationStatus === "approved" && (
<StatusBadge
@@ -174,7 +202,9 @@ export function IdentityVerificationSection({
!isPendingReview &&
buttonText && (
<Button
- text={buttonText}
+ text={
+ IS_DUPLICATE_IDENTITY_DECLINE ? "Merge accounts" : buttonText
+ }
variant="secondary"
disabled={isMaxAttemptsReached || cannotUpdateProfile}
disabledTooltip={
@@ -184,16 +214,24 @@ export function IdentityVerificationSection({
? "You have reached the maximum number of verification attempts. Please contact support if you need help."
: undefined
}
- onClick={() => executeAsync()}
+ onClick={() => {
+ if (IS_DUPLICATE_IDENTITY_DECLINE) {
+ setShowMergePartnerAccountsModal(true);
+ } else {
+ executeAsync();
+ }
+ }}
loading={isPending}
className="h-10 w-fit rounded-lg px-4 py-1.5"
/>
)}
- <div className="flex items-center gap-1 text-xs font-medium text-neutral-400">
- <span>Powered by</span>
- <Veriff className="w-auto" />
- </div>
+ {!IS_DUPLICATE_IDENTITY_DECLINE && (
+ <div className="flex items-center gap-1 text-xs font-medium text-neutral-400">
+ <span>Powered by</span>
+ <Veriff className="w-auto" />
+ </div>
+ )}
</div>
</div>
</div>
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/page-client.tsx
index d3e64cac7f..c8533b8b34 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/page-client.tsx
@@ -9,7 +9,7 @@ import { useMergePartnerAccountsModal } from "@/ui/partners/merge-accounts/merge
import { ThreeDots } from "@/ui/shared/icons";
import { Button, Popover, Users2 } from "@dub/ui";
import { cn } from "@dub/utils";
-import { useMemo, useState } from "react";
+import { Dispatch, SetStateAction, useMemo, useState } from "react";
import { AboutYouForm } from "./about-you-form";
import { HowYouWorkForm } from "./how-you-work-form";
import { ProfileDetailsForm } from "./profile-details-form";
@@ -25,6 +25,9 @@ export function ProfileSettingsPageClient() {
[tasks],
);
+ const { MergePartnerAccountsModal, setShowMergePartnerAccountsModal } =
+ useMergePartnerAccountsModal();
+
return (
<PageContent
title="Profile"
@@ -33,11 +36,19 @@ export function ProfileSettingsPageClient() {
"Build a stronger partner profile and increase trust by adding and verifying your website and social accounts.",
href: "https://dub.co/help/article/partner-profile",
}}
- controls={<Controls />}
+ controls={
+ <Controls
+ setShowMergePartnerAccountsModal={setShowMergePartnerAccountsModal}
+ />
+ }
>
+ <MergePartnerAccountsModal />
<PageWidthWrapper className="mb-20 flex flex-col gap-6">
{partner && !allTasksCompleted && <ProfileDiscoveryGuide />}
- <ProfileDetailsForm partner={partner} />
+ <ProfileDetailsForm
+ partner={partner}
+ setShowMergePartnerAccountsModal={setShowMergePartnerAccountsModal}
+ />
<AboutYouForm partner={partner} />
<HowYouWorkForm partner={partner} />
</PageWidthWrapper>
@@ -45,7 +56,11 @@ export function ProfileSettingsPageClient() {
);
}
-function Controls() {
+function Controls({
+ setShowMergePartnerAccountsModal,
+}: {
+ setShowMergePartnerAccountsModal: Dispatch<SetStateAction<boolean>>;
+}) {
const { partner } = usePartnerProfile();
const disabled = partner
? !hasPermission(partner.role, "partner_profile.update")
@@ -53,50 +68,43 @@ function Controls() {
const [isOpen, setIsOpen] = useState(false);
- const { MergePartnerAccountsModal, setShowMergePartnerAccountsModal } =
- useMergePartnerAccountsModal();
-
return (
- <>
- <MergePartnerAccountsModal />
-
- <Popover
- openPopover={isOpen}
- setOpenPopover={setIsOpen}
- content={
- <div className="w-full p-2 md:w-56">
- <button
- onClick={() => {
- if (!disabled) {
- setShowMergePartnerAccountsModal(true);
- setIsOpen(false);
- }
- }}
- disabled={disabled}
- className={cn(
- "w-full rounded-md p-2",
- disabled
- ? "cursor-not-allowed bg-neutral-50 text-neutral-400"
- : "hover:bg-neutral-100 active:bg-neutral-200",
- )}
- >
- <div className="flex items-center gap-2 text-left">
- <Users2 className="size-4 shrink-0" />
- <span className="text-sm font-medium">Merge accounts</span>
- </div>
- </button>
- </div>
- }
- align="end"
- >
- <Button
- type="button"
- className="h-9 whitespace-nowrap px-2"
- variant="secondary"
- icon={<ThreeDots className="size-4 shrink-0" />}
- onClick={() => setIsOpen(!isOpen)}
- />
- </Popover>
- </>
+ <Popover
+ openPopover={isOpen}
+ setOpenPopover={setIsOpen}
+ content={
+ <div className="w-full p-2 md:w-56">
+ <button
+ onClick={() => {
+ if (!disabled) {
+ setShowMergePartnerAccountsModal(true);
+ setIsOpen(false);
+ }
+ }}
+ disabled={disabled}
+ className={cn(
+ "w-full rounded-md p-2",
+ disabled
+ ? "cursor-not-allowed bg-neutral-50 text-neutral-400"
+ : "hover:bg-neutral-100 active:bg-neutral-200",
+ )}
+ >
+ <div className="flex items-center gap-2 text-left">
+ <Users2 className="size-4 shrink-0" />
+ <span className="text-sm font-medium">Merge accounts</span>
+ </div>
+ </button>
+ </div>
+ }
+ align="end"
+ >
+ <Button
+ type="button"
+ className="h-9 whitespace-nowrap px-2"
+ variant="secondary"
+ icon={<ThreeDots className="size-4 shrink-0" />}
+ onClick={() => setIsOpen(!isOpen)}
+ />
+ </Popover>
);
}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/profile-details-form.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/profile-details-form.tsx
index 19c888d908..1ad34d8fd1 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/profile-details-form.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/profile-details-form.tsx
@@ -2,6 +2,7 @@ import { parseActionError } from "@/lib/actions/parse-action-errors";
import { updatePartnerProfileAction } from "@/lib/actions/partners/update-partner-profile";
import { hasPermission } from "@/lib/auth/partner-users/partner-user-permissions";
import { mutatePrefix } from "@/lib/swr/mutate";
+import usePartnerPayoutsCount from "@/lib/swr/use-partner-payouts-count";
import { PartnerProps } from "@/lib/types";
import { useConfirmModal } from "@/ui/modals/confirm-modal";
import { CountryCombobox } from "@/ui/partners/country-combobox";
@@ -24,7 +25,14 @@ import {
import { OG_AVATAR_URL, cn } from "@dub/utils";
import { AnimatePresence, LayoutGroup, motion } from "motion/react";
import { useAction } from "next-safe-action/hooks";
-import { RefObject, useEffect, useRef, useState } from "react";
+import {
+ Dispatch,
+ RefObject,
+ SetStateAction,
+ useEffect,
+ useRef,
+ useState,
+} from "react";
import {
Controller,
FormProvider,
@@ -44,7 +52,13 @@ type BasicInfoFormData = {
companyName: string | null;
};
-export function ProfileDetailsForm({ partner }: { partner?: PartnerProps }) {
+export function ProfileDetailsForm({
+ partner,
+ setShowMergePartnerAccountsModal,
+}: {
+ partner?: PartnerProps;
+ setShowMergePartnerAccountsModal: Dispatch<SetStateAction<boolean>>;
+}) {
const disabled = partner
? !hasPermission(partner.role, "partner_profile.update")
: true;
@@ -77,6 +91,10 @@ export function ProfileDetailsForm({ partner }: { partner?: PartnerProps }) {
},
});
+ const { payoutsCount } = usePartnerPayoutsCount({
+ status: "completed",
+ });
+
return (
<div className="border-border-subtle divide-border-subtle flex flex-col divide-y rounded-lg border">
{stripeConfirmModal}
@@ -103,13 +121,16 @@ export function ProfileDetailsForm({ partner }: { partner?: PartnerProps }) {
</FormProvider>
</SettingsRow>
- {partner?.email?.endsWith("@dub.co") && (
+ {(payoutsCount?.[0]?.amount ?? 0) > 10000 && (
<SettingsRow
id="identity-verification"
heading="Identity verification"
description="Verify your identity to build trust with programs and get approved for programs faster."
>
- <IdentityVerificationSection partner={partner} />
+ <IdentityVerificationSection
+ partner={partner}
+ setShowMergePartnerAccountsModal={setShowMergePartnerAccountsModal}
+ />
</SettingsRow>
)}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/payouts-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/payouts-card.tsx
index 59a4a3ca52..a00f340a5d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/payouts-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/payouts-card.tsx
@@ -16,7 +16,7 @@ export function PayoutsCard({ programId }: { programId?: string }) {
...(programId && { programId }),
pageSize: "4",
});
- const { payoutsCount } = usePartnerPayoutsCount<number>({
+ const { payoutsCount } = usePartnerPayoutsCount({
...(programId && { programId }),
});
@@ -41,12 +41,12 @@ export function PayoutsCard({ programId }: { programId?: string }) {
<span className="block text-base font-semibold leading-none text-neutral-800">
Payouts
</span>
- {payouts?.length ? (
+ {payouts?.length && payoutsCount?.length ? (
<Link
href={`/payouts?programId=${programId}`}
className="text-sm font-medium leading-none text-neutral-500 hover:text-neutral-600"
>
- {payouts.length} of {payoutsCount} results
+ {payouts.length} of {payoutsCount[0].count} results
</Link>
) : null}
</div>
diff --git a/apps/web/app/api/veriff/webhook/handle-decision-event.ts b/apps/web/app/api/veriff/webhook/handle-decision-event.ts
index 1d89815b7b..e88ec86ece 100644
--- a/apps/web/app/api/veriff/webhook/handle-decision-event.ts
+++ b/apps/web/app/api/veriff/webhook/handle-decision-event.ts
@@ -9,6 +9,7 @@ import PartnerIdentityVerificationFailed from "@dub/email/templates/partner-iden
import PartnerIdentityVerified from "@dub/email/templates/partner-identity-verified";
import { prisma } from "@dub/prisma";
import { IdentityVerificationStatus, Partner } from "@dub/prisma/client";
+import { DUPLICATE_IDENTITY_DECLINE_REASON } from "@dub/utils";
import { logAndRespond } from "app/(ee)/api/cron/utils";
const veriffStatusMap: Record<
@@ -77,8 +78,7 @@ export const handleDecisionEvent = async ({
if (isDuplicate) {
effectiveStatus = "declined";
- declineReason =
- "This identity has already been verified on another account.";
+ declineReason = DUPLICATE_IDENTITY_DECLINE_REASON;
} else if (isCountryMismatch) {
effectiveStatus = "declined";
declineReason = `Your document country (${verification.document?.country}) does not match your account country (${partner.country})`;
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx
index 311c67aa64..09d38e9924 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx
@@ -18,7 +18,7 @@ export function OverviewTasks() {
const {
payoutsCount: eligiblePayoutsCount,
loading: eligiblePayoutsLoading,
- } = usePayoutsCount<number | undefined>({
+ } = usePayoutsCount({
eligibility: "eligible",
status: "pending",
ignoreParams: true,
@@ -36,7 +36,7 @@ export function OverviewTasks() {
{
icon: MoneyBills2,
label: "Confirm pending payouts",
- count: eligiblePayoutsCount,
+ count: eligiblePayoutsCount?.[0]?.count ?? 0,
href: `/${slug}/program/payouts?status=pending`,
loading: eligiblePayoutsLoading,
},
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx
index a698a75062..502e626b1f 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx
@@ -3,7 +3,6 @@
import { clientAccessCheck } from "@/lib/client-access-check";
import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
import useWorkspace from "@/lib/swr/use-workspace";
-import { PayoutsCount } from "@/lib/types";
import { ConfirmPayoutsSheet } from "@/ui/partners/confirm-payouts-sheet";
import { PayoutStatus } from "@dub/prisma/client";
import {
@@ -25,14 +24,14 @@ export function PayoutStats() {
}).error;
const { queryParams } = useRouterStuff();
- const { payoutsCount, loading } = usePayoutsCount<PayoutsCount[]>({
+ const { payoutsCount, loading } = usePayoutsCount({
groupBy: "status",
});
const {
payoutsCount: eligiblePayoutsCount,
loading: eligiblePayoutsLoading,
- } = usePayoutsCount<PayoutsCount[]>({
+ } = usePayoutsCount({
groupBy: "status",
eligibility: "eligible",
});
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 0f17b88911..650d203f00 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
@@ -48,7 +48,7 @@ export function PayoutTable() {
const sortBy = searchParams.get("sortBy") || "amount";
const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";
- const { payoutsCount, error: countError } = usePayoutsCount<number>();
+ const { payoutsCount, error: countError } = usePayoutsCount();
const {
data: payouts,
@@ -200,7 +200,7 @@ export function PayoutTable() {
thClassName: "border-l-0",
tdClassName: "border-l-0",
resourceName: (p) => `payout${p ? "s" : ""}`,
- rowCount: payoutsCount || 0,
+ rowCount: payoutsCount?.[0]?.count ?? 0,
});
return (
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx
index ed0d8863c0..95dbcf10b7 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx
@@ -1,6 +1,6 @@
import usePartners from "@/lib/swr/use-partners";
import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
-import { EnrolledPartnerProps, PayoutsCount } from "@/lib/types";
+import { EnrolledPartnerProps } from "@/lib/types";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";
import { useRouterStuff } from "@dub/ui";
@@ -12,7 +12,7 @@ import { useDebounce } from "use-debounce";
export function usePayoutFilters() {
const { searchParamsObj, queryParams } = useRouterStuff();
- const { payoutsCount } = usePayoutsCount<PayoutsCount[]>({
+ const { payoutsCount } = usePayoutsCount({
groupBy: "status",
});
diff --git a/apps/web/lib/swr/use-partner-payouts-count.ts b/apps/web/lib/swr/use-partner-payouts-count.ts
index 764d2c2fe8..1214f5670e 100644
--- a/apps/web/lib/swr/use-partner-payouts-count.ts
+++ b/apps/web/lib/swr/use-partner-payouts-count.ts
@@ -4,7 +4,7 @@ import { useSession } from "next-auth/react";
import useSWR from "swr";
import { PayoutsCount } from "../types";
-export default function usePartnerPayoutsCount<T = PayoutsCount[]>(
+export default function usePartnerPayoutsCount(
query?: Record<string, string>,
{
includeParams = ["programId"],
@@ -16,7 +16,7 @@ export default function usePartnerPayoutsCount<T = PayoutsCount[]>(
const partnerId = session?.user?.["defaultPartnerId"];
const { getQueryString } = useRouterStuff();
- const { data: payoutsCount, error } = useSWR<T>(
+ const { data: payoutsCount, error } = useSWR<PayoutsCount[]>(
partnerId &&
`/api/partner-profile/payouts/count${getQueryString(query, {
include: includeParams,
diff --git a/apps/web/lib/swr/use-payouts-count.ts b/apps/web/lib/swr/use-payouts-count.ts
index e5f3f2a902..047b97490e 100644
--- a/apps/web/lib/swr/use-payouts-count.ts
+++ b/apps/web/lib/swr/use-payouts-count.ts
@@ -6,7 +6,7 @@ import { PayoutsCount } from "../types";
import { payoutsCountQuerySchema } from "../zod/schemas/payouts";
import useWorkspace from "./use-workspace";
-export function usePayoutsCount<T>({
+export function usePayoutsCount({
ignoreParams,
enabled = true,
...query
@@ -34,7 +34,7 @@ export function usePayoutsCount<T>({
);
return {
- payoutsCount: payoutsCount as T,
+ payoutsCount,
error,
loading: payoutsCount === undefined && !error,
};
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index 772a299765..45107100dd 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -552,9 +552,7 @@ export function AppSidebarNav({
enabled: Boolean(currentArea === "program" && defaultProgramId),
});
- const { payoutsCount: pendingPayoutsCount } = usePayoutsCount<
- number | undefined
- >({
+ const { payoutsCount: pendingPayoutsCount } = usePayoutsCount({
eligibility: "eligible",
status: "pending",
ignoreParams: true,
@@ -616,7 +614,7 @@ export function AppSidebarNav({
session: session || undefined,
showNews: true,
defaultProgramId: defaultProgramId || undefined,
- pendingPayoutsCount,
+ pendingPayoutsCount: pendingPayoutsCount?.[0]?.count ?? 0,
applicationsCount,
submittedBountiesCount,
unreadMessagesCount,
diff --git a/apps/web/ui/layout/sidebar/payout-stats.tsx b/apps/web/ui/layout/sidebar/payout-stats.tsx
index e67c0633aa..e0cd73855d 100644
--- a/apps/web/ui/layout/sidebar/payout-stats.tsx
+++ b/apps/web/ui/layout/sidebar/payout-stats.tsx
@@ -2,7 +2,6 @@
import usePartnerPayoutsCount from "@/lib/swr/use-partner-payouts-count";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
-import { PayoutsCount } from "@/lib/types";
import { ConnectPayoutButton } from "@/ui/partners/payouts/connect-payout-button";
import { AlertCircleFill } from "@/ui/shared/icons";
import { PayoutStatus } from "@dub/prisma/client";
@@ -19,7 +18,7 @@ import { memo } from "react";
export const PayoutStats = memo(() => {
const { partner } = usePartnerProfile();
- const { payoutsCount } = usePartnerPayoutsCount<PayoutsCount[]>({
+ const { payoutsCount } = usePartnerPayoutsCount({
groupBy: "status",
});
diff --git a/apps/web/ui/partners/program-marketplace/programs-promo-banner.tsx b/apps/web/ui/partners/program-marketplace/programs-promo-banner.tsx
index fed65bd46c..0b219da6b5 100644
--- a/apps/web/ui/partners/program-marketplace/programs-promo-banner.tsx
+++ b/apps/web/ui/partners/program-marketplace/programs-promo-banner.tsx
@@ -1,5 +1,6 @@
"use client";
+import usePartnerPayoutsCount from "@/lib/swr/use-partner-payouts-count";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import { IdentityVerificationBanner } from "@/ui/partners/identity-verification/identity-verification-banner";
import { StablecoinPayoutBanner } from "@/ui/partners/payouts/stablecoin-payout-banner";
@@ -12,12 +13,13 @@ import { ProgramMarketplaceBanner } from "@/ui/partners/program-marketplace/prog
*/
export function ProgramsPromoBanner() {
const { partner, availablePayoutMethods } = usePartnerProfile();
+ const { payoutsCount } = usePartnerPayoutsCount();
- if (!partner) {
+ if (!partner || !payoutsCount) {
return null;
}
- if (!partner.identityVerifiedAt && partner.email?.endsWith("@dub.co")) {
+ if (!partner.identityVerifiedAt && (payoutsCount[0]?.amount ?? 0) > 10000) {
return <IdentityVerificationBanner />;
}
diff --git a/apps/web/ui/partners/program-marketplace/programs-promo-card.tsx b/apps/web/ui/partners/program-marketplace/programs-promo-card.tsx
index 0c45ff7443..9687ce5289 100644
--- a/apps/web/ui/partners/program-marketplace/programs-promo-card.tsx
+++ b/apps/web/ui/partners/program-marketplace/programs-promo-card.tsx
@@ -1,5 +1,6 @@
"use client";
+import usePartnerPayoutsCount from "@/lib/swr/use-partner-payouts-count";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import { IdentityVerificationCard } from "@/ui/partners/identity-verification/identity-verification-card";
import { StablecoinPayoutCard } from "@/ui/partners/payouts/stablecoin-payout-card";
@@ -12,12 +13,13 @@ import { ProgramMarketplaceCard } from "@/ui/partners/program-marketplace/progra
*/
export function ProgramsPromoCard() {
const { partner, availablePayoutMethods } = usePartnerProfile();
+ const { payoutsCount } = usePartnerPayoutsCount();
- if (!partner) {
+ if (!partner || !payoutsCount) {
return null;
}
- if (!partner.identityVerifiedAt && partner.email?.endsWith("@dub.co")) {
+ if (!partner.identityVerifiedAt && (payoutsCount[0].amount ?? 0) > 10000) {
return <IdentityVerificationCard />;
}
diff --git a/packages/email/src/templates/partner-identity-verification-failed.tsx b/packages/email/src/templates/partner-identity-verification-failed.tsx
index 4a37a68a84..0e8443bae3 100644
--- a/packages/email/src/templates/partner-identity-verification-failed.tsx
+++ b/packages/email/src/templates/partner-identity-verification-failed.tsx
@@ -1,4 +1,4 @@
-import { DUB_WORDMARK } from "@dub/utils";
+import { DUB_WORDMARK, DUPLICATE_IDENTITY_DECLINE_REASON } from "@dub/utils";
import {
Body,
Container,
@@ -19,7 +19,7 @@ export default function PartnerIdentityVerificationFailed({
name: "John",
},
- failureType = "countryChange",
+ failureType = "declined",
failureReasonText = "Document Obscured: ID document is partially obscured (e.g. by fingers)",
}: {
partner: {
@@ -85,25 +85,50 @@ export default function PartnerIdentityVerificationFailed({
) : (
<>
<Text className="text-sm leading-6 text-neutral-600">
- Hi {partner.name}, your identity verification couldn't be
- completed because {failureReasonText}.
+ Hi {partner.name}, your identity verification was declined
+ with the following reason:
+ </Text>
+
+ <Text className="rounded-lg border border-solid border-neutral-200 bg-neutral-50 p-4 text-sm leading-6 text-neutral-600">
+ {failureReasonText}
</Text>
<Text className="text-sm leading-6 text-neutral-600">
- Please log back in to your dashboard and resubmit your
- details.
+ {failureReasonText === DUPLICATE_IDENTITY_DECLINE_REASON ? (
+ <>
+ Please{" "}
+ <Link
+ href="https://partners.dub.co/profile/merge-accounts"
+ className="font-semibold text-neutral-700 underline underline-offset-2"
+ >
+ merge your accounts
+ </Link>{" "}
+ or{" "}
+ <Link
+ href="https://dub.co/support"
+ className="font-semibold text-neutral-700 underline underline-offset-2"
+ >
+ contact support
+ </Link>{" "}
+ if you believe this is a mistake.
+ </>
+ ) : (
+ "Please log in to your dashboard and resubmit your documents."
+ )}
</Text>
</>
)}
- <Section className="mb-10 mt-6">
- <Link
- className="rounded-lg bg-neutral-900 px-6 py-3 text-[13px] font-medium text-white no-underline"
- href="https://partners.dub.co/profile"
- >
- Go to your dashboard
- </Link>
- </Section>
+ {failureReasonText !== DUPLICATE_IDENTITY_DECLINE_REASON && (
+ <Section className="mb-10 mt-6">
+ <Link
+ className="rounded-lg bg-neutral-900 px-6 py-3 text-[13px] font-medium text-white no-underline"
+ href="https://partners.dub.co/profile"
+ >
+ Go to your dashboard
+ </Link>
+ </Section>
+ )}
<Footer email={partner.email} />
</Container>
diff --git a/packages/utils/src/constants/misc.ts b/packages/utils/src/constants/misc.ts
index aae02c88ed..9462323185 100644
--- a/packages/utils/src/constants/misc.ts
+++ b/packages/utils/src/constants/misc.ts
@@ -35,3 +35,6 @@ export const TWO_WEEKS_IN_SECONDS = 60 * 60 * 24 * 14;
export const DUB_FOUNDING_DATE = new Date("2022-09-22T00:00:00.000Z");
export const INFINITY_NUMBER = 1000000000;
+
+export const DUPLICATE_IDENTITY_DECLINE_REASON =
+ "This identity has already been verified on another account.";