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 payout description

Steven Tey0011d7b666dc
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx
index 40313082fc..cd455b9fa6 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx
@@ -1,3 +1,4 @@
+import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";
import {
BELOW_MIN_WITHDRAWAL_FEE_CENTS,
INVOICE_AVAILABLE_PAYOUT_STATUSES,
@@ -5,15 +6,12 @@ import {
PAYOUTS_SHEET_ITEMS_LIMIT,
STABLECOIN_PAYOUT_FEE_RATE,
} from "@/lib/constants/payouts";
-import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import { PartnerEarningsResponse, PartnerPayoutResponse } from "@/lib/types";
import { CustomerAvatar } from "@/ui/customers/customer-avatar";
import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
import { CommissionDescriptionLabel } from "@/ui/partners/commission-description-label";
-import {
- CommissionTypeBadge,
-} from "@/ui/partners/commission-type-badge";
+import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";
import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";
import { ConditionalLink } from "@/ui/shared/conditional-link";
import { X } from "@/ui/shared/icons";
@@ -38,6 +36,7 @@ import {
fetcher,
formatDateTime,
formatDateTimeSmart,
+ NETWORK_PROGRAM_ID,
OG_AVATAR_URL,
} from "@dub/utils";
import { formatPeriod } from "@dub/utils/src/functions/datetime";
@@ -71,7 +70,7 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
isLoading,
error,
} = useSWR<PartnerEarningsResponse[]>(
- partner
+ partner && payout.program.id !== NETWORK_PROGRAM_ID
? `/api/partner-profile/programs/${payout.program.id}/earnings?payoutId=${payout.id}&interval=all&pageSize=${PAYOUTS_SHEET_ITEMS_LIMIT}`
: undefined,
fetcher,
@@ -141,7 +140,7 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
},
...(payout.method === "stablecoin" ||
- payout.amount < MIN_WITHDRAWAL_AMOUNT_CENTS
+ (payout.amount > 0 && payout.amount < MIN_WITHDRAWAL_AMOUNT_CENTS)
? [
{
key: "Fee",
@@ -180,7 +179,11 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
{
key: "Description",
value: payout.description ? (
- <Tooltip content={payout.description}>
+ <Tooltip
+ content={formatCommissionDescriptionTooltip(payout.description, {
+ variant: "partner",
+ })}
+ >
<span className="block truncate">{payout.description}</span>
</Tooltip>
) : (
@@ -388,9 +391,6 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
<div className="flex grow flex-col">
<div className="flex flex-col gap-4 p-6">
- <div className="text-base font-medium text-neutral-900">
- Invoice details
- </div>
<div className="grid grid-cols-[minmax(0,auto)_minmax(0,1fr)] gap-3 text-sm">
{invoiceData.map(({ key, value, tooltip }) => (
<Fragment key={key}>
@@ -409,7 +409,9 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
{key}
</div>
</DynamicTooltipWrapper>
- <div className="min-w-0 overflow-hidden text-neutral-800">{value}</div>
+ <div className="min-w-0 overflow-hidden text-neutral-800">
+ {value}
+ </div>
</Fragment>
))}
</div>
@@ -426,17 +428,19 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
) : null}
</div>
- <div className="sticky bottom-0 z-10 border-t border-neutral-200 bg-white">
- <div className="flex items-center justify-between gap-2 p-5">
- <Link
- href={`/programs/${payout.program.slug}/earnings?payoutId=${payout.id}&interval=all`}
- target="_blank"
- className="w-full"
- >
- <Button variant="secondary" text="View all" />
- </Link>
+ {payout.program.id !== NETWORK_PROGRAM_ID && (
+ <div className="sticky bottom-0 z-10 border-t border-neutral-200 bg-white">
+ <div className="flex items-center justify-between gap-2 p-5">
+ <Link
+ href={`/programs/${payout.program.slug}/earnings?payoutId=${payout.id}&interval=all`}
+ target="_blank"
+ className="w-full"
+ >
+ <Button variant="secondary" text="View all" />
+ </Link>
+ </div>
</div>
- </div>
+ )}
</div>
);
}
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 2f63ec32cf..df62514a94 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
@@ -1,5 +1,6 @@
"use client";
+import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";
import { INVOICE_AVAILABLE_PAYOUT_STATUSES } from "@/lib/constants/payouts";
import usePartnerPayouts from "@/lib/swr/use-partner-payouts";
import usePartnerPayoutsCount from "@/lib/swr/use-partner-payouts-count";
@@ -282,6 +283,21 @@ function PartnerPayoutFilters() {
function AmountRowItem({ payout }: { payout: PartnerPayoutResponse }) {
const display = currencyFormatter(payout.amount);
+ // for clawback payouts with description
+ if (payout.amount < 0 && payout.description) {
+ return (
+ <Tooltip
+ content={formatCommissionDescriptionTooltip(payout.description, {
+ variant: "partner",
+ })}
+ >
+ <span className="cursor-help truncate text-red-600 underline decoration-dotted underline-offset-2">
+ {display}
+ </span>
+ </Tooltip>
+ );
+ }
+
if (
payout.status === PayoutStatus.pending &&
payout.amount < payout.program.minPayoutAmount
diff --git a/apps/web/lib/zod/schemas/program-network.ts b/apps/web/lib/zod/schemas/program-network.ts
index d01bc66ec3..6703877f51 100644
--- a/apps/web/lib/zod/schemas/program-network.ts
+++ b/apps/web/lib/zod/schemas/program-network.ts
@@ -69,6 +69,8 @@ export const getNetworkProgramsQuerySchema = z
export const getNetworkProgramsCountQuerySchema = getNetworkProgramsQuerySchema
.omit({
+ sortBy: true,
+ sortOrder: true,
page: true,
pageSize: true,
})