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.

Improve payouts indicator

Steven Teyfaa0a5fb1751
diff --git a/apps/web/ui/partners/confirm-payouts-sheet.tsx b/apps/web/ui/partners/confirm-payouts-sheet.tsx
index b8089dd31b..de2168d9c8 100644
--- a/apps/web/ui/partners/confirm-payouts-sheet.tsx
+++ b/apps/web/ui/partners/confirm-payouts-sheet.tsx
@@ -404,8 +404,14 @@ function ConfirmPayoutsSheetContent() {
return false;
case "external":
return true;
+ // in hybrid mode, payouts are only processed externally if:
+ // - the partner has not connected a payout method on Dub
+ // - the partner has a valid tenant ID
case "hybrid":
- return payout.partner.payoutsEnabledAt === null;
+ return (
+ payout.partner.payoutsEnabledAt === null &&
+ payout.partner.tenantId !== null
+ );
default:
return false;
}
diff --git a/apps/web/ui/partners/partner-row-item.tsx b/apps/web/ui/partners/partner-row-item.tsx
index 11d423a37e..efe5cfec4c 100644
--- a/apps/web/ui/partners/partner-row-item.tsx
+++ b/apps/web/ui/partners/partner-row-item.tsx
@@ -1,17 +1,19 @@
import { isProductionEnvironment } from "@/lib/sandbox/environment";
import useProgram from "@/lib/swr/use-program";
import { EXTERNAL_PAYOUT_CONFIRMED_WEBHOOK_TRIGGER } from "@/lib/webhook/constants";
-import { CircleArrowRight, DynamicTooltipWrapper, GreekTemple } from "@dub/ui";
-import { cn, formatDateTimeSmart } from "@dub/utils";
import {
- PartnerNetworkStatus,
- PartnerPayoutMethod,
- WorkspaceEnvironment,
-} from "@prisma/client";
-import { CircleMinus } from "lucide-react";
+ CircleArrowRight,
+ CircleXmark,
+ DynamicTooltipWrapper,
+ GreekTemple,
+ IsolatedCube,
+} from "@dub/ui";
+import { cn, formatDateTimeSmart } from "@dub/utils";
+import { PartnerNetworkStatus, PartnerPayoutMethod } from "@prisma/client";
import Link from "next/link";
import { useParams } from "next/navigation";
import type { ReactNode } from "react";
+import { MarkdownDescription } from "../shared/markdown-description";
import { PartnerRiskIndicator } from "./fraud-risks/partner-risk-indicator";
import { PartnerAvatar } from "./partner-avatar";
import { PartnerNetworkStatusBadge } from "./partner-network/partner-network-status-badge";
@@ -28,6 +30,7 @@ interface PartnerRowItemProps {
id: string;
name: string;
image?: string | null;
+ tenantId?: string | null;
networkStatus?: PartnerNetworkStatus | null;
defaultPayoutMethod?: PartnerPayoutMethod | null;
payoutsEnabledAt?: Date | null;
@@ -37,23 +40,7 @@ interface PartnerRowItemProps {
const PAYOUT_STATUS_CONFIG = {
external: {
title: "External payouts enabled",
- description: (
- <div className="text-sm text-neutral-700">
- This program has external payouts enabled, which means partners will
- receive payouts externally via the{" "}
- <code className="rounded-md bg-neutral-100 px-1 py-0.5 font-mono">
- {EXTERNAL_PAYOUT_CONFIRMED_WEBHOOK_TRIGGER}
- </code>{" "}
- <a
- href="/settings/webhooks"
- target="_blank"
- rel="noopener noreferrer"
- className="cursor-alias underline decoration-dotted underline-offset-2"
- >
- webhook event.
- </a>
- </div>
- ),
+ description: `This program has [external payouts](https://dub.co/docs/partners/external-payouts) enabled, which means partners will receive payouts externally via the \`${EXTERNAL_PAYOUT_CONFIRMED_WEBHOOK_TRIGGER}\` webhook event.`,
icon: CircleArrowRight,
iconClassName: "border-purple-300 bg-purple-200 text-purple-800",
indicatorColor: "bg-purple-500",
@@ -70,11 +57,16 @@ const PAYOUT_STATUS_CONFIG = {
title: "Payouts disabled",
description:
"This partner has not connected a payout method yet, which means they won't be able to receive payouts.",
- icon: CircleMinus,
+ icon: CircleXmark,
iconClassName: "border-red-300 bg-red-200 text-red-800",
indicatorColor: "bg-red-500",
},
simulated: {
+ title: "Payouts simulated",
+ description:
+ "This is a non-production program so payouts will be simulated and no real money will be transferred.",
+ icon: IsolatedCube,
+ iconClassName: "border-yellow-300 bg-yellow-200 text-yellow-800",
indicatorColor: "bg-yellow-500",
},
} as const;
@@ -85,17 +77,16 @@ function usePartnerPayoutStatus(partner: PartnerRowItemProps["partner"]) {
const showPayoutsEnabled = "payoutsEnabledAt" in partner;
let statusKey: keyof typeof PAYOUT_STATUS_CONFIG | null = null;
- // Non-production programs always show a simulated payout. In production, external
- // programs and unconnected hybrid partners are external; everyone else is
- // enabled once payouts are connected and disabled until then.
if (showPayoutsEnabled && program) {
- if (!isProductionEnvironment(program.environment)) {
- statusKey = "simulated";
- } else if (
- program?.payoutMode === "external" ||
- (program?.payoutMode === "hybrid" && partner.payoutsEnabledAt === null)
+ if (
+ program.payoutMode === "external" ||
+ (program.payoutMode === "hybrid" &&
+ partner.payoutsEnabledAt === null &&
+ partner.tenantId !== null)
) {
statusKey = "external";
+ } else if (!isProductionEnvironment(program.environment)) {
+ statusKey = "simulated";
} else if (partner.payoutsEnabledAt) {
statusKey = "enabled";
} else {
@@ -113,25 +104,12 @@ function usePartnerPayoutStatus(partner: PartnerRowItemProps["partner"]) {
function PartnerPayoutStatusTooltip({
statusKey,
partner,
- environment,
}: {
statusKey: keyof typeof PAYOUT_STATUS_CONFIG | null;
partner: PartnerRowItemProps["partner"];
- environment?: WorkspaceEnvironment;
}) {
if (!statusKey) return null;
- if (statusKey === "simulated") {
- if (!environment) return null;
-
- return (
- <div className="max-w-xs text-pretty p-2.5 text-sm text-neutral-500">
- This is a {environment} workspace so payouts will be simulated, no real
- money will be transferred.
- </div>
- );
- }
-
const {
title,
description,
@@ -150,22 +128,17 @@ function PartnerPayoutStatusTooltip({
: { Icon: GreekTemple, wrapperClass: "" };
return (
- <div className="max-w-xs">
+ <div className="max-w-sm">
<div className="grid gap-2 p-2.5">
<div className="flex items-center gap-2 text-sm font-medium">
{title}
- <div
- className={cn(
- iconClassName,
- "flex size-5 items-center justify-center rounded-md border",
- )}
- >
- <Icon className="size-3" />
+ <div className={cn(iconClassName, "rounded-md border p-0.5")}>
+ <Icon className="size-3.5" />
</div>
</div>
- <div className="text-pretty text-sm text-neutral-500">
+ <MarkdownDescription className="text-sm text-neutral-500 [&_code]:rounded-md [&_code]:bg-neutral-100 [&_code]:px-1 [&_code]:py-0.5 [&_code]:font-mono">
{description}
- </div>
+ </MarkdownDescription>
</div>
{hasPayoutDetails && (
<div className="flex items-center gap-1.5 border-t border-neutral-100 p-2.5 text-xs text-neutral-600">
@@ -210,7 +183,6 @@ export function PartnerRowItem({
<PartnerPayoutStatusTooltip
statusKey={statusKey}
partner={partner}
- environment={environment}
/>
),
}