Skip to content

[pull] main from dubinc:main #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
May 7, 2026
Merged

[pull] main from dubinc:main #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1f9ca9
Safari fix (#3865)
marcusljf May 6, 2026
5973a95
rearrange analytics internal backlink
steven-tey May 6, 2026
9e3701e
Add `hideEarnings` prop in referral embed (#3868)
steven-tey May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ export function ReferralsEmbedPageClient({

const programEmbedData = programEmbedSchema.parse(program.embedData);

const termsHref =
(programEmbedData?.customTermsUrl || program.termsUrl) ?? undefined;

const hasResources =
resources &&
["logos", "colors", "files"].some(
Expand All @@ -174,7 +177,7 @@ export function ReferralsEmbedPageClient({
() => [
...(showQuickstart ? ["Quickstart"] : []),
...(activeBountiesCount > 0 ? ["Bounties"] : []),
"Earnings",
...(!programEmbedData?.hideEarnings ? ["Earnings"] : []),
...(group.additionalLinks.length > 0 ? ["Links"] : []),
...(programEmbedData?.leaderboard?.mode === "disabled"
? []
Expand Down Expand Up @@ -248,9 +251,9 @@ export function ReferralsEmbedPageClient({
<span className="text-content-emphasis text-base font-semibold leading-none">
Rewards
</span>
{program.termsUrl && (
{termsHref && (
<a
href={program.termsUrl}
href={termsHref}
target="_blank"
className="text-content-subtle text-xs font-medium leading-none underline-offset-2 hover:underline"
>
Expand All @@ -261,8 +264,14 @@ export function ReferralsEmbedPageClient({
<div className="text-content-emphasis relative mt-4 text-lg">
<ProgramRewardList rewards={rewards} discount={discount} />
<ProgramRewardTerms
minPayoutAmount={program.minPayoutAmount}
holdingPeriodDays={group.holdingPeriodDays ?? 0}
minPayoutAmount={
programEmbedData?.hideEarnings ? 0 : program.minPayoutAmount
}
holdingPeriodDays={
programEmbedData?.hideEarnings
? 0
: group.holdingPeriodDays ?? 0
}
/>
</div>
</div>
Expand All @@ -281,9 +290,18 @@ export function ReferralsEmbedPageClient({
</div>
)}
</div>
<div className="mt-4 grid gap-2 sm:h-32 sm:grid-cols-3">
<div
className={cn(
"mt-4 grid gap-2 sm:h-32 sm:grid-cols-3",
programEmbedData?.hideEarnings
? "sm:grid-cols-1"
: "sm:grid-cols-3",
)}
>
<ReferralsEmbedActivity />
<ReferralsEmbedEarningsSummary />
{!programEmbedData?.hideEarnings && (
<ReferralsEmbedEarningsSummary />
)}
</div>
<div className="mt-4">
<div className="border-border-subtle flex items-center border-b">
Expand Down
204 changes: 183 additions & 21 deletions apps/web/app/(ee)/app.dub.co/embed/referrals/quickstart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
import { programEmbedSchema } from "@/lib/zod/schemas/program-embed";
import {
Button,
Carousel,
Expand All @@ -23,9 +24,10 @@ export function ReferralsEmbedQuickstart({
setSelectedTab,
}: {
hasResources: boolean;
setSelectedTab: (tab: "Links" | "Resources") => void;
setSelectedTab: (tab: "Links" | "Resources" | "FAQ") => void;
}) {
const { program, group, links, earnings } = useReferralsEmbedData();
const programEmbedData = programEmbedSchema.parse(program.embedData);

const [copied, copyToClipboard] = useCopyToClipboard();
const { isMobile } = useMediaQuery();
Expand Down Expand Up @@ -99,26 +101,46 @@ export function ReferralsEmbedQuickstart({
/>
),
},
{
title: "Receive earnings",
description:
"Connect payouts to get rewarded for the activity you drive, with earnings tracked automatically.",
illustration: <ConnectPayouts logo={group.logo ?? DUB_LOGO} />,
cta: (
<Button
className={payoutsDisabled ? "h-9 rounded-lg" : BUTTON_CLASSNAME}
disabledTooltip={
payoutsDisabled
? "You will be able to withdraw your earnings once you have made at least one sale."
: undefined
}
onClick={() =>
window.open("https://partners.dub.co/payouts", "_blank")
}
text="Connect payouts"
/>
),
},
...(programEmbedData?.hideEarnings
? [
{
title: "Browse the FAQ",
description:
"Find answers about this program, how referrals are tracked, and what happens after you share your link.",
illustration: <FaqAccordionList />,
cta: (
<Button
className="h-9 rounded-lg"
text="View FAQs"
onClick={() => setSelectedTab("FAQ")}
/>
),
},
]
: [
{
title: "Receive earnings",
description:
"Connect payouts to get rewarded for the activity you drive, with earnings tracked automatically.",
illustration: <ConnectPayouts logo={group.logo ?? DUB_LOGO} />,
cta: (
<Button
className={
payoutsDisabled ? "h-9 rounded-lg" : BUTTON_CLASSNAME
}
disabledTooltip={
payoutsDisabled
? "You will be able to withdraw your earnings once you have made at least one sale."
: undefined
}
onClick={() =>
window.open("https://partners.dub.co/payouts", "_blank")
}
text="Connect payouts"
/>
),
},
]),
];

return (
Expand Down Expand Up @@ -175,6 +197,146 @@ const BG_DEFAULT = "rgb(var(--bg-default))";
const BORDER_SUBTLE = "rgb(var(--border-subtle))";
const CONTENT_SUBTLE = "rgb(var(--content-subtle))";

/** Accordion-style FAQ list illustration (matches 194×121 quickstart art). */
const FaqAccordionList = () => (
<svg
width="194"
height="121"
viewBox="0 0 194 121"
fill="none"
xmlns="http://www.w3.org/2000/svg"
className="h-auto w-full"
aria-hidden
>
<rect width="194" height="121" fill={BG_MUTED} />
<rect
x="20.5"
y="11.5"
width="153"
height="98"
rx="10.5"
fill={BG_DEFAULT}
stroke={BORDER_SUBTLE}
/>
{/* Expanded item — header */}
<rect x="28" y="19" width="138" height="18" rx="5" fill={BG_MUTED} />
<rect
x="36"
y="25.5"
width="72"
height="3"
rx="1.5"
fill={CONTENT_SUBTLE}
opacity={0.45}
/>
<rect
x="36"
y="31"
width="48"
height="3"
rx="1.5"
fill={CONTENT_SUBTLE}
opacity={0.32}
/>
{/* × — expanded (rotated +) */}
<path
d="M155.25 25.25l5.5 5.5M160.75 25.25l-5.5 5.5"
stroke={CONTENT_SUBTLE}
strokeWidth="1.25"
strokeLinecap="round"
/>
{/* Expanded item — answer body */}
<rect
x="28"
y="39"
width="138"
height="22"
rx="5"
fill={BG_DEFAULT}
stroke={BORDER_SUBTLE}
/>
<rect
x="36"
y="46"
width="98"
height="2.5"
rx="1.25"
fill={CONTENT_SUBTLE}
opacity={0.38}
/>
<rect
x="36"
y="52"
width="76"
height="2.5"
rx="1.25"
fill={CONTENT_SUBTLE}
opacity={0.28}
/>
<rect
x="36"
y="58"
width="56"
height="2.5"
rx="1.25"
fill={CONTENT_SUBTLE}
opacity={0.22}
/>
{/* Collapsed row 2 */}
<rect
x="28"
y="65"
width="138"
height="17"
rx="5"
fill={BG_DEFAULT}
stroke={BORDER_SUBTLE}
/>
<rect
x="36"
y="72"
width="68"
height="3"
rx="1.5"
fill={CONTENT_SUBTLE}
opacity={0.42}
/>
{/* + — collapsed */}
<path
d="M155.25 73.5h5.5M158 71.25v5.5"
stroke={CONTENT_SUBTLE}
strokeWidth="1.25"
strokeLinecap="round"
/>
{/* Collapsed row 3 */}
<rect
x="28"
y="86"
width="138"
height="17"
rx="5"
fill={BG_DEFAULT}
stroke={BORDER_SUBTLE}
/>
<rect
x="36"
y="93"
width="58"
height="3"
rx="1.5"
fill={CONTENT_SUBTLE}
opacity={0.38}
/>
{/* + — collapsed */}
<path
d="M155.25 94.5h5.5M158 92.25v5.5"
stroke={CONTENT_SUBTLE}
strokeWidth="1.25"
strokeLinecap="round"
/>
</svg>
);

const ShareLink = () => {
return (
<svg
Expand Down
28 changes: 0 additions & 28 deletions ...b/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-menu-popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
"use client";

import useWorkspace from "@/lib/swr/use-workspace";
import { useExportCommissionsModal } from "@/ui/modals/export-commissions-modal";
import { ThreeDots } from "@/ui/shared/icons";
import {
Button,
ChartLine,
Download,
IconMenu,
Popover,
Refresh2,
useRouterStuff,
} from "@dub/ui";
import Link from "next/link";
import { useState } from "react";
import { useCreateClawbackSheet } from "./create-clawback-sheet";

export function CommissionsMenuPopover() {
const [openPopover, setOpenPopover] = useState(false);
const { slug } = useWorkspace();
const { getQueryString } = useRouterStuff();

const { createClawbackSheet, setIsOpen: setClawbackSheetOpen } =
useCreateClawbackSheet({});

Expand All @@ -47,27 +40,6 @@ export function CommissionsMenuPopover() {
icon={<Refresh2 className="size-4" />}
/>
</button>
<Link
href={`/${slug}/program/analytics/commissions${getQueryString(
undefined,
{
include: [
"interval",
"start",
"end",
"partnerId",
"groupId",
"type",
],
},
)}`}
className="w-full rounded-md p-2 hover:bg-neutral-100 active:bg-neutral-200"
>
<IconMenu
text="View analytics"
icon={<ChartLine className="size-4" />}
/>
</Link>
</div>

<div className="border-t border-neutral-200" />
Expand Down
Loading
Loading