The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Improve network eligibility status
Steven Tey1e65ea26708f
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-status-badge.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-status-badge.tsxindex b275d0e058..b862633bbf 100644--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-status-badge.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-status-badge.tsx@@ -21,8 +21,8 @@ export const ProgramNetworkStatusBadges = {};const notEligibleBadge = {- variant: "new" as const,- className: "text-blue-600 bg-blue-100",+ variant: "neutral" as const,+ className: "text-neutral-600 bg-neutral-100",icon: Lock,label: "Not eligible",};@@ -49,7 +49,9 @@ export function ProgramStatusBadge({const statusBadge = programEnrollmentStatus? ProgramNetworkStatusBadges[programEnrollmentStatus]- : reason === "requirementsNotMet"+ : (partner?.networkStatus &&+ !["approved", "trusted"].includes(partner.networkStatus)) ||+ reason === "requirementsNotMet"? notEligibleBadge: null;diff --git a/apps/web/ui/partners/partner-network/network-status-badges.ts b/apps/web/ui/partners/partner-network/network-status-badges.tsindex 33a916d9ce..0adb2729ec 100644--- a/apps/web/ui/partners/partner-network/network-status-badges.ts+++ b/apps/web/ui/partners/partner-network/network-status-badges.ts@@ -31,7 +31,8 @@ export const NetworkStatusBadges = {},rejected: {partnerTooltip: {- content: "Your Dub Partner Network application was rejected.",+ content:+ "Your Dub Partner Network application was not approved. You are not eligible to apply to this program.",cta: "Rejected",},label: "Rejected",diff --git a/apps/web/ui/partners/program-eligibility-card.tsx b/apps/web/ui/partners/program-eligibility-card.tsxindex f05c7fc715..32bb9f5dae 100644--- a/apps/web/ui/partners/program-eligibility-card.tsx+++ b/apps/web/ui/partners/program-eligibility-card.tsx@@ -4,39 +4,43 @@ import { evaluateCondition } from "@/lib/partners/evaluate-application-requiremeimport usePartnerProfile from "@/lib/swr/use-partner-profile";import useProgramEnrollment from "@/lib/swr/use-program-enrollment";import { EligibilityConditionDB } from "@/lib/types";+import { CountryFlag } from "@/ui/shared/country-flag";import { Lock } from "@dub/ui/icons";import { COUNTRIES } from "@dub/utils";+import { ReactNode } from "react";-function oxfordJoin(items: string[]): string {- if (items.length === 0) return "";- if (items.length === 1) return items[0];- if (items.length === 2) return `${items[0]} or ${items[1]}`;- return `${items.slice(0, -1).join(", ")}, or ${items[items.length - 1]}`;-}--function formatConditionText(condition: EligibilityConditionDB): string {+function formatConditionContent(+ condition: EligibilityConditionDB,+): ReactNode | null {if (condition.key === "country") {- const countryNames = condition.value.map((code) => COUNTRIES[code] ?? code);- const joined = oxfordJoin(countryNames);+ const intro =+ condition.operator === "is"+ ? "You can only apply to this program if you are from the following countries:"+ : "You cannot apply to this program if you are from the following countries:";- if (condition.operator === "is") {- return `Your country is ${joined}`;- } else {- return `Your country is not ${joined}`;- }+ return (+ <div className="space-y-2 text-sm text-blue-800">+ <p>{intro}</p>+ <div className="flex flex-wrap gap-1.5">+ {condition.value.map((code) => (+ <span+ key={code}+ className="inline-flex h-7 items-center gap-1.5 rounded-full bg-blue-100 px-2.5 text-xs font-medium text-blue-900"+ >+ <CountryFlag countryCode={code} className="size-3.5 rounded-full" />+ {COUNTRIES[code] ?? code}+ </span>+ ))}+ </div>+ </div>+ );}// emailDomain — commented out, preserved for future use// if (condition.key === "emailDomain") {- // const joined = oxfordJoin(condition.value);- // if (condition.operator === "is") {- // return `Your email domain is ${joined}`;- // } else {- // return `Your email domain is not ${joined}`;- // }- // }+ // ...- return "";+ return null;}export function ProgramEligibilityCard({@@ -67,9 +71,14 @@ export function ProgramEligibilityCard({}),);- const unmetWithText = unmet.map(formatConditionText).filter(Boolean);+ const unmetConditions = unmet+ .map((condition) => ({+ condition,+ content: formatConditionContent(condition),+ }))+ .filter(({ content }) => content !== null);- if (unmetWithText.length === 0) return null;+ if (unmetConditions.length === 0) return null;return (<div className="mt-4 space-y-3 rounded-[10px] border border-blue-200 bg-blue-50 p-4">@@ -78,11 +87,9 @@ export function ProgramEligibilityCard({Program eligibility</div>- <ul className="list-disc space-y-1 pl-5 text-sm text-blue-800">- {unmetWithText.map((text, i) => (- <li key={i}>{text}</li>- ))}- </ul>+ {unmetConditions.map(({ condition, content }) => (+ <div key={`${condition.key}-${condition.operator}`}>{content}</div>+ ))}</div>);}