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.

Marketplace enrollment check (#4086)

Pedro Ladeira0d95d4bc1c4a
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/apply/program-sidebar.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/apply/program-sidebar.tsx
index 581864b2b8..6a7f57799d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/apply/program-sidebar.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/apply/program-sidebar.tsx
@@ -77,6 +77,7 @@ export function ProgramSidebar({
},
});
const { programEnrollment } = useProgramEnrollment({
+ programSlug: program.slug,
swrOpts: {
keepPreviousData: true,
shouldRetryOnError: (err) => err.status !== 404,
@@ -262,7 +263,10 @@ export function ProgramSidebar({
</div>
{applicationRequirements && applicationRequirements.length ? (
- <ProgramEligibilityCard requirements={applicationRequirements} />
+ <ProgramEligibilityCard
+ programSlug={program.slug}
+ requirements={applicationRequirements}
+ />
) : null}
<Button
diff --git a/apps/web/lib/swr/use-program-enrollment.ts b/apps/web/lib/swr/use-program-enrollment.ts
index 36a5343ec7..3a74f38876 100644
--- a/apps/web/lib/swr/use-program-enrollment.ts
+++ b/apps/web/lib/swr/use-program-enrollment.ts
@@ -10,13 +10,16 @@ import { ProgramEnrollmentProps } from "../types";
export default function useProgramEnrollment({
enabled = true,
+ programSlug: programSlugProp,
swrOpts,
}: {
enabled?: boolean;
+ programSlug?: string;
swrOpts?: SWRConfiguration;
} = {}) {
const { data: session, status } = useSession();
- const { programSlug } = useParams();
+ const { programSlug: programSlugParam } = useParams();
+ const programSlug = programSlugProp ?? programSlugParam;
const partnerId = session?.user?.["defaultPartnerId"];
diff --git a/apps/web/ui/partners/program-eligibility-card.tsx b/apps/web/ui/partners/program-eligibility-card.tsx
index e5f3c1ceb9..40b9c5d93d 100644
--- a/apps/web/ui/partners/program-eligibility-card.tsx
+++ b/apps/web/ui/partners/program-eligibility-card.tsx
@@ -47,11 +47,13 @@ function formatConditionContent(
}
export function ProgramEligibilityCard({
+ programSlug,
requirements: requirementsProp,
}: {
+ programSlug?: string;
requirements?: EligibilityConditionDB[] | null;
} = {}) {
- const { programEnrollment } = useProgramEnrollment();
+ const { programEnrollment } = useProgramEnrollment({ programSlug });
const { partner, loading } = usePartnerProfile();
const requirements =
diff --git a/apps/web/ui/program-marketplace/marketplace-program-detail-body.tsx b/apps/web/ui/program-marketplace/marketplace-program-detail-body.tsx
index 8f522579d5..f00403c1a2 100644
--- a/apps/web/ui/program-marketplace/marketplace-program-detail-body.tsx
+++ b/apps/web/ui/program-marketplace/marketplace-program-detail-body.tsx
@@ -31,6 +31,7 @@ export function MarketplaceProgramDetailBody({
{showEligibilityCard && program.applicationRequirements?.length ? (
<ProgramEligibilityCard
+ programSlug={program.slug}
requirements={program.applicationRequirements}
/>
) : null}
diff --git a/apps/web/ui/program-marketplace/marketplace-program-header-controls.tsx b/apps/web/ui/program-marketplace/marketplace-program-header-controls.tsx
index 24889715a7..83bdaba8ee 100644
--- a/apps/web/ui/program-marketplace/marketplace-program-header-controls.tsx
+++ b/apps/web/ui/program-marketplace/marketplace-program-header-controls.tsx
@@ -16,7 +16,7 @@ import { Button, ProgressCircle, useKeyboardShortcut } from "@dub/ui";
import { cn } from "@dub/utils";
import { useAction } from "next-safe-action/hooks";
import Link from "next/link";
-import { useParams, useRouter } from "next/navigation";
+import { useRouter } from "next/navigation";
import { ReactNode } from "react";
import { toast } from "sonner";
@@ -25,11 +25,10 @@ export function MarketplaceProgramHeaderControls({
}: {
program: NetworkProgramProps;
}) {
- const { programSlug } = useParams();
const { programEnrollments } = useProgramEnrollments();
const programEnrollmentStatus = programEnrollments?.find(
- (programEnrollment) => programEnrollment.program.slug === programSlug,
+ (programEnrollment) => programEnrollment.program.slug === program.slug,
)?.status;
if (programEnrollmentStatus === "invited") {
@@ -57,7 +56,9 @@ function ApplyButton({ program }: { program: NetworkProgramProps }) {
const { partner, mutate } = usePartnerProfile();
- const { programEnrollment } = useProgramEnrollment();
+ const { programEnrollment } = useProgramEnrollment({
+ programSlug: program.slug,
+ });
const { completedCount, totalCount, isComplete } =
getNetworkProfileChecklistProgress({