The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Small miscellaneous fixes (#3757)
Steven Tey05b9c871533e
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/delete-partner-account.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/delete-partner-account.tsxindex b8a3274cf1..50dcc54a1e 100644--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/delete-partner-account.tsx+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/delete-partner-account.tsx@@ -20,7 +20,7 @@ export function DeletePartnerAccount() {return;}- await fetch("/api/admin/delete-partner-account", {+ await fetch("/api/admin/partners/delete-account", {method: "POST",body: JSON.stringify({email: formData.get("email"),diff --git a/apps/web/app/(ee)/api/admin/delete-partner-account/route.ts b/apps/web/app/(ee)/api/admin/partners/delete-account/route.tssimilarity index 98%rename from apps/web/app/(ee)/api/admin/delete-partner-account/route.tsrename to apps/web/app/(ee)/api/admin/partners/delete-account/route.tsindex c7c2cc2bcb..7844c87a57 100644--- a/apps/web/app/(ee)/api/admin/delete-partner-account/route.ts+++ b/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts@@ -6,7 +6,7 @@ import { prisma } from "@dub/prisma";import { prettyPrint } from "@dub/utils";import { NextResponse } from "next/server";-// POST /api/admin/delete-partner-account+// POST /api/admin/partners/delete-accountexport const POST = withAdmin(async ({ req }) => {const { email, deletePartnerAccount } = await req.json();diff --git a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/route.ts b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/route.tsindex 9113ea98d6..3c0cda2ae3 100644--- a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/route.ts+++ b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/route.ts@@ -61,10 +61,10 @@ export async function POST(req: Request) {// Set the method for each payout in the invoice to the corresponding partner's default payout methodawait prisma.$executeRaw`UPDATE Payout p- INNER JOIN Partner pr ON p.partnerId = pr.id- SET p.method = pr.defaultPayoutMethod+ INNER JOIN Partner pn ON p.partnerId = pn.id+ SET p.method = pn.defaultPayoutMethodWHERE p.invoiceId = ${invoice.id}- AND pr.defaultPayoutMethod IS NOT NULL+ AND pn.defaultPayoutMethod IS NOT NULLAND p.status = 'processing'`;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.tsxindex 427a87fdef..ef236bad5e 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@@ -73,7 +73,7 @@ function PayoutStatsCard({<div className="flex items-center gap-2">{partner && !partner.payoutsEnabledAt && (<Tooltip- content="You need to connect your payout account to be able to receive payouts from the programs you are enrolled in."+ content="You need to [connect your payout account](/payouts?settings=true) to be able to receive payouts from the programs you are enrolled in."side="right"><div>@@ -96,9 +96,11 @@ function PayoutStatsCard({className="ml-2 h-7 px-2 py-1"onClick={() => setShowForceWithdrawalModal(true)}disabledTooltip={- amount < MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS- ? `Your current processed payouts balance is less than the minimum amount required for withdrawal (${currencyFormatter(MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS)}).`- : undefined+ !partner?.payoutsEnabledAt+ ? "You need to [connect your payout account](/payouts?settings=true) to withdraw funds."+ : amount < MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS+ ? `Your current processed payouts balance is less than the minimum amount required for withdrawal (${currencyFormatter(MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS)}).`+ : undefined}/>)}diff --git a/apps/web/scripts/migrations/backfill-default-payout-method.ts b/apps/web/scripts/migrations/backfill-default-payout-method.tsindex 3e9338a62f..349271099c 100644--- a/apps/web/scripts/migrations/backfill-default-payout-method.ts+++ b/apps/web/scripts/migrations/backfill-default-payout-method.ts@@ -8,7 +8,7 @@ async function main() {while (true) {const partners = await prisma.partner.findMany({where: {- defaultPayoutMethod: null,+ payoutsEnabledAt: null,OR: [{stripeConnectId: {@@ -20,12 +20,23 @@ async function main() {not: null,},},+ {+ stripeRecipientId: {+ not: null,+ },+ },],+ payouts: {+ some: {+ status: "completed",+ },+ },},select: {id: true,stripeConnectId: true,paypalEmail: true,+ stripeRecipientId: true,},take: BATCH_SIZE,});@@ -34,17 +45,34 @@ async function main() {break;}+ const stablecoinPartners: Pick<Partner, "id" | "stripeRecipientId">[] = [];const connectPartners: Pick<Partner, "id" | "stripeConnectId">[] = [];const paypalPartners: Pick<Partner, "id" | "paypalEmail">[] = [];for (const partner of partners) {- if (partner.stripeConnectId) {+ if (partner.stripeRecipientId) {+ stablecoinPartners.push(partner);+ } else if (partner.stripeConnectId) {connectPartners.push(partner);} else if (partner.paypalEmail) {paypalPartners.push(partner);}}+ const promise0 =+ stablecoinPartners.length > 0+ ? prisma.partner.updateMany({+ where: {+ id: {+ in: stablecoinPartners.map((partner) => partner.id),+ },+ },+ data: {+ defaultPayoutMethod: PartnerPayoutMethod.stablecoin,+ },+ })+ : Promise.resolve({ count: 0 });+const promise1 =connectPartners.length > 0? prisma.partner.updateMany({@@ -75,10 +103,14 @@ async function main() {}): Promise.resolve({ count: 0 });- const [connectRes, paypalRes] = await Promise.all([promise1, promise2]);+ const [stablecoinRes, connectRes, paypalRes] = await Promise.all([+ promise0,+ promise1,+ promise2,+ ]);console.log(- `Updated ${connectRes.count} connect partners and ${paypalRes.count} paypal partners`,+ `Updated ${stablecoinRes.count} stablecoin partners and ${connectRes.count} connect partners and ${paypalRes.count} paypal partners`,);}}diff --git a/apps/web/ui/layout/sidebar/payout-stats.tsx b/apps/web/ui/layout/sidebar/payout-stats.tsxindex e0cd73855d..1633ae20a1 100644--- a/apps/web/ui/layout/sidebar/payout-stats.tsx+++ b/apps/web/ui/layout/sidebar/payout-stats.tsx@@ -42,7 +42,7 @@ export const PayoutStats = memo(() => {<div className="flex items-center gap-1">{partner && !partner.payoutsEnabledAt && (<Tooltip- content="You need to connect your payout account to be able to receive payouts from the programs you are enrolled in. [Learn more](https://dub.co/help/article/receiving-payouts)"+ content="You need to [connect your payout account](/payouts?settings=true) to be able to receive payouts from the programs you are enrolled in. [Learn more](https://dub.co/help/article/receiving-payouts)"side="right"><div>diff --git a/apps/web/ui/modals/plan-change-confirmation-modal.tsx b/apps/web/ui/modals/plan-change-confirmation-modal.tsxindex 88d8cd50e4..aba869afbd 100644--- a/apps/web/ui/modals/plan-change-confirmation-modal.tsx+++ b/apps/web/ui/modals/plan-change-confirmation-modal.tsx@@ -48,7 +48,7 @@ function PlanChangeConfirmationModal({"- You will lose access to your partner program.","- Your partner program will be deactivated and partners will be notified automatically.","- Partner links will stop tracking new activity.",- `- Any [pending payouts](/${slug}/program/payouts?status=pending) must be communicated and settled directly with your partners.`,+ `- Any [pending payouts](https://app.dub.co/${slug}/program/payouts?status=pending) must be communicated and settled directly with your partners.`,].join("\n")}</Markdown></div>diff --git a/apps/web/ui/partners/payouts/bank-account-requirements-modal.tsx b/apps/web/ui/partners/payouts/bank-account-requirements-modal.tsxindex 4788371132..b002e352bf 100644--- a/apps/web/ui/partners/payouts/bank-account-requirements-modal.tsx+++ b/apps/web/ui/partners/payouts/bank-account-requirements-modal.tsx@@ -20,7 +20,7 @@ function BankAccountRequirementsModal({const BANK_ACCOUNT_REQUIREMENTS = useMemo(() => {return [- `1. Bank account must be in your local currency.${partner?.country ? ` Since you're based in [${COUNTRIES[partner.country]}](/profile), you need to connect a **${COUNTRY_CURRENCY_CODES[partner.country]} bank account** to receive payouts.` : ""}`,+ `1. Bank account must be in your local currency.${partner?.country ? ` Since you're based in [${COUNTRIES[partner.country]}](https://partners.dub.co/profile), you need to connect a **${COUNTRY_CURRENCY_CODES[partner.country]} bank account** to receive payouts.` : ""}`,"2. Bank account must be a **checking account** (not a savings account or debit card).","3. Bank account holder name must match your partner account name.","4. Bank account details are 100% accurate (no typos or missing numbers).",diff --git a/apps/web/ui/partners/payouts/payout-method-dropdown.tsx b/apps/web/ui/partners/payouts/payout-method-dropdown.tsxindex 3cbfbbe117..6f094d7eaf 100644--- a/apps/web/ui/partners/payouts/payout-method-dropdown.tsx+++ b/apps/web/ui/partners/payouts/payout-method-dropdown.tsx@@ -107,6 +107,7 @@ function PayoutMethodItem({onAction: (type: PartnerPayoutMethod, isManage: boolean) => void;isActionPending: boolean;}) {+ const { partner } = usePartnerProfile();const { Icon, wrapperClass } = getPayoutMethodIconConfig(method.type);return (@@ -126,11 +127,15 @@ function PayoutMethodItem({{method.label}</span>- {method.default && (- <span className="rounded-md bg-green-100 px-1.5 py-0.5 text-xs font-semibold text-green-700">+ {!partner?.payoutsEnabledAt ? (+ <span className="rounded bg-red-100 px-1.5 py-0.5 text-[0.7rem] font-medium leading-none text-red-700">+ Restricted+ </span>+ ) : method.default ? (+ <span className="rounded-md bg-green-100 px-1.5 py-0.5 text-[0.7rem] font-semibold leading-none text-green-700">Default</span>- )}+ ) : null}</div><span className="mt-0.5 block truncate text-xs text-neutral-500">{method.identifier ?? "Not connected"}@@ -153,6 +158,7 @@ function SelectedMethodDisplay({}: {method: PartnerPayoutMethodSetting;}) {+ const { partner } = usePartnerProfile();const { Icon, wrapperClass } = getPayoutMethodIconConfig(method.type);return (<>@@ -170,11 +176,15 @@ function SelectedMethodDisplay({<span className="block text-xs font-medium text-neutral-900">{method.label}</span>- {method.default && (- <span className="rounded bg-green-100 px-1.5 py-0.5 text-xs font-medium text-green-700">+ {!partner?.payoutsEnabledAt ? (+ <span className="rounded bg-red-100 px-1.5 py-0.5 text-[0.7rem] font-medium leading-none text-red-700">+ Restricted+ </span>+ ) : method.default ? (+ <span className="rounded bg-green-100 px-1.5 py-0.5 text-[0.7rem] font-medium leading-none text-green-700">Default</span>- )}+ ) : null}</div><span className="block truncate text-xs text-neutral-500">{method.identifier ?? "Not connected"}diff --git a/packages/ui/src/tooltip.tsx b/packages/ui/src/tooltip.tsxindex 69af90ca6d..1e834fa54a 100644--- a/packages/ui/src/tooltip.tsx+++ b/packages/ui/src/tooltip.tsx@@ -36,14 +36,23 @@ const TooltipMarkdown = ({className,)}components={{- a: ({ node, ...props }) => (- <a- {...props}- target="_blank"- rel="noopener noreferrer"- onClick={(e) => e.stopPropagation()}- />- ),+ a: ({ node, ...props }) => {+ if (props.href?.startsWith("/")) {+ return (+ <Link href={props.href} onClick={(e) => e.stopPropagation()}>+ {props.children}+ </Link>+ );+ }+ return (+ <a+ {...props}+ target="_blank"+ rel="noopener noreferrer"+ onClick={(e) => e.stopPropagation()}+ />+ );+ },code: ({ node, ...props }) => (<code {...props} className="rounded-md bg-neutral-100 px-1 py-0.5" />),