Skip to content

[pull] main from dubinc:main #782

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 6 commits into from
May 8, 2026
Merged

[pull] main from dubinc:main #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c69a77d
remove unused script
steven-tey May 7, 2026
c446d4d
Skip invalid subscription status in `customer.subscription.updated` (…
steven-tey May 7, 2026
8f3632e
exclude program payout reminders
steven-tey May 7, 2026
a19a54d
Add `max_commissions` (#3870)
pepeladeira May 8, 2026
1d3c527
add scripts
steven-tey May 8, 2026
a0f8ebc
Add Android deep link interstitial (#3836)
pepeladeira May 8, 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
6 changes: 5 additions & 1 deletion apps/web/app/(ee)/api/cron/payouts/reminders/partners/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ async function handler(req: Request) {
in: ["pending", "processing", "processed", "failed"],
},
programId: {
not: ACME_PROGRAM_ID,
notIn: [
ACME_PROGRAM_ID,
// programs that are in the migration process
"prog_1KPAZMF49X9A1WEWRBM55KZY7",
],
},
partner: {
payoutsEnabledAt: null,
Expand Down
11 changes: 5 additions & 6 deletions apps/web/app/(ee)/api/stripe/webhook/customer-subscription-updated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ export async function customerSubscriptionUpdated(
return `Invalid price ID in customer.subscription.updated event: ${priceId}`;
}

if (!["active", "trialing"].includes(updatedSubscription.status)) {
return `Invalid updated subscription status "${updatedSubscription.status}" for subscription ${updatedSubscription.id}, skipping...`;
}

const stripeId = updatedSubscription.customer.toString();

const workspace = await prisma.project.findUnique({
Expand Down Expand Up @@ -57,12 +61,7 @@ export async function customerSubscriptionUpdated(
subscription: updatedSubscription,
});

const subscriptionCanceled =
(updatedSubscription.status === "active" ||
updatedSubscription.status === "trialing") &&
updatedSubscription.cancel_at_period_end;

if (subscriptionCanceled) {
if (updatedSubscription.cancel_at_period_end) {
const owners = workspace.users.map(({ user }) => user);
const cancelReason = updatedSubscription.cancellation_details?.feedback;

Expand Down
189 changes: 89 additions & 100 deletions apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { notFound, redirect } from "next/navigation";
import { CSSProperties } from "react";
import { ApplyHeader } from "../../header";
import { CTAButtons } from "./cta-buttons";
import { PixelConversion } from "./pixel-conversion";
import { Screenshot } from "./screenshot";

export const dynamic = "force-dynamic";
Expand Down Expand Up @@ -85,111 +84,101 @@ export default async function SuccessPage(props: {
const hasPartnerProfile = !!enrollmentId;

return (
<>
{program.slug === "perplexity" && <PixelConversion />}
<div
className="relative"
style={
{
"--brand": program.group.brandColor || "#000000",
"--brand-ring": "rgb(from var(--brand) r g b / 0.2)",
} as CSSProperties
}
>
<ApplyHeader
group={program.group}
showLogin={false}
showApply={false}
/>
<div className="p-6">
<div className="grid grid-cols-1 gap-5 sm:pt-20">
<span className="w-fit rounded-md bg-neutral-100 px-2 py-1 text-xs font-medium text-neutral-700">
Step 2 of 2
</span>
<h1 className="text-4xl font-semibold">
{hasPartnerProfile
? "Application submitted"
: "Finish your application"}
</h1>
<div className="flex flex-col gap-4 text-base text-neutral-700">
{hasPartnerProfile && (
<p>
Your application has been submitted for review.
{application && (
<>
{" "}
You'll receive an update at{" "}
<strong className="font-semibold">
{application.email}
</strong>
.
</>
)}
</p>
)}
{!hasPartnerProfile && (
<p>
Your application to{" "}
<strong className="font-semibold">{program.name}</strong> has
been saved, but you still need to create your{" "}
<strong className="font-semibold">Dub Partners</strong>{" "}
account to complete your application.
<br />
<br />
Once you create your account, your application will be
submitted to <b>{program.name}</b> and you'll hear back from
them{" "}
<strong className="font-semibold">
{application?.email
? `at ${application.email}`
: "via email"}
</strong>
.
</p>
)}
</div>
</div>

{/* Buttons */}
<div className="mt-12 flex flex-col gap-3">
<CTAButtons />
<div
className="relative"
style={
{
"--brand": program.group.brandColor || "#000000",
"--brand-ring": "rgb(from var(--brand) r g b / 0.2)",
} as CSSProperties
}
>
<ApplyHeader group={program.group} showLogin={false} showApply={false} />
<div className="p-6">
<div className="grid grid-cols-1 gap-5 sm:pt-20">
<span className="w-fit rounded-md bg-neutral-100 px-2 py-1 text-xs font-medium text-neutral-700">
Step 2 of 2
</span>
<h1 className="text-4xl font-semibold">
{hasPartnerProfile
? "Application submitted"
: "Finish your application"}
</h1>
<div className="flex flex-col gap-4 text-base text-neutral-700">
{hasPartnerProfile && (
<p>
Your application has been submitted for review.
{application && (
<>
{" "}
You'll receive an update at{" "}
<strong className="font-semibold">
{application.email}
</strong>
.
</>
)}
</p>
)}
{!hasPartnerProfile && (
<p>
Your application to{" "}
<strong className="font-semibold">{program.name}</strong> has
been saved, but you still need to create your{" "}
<strong className="font-semibold">Dub Partners</strong> account
to complete your application.
<br />
<br />
Once you create your account, your application will be submitted
to <b>{program.name}</b> and you'll hear back from them{" "}
<strong className="font-semibold">
{application?.email ? `at ${application.email}` : "via email"}
</strong>
.
</p>
)}
</div>
</div>

{/* Screenshot */}
<div className="relative mt-16">
<Screenshot
program={{ name: program.name, logo: program.logo }}
className="h-auto w-full [mask-image:linear-gradient(black_80%,transparent)]"
/>
<div className="absolute bottom-0 left-1/2 -translate-x-1/2">
<div className="absolute -inset-[50%] rounded-full bg-white blur-lg" />

{programSlug !== "dub" && (
<div className="relative flex items-center gap-2 rounded-full border border-neutral-100 bg-gradient-to-b from-white to-neutral-50 p-2 shadow-[0_8px_28px_0_#00000017]">
<img
className="size-10 shrink-0 rounded-full"
src={program.logo || `${OG_AVATAR_URL}${program.name}`}
alt={`${program.name} logo`}
/>
<BoltFill className="shrink-0 text-[var(--brand)] opacity-30" />
<Logo className="size-10 shrink-0" />
</div>
)}
</div>
</div>
{/* Buttons */}
<div className="mt-12 flex flex-col gap-3">
<CTAButtons />
</div>

{/* Feature grid */}
<div className="mt-16 grid grid-cols-1 gap-10 sm:grid-cols-2">
{FEATURES.map(({ icon: Icon, title, description }) => (
<div key={title} className="flex flex-col gap-2.5 text-sm">
<Icon className="size-4 shrink-0 text-[var(--brand)]" />
<h3 className="font-semibold text-neutral-900">{title}</h3>
<p className="text-neutral-500">{description}</p>
{/* Screenshot */}
<div className="relative mt-16">
<Screenshot
program={{ name: program.name, logo: program.logo }}
className="h-auto w-full [mask-image:linear-gradient(black_80%,transparent)]"
/>
<div className="absolute bottom-0 left-1/2 -translate-x-1/2">
<div className="absolute -inset-[50%] rounded-full bg-white blur-lg" />

{programSlug !== "dub" && (
<div className="relative flex items-center gap-2 rounded-full border border-neutral-100 bg-gradient-to-b from-white to-neutral-50 p-2 shadow-[0_8px_28px_0_#00000017]">
<img
className="size-10 shrink-0 rounded-full"
src={program.logo || `${OG_AVATAR_URL}${program.name}`}
alt={`${program.name} logo`}
/>
<BoltFill className="shrink-0 text-[var(--brand)] opacity-30" />
<Logo className="size-10 shrink-0" />
</div>
))}
)}
</div>
</div>

{/* Feature grid */}
<div className="mt-16 grid grid-cols-1 gap-10 sm:grid-cols-2">
{FEATURES.map(({ icon: Icon, title, description }) => (
<div key={title} className="flex flex-col gap-2.5 text-sm">
<Icon className="size-4 shrink-0 text-[var(--brand)]" />
<h3 className="font-semibold text-neutral-900">{title}</h3>
<p className="text-neutral-500">{description}</p>
</div>
))}
</div>
</div>
</>
</div>
);
}
46 changes: 0 additions & 46 deletions ...p/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/pixel-conversion.tsx
View file
Open in desktop

This file was deleted.

Loading
Loading