Merge branch 'main' into bulk-partner-invite

Author: steven-tey

apps/web/app/(ee)/api/cron/payouts/balance-available/route.ts

@@ -36,6 +36,7 @@ export async function POST(req: Request) {
         stripeConnectId: stripeAccount,
       },
       select: {
+        id: true,
         email: true,
       },
     });
@@ -156,17 +157,29 @@ export async function POST(req: Request) {
       limit: 100,
     });
 
-    // update all payouts that match the following criteria to have the stripePayoutId:
+    // update all payouts for the partner that match the following criteria to have the stripePayoutId:
     // - in the "sent" status
-    // - have a stripe transfer id (meaning it was transferred to this connected account)
     // - no stripe payout id (meaning it was not yet withdrawn to the connected bank account)
+    // - have a stripe transfer id (meaning it was transferred to this connected account)
+    // OR: payouts that are in the "failed" status + have a stripePayoutId (failed to send before)
     const updatedPayouts = await prisma.payout.updateMany({
       where: {
-        status: "sent",
-        stripePayoutId: null,
-        stripeTransferId: {
-          in: transfers.data.map(({ id }) => id),
-        },
+        partnerId: partner.id,
+        OR: [
+          {
+            status: "sent",
+            stripePayoutId: null,
+            stripeTransferId: {
+              in: transfers.data.map(({ id }) => id),
+            },
+          },
+          {
+            status: "failed",
+            stripePayoutId: {
+              not: null,
+            },
+          },
+        ],
       },
       data: {
         stripePayoutId: stripePayout.id,

apps/web/app/(ee)/api/network/programs/route.ts

@@ -113,19 +113,23 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
 
   return NextResponse.json(
     z.array(NetworkProgramSchema).parse(
-      programs.map((program) => ({
-        ...program,
-        rewards:
-          program.groups.length > 0
-            ? [
-                program.groups[0].clickReward,
-                program.groups[0].leadReward,
-                program.groups[0].saleReward,
-              ].filter(Boolean)
-            : [],
-        discount: program.groups.length > 0 ? program.groups[0].discount : null,
-        categories: program.categories.map(({ category }) => category),
-      })),
+      programs
+        // if requesting featured programs, randomize the order
+        .sort(() => (featured ? Math.random() - 0.5 : 0))
+        .map((program) => ({
+          ...program,
+          rewards:
+            program.groups.length > 0
+              ? [
+                  program.groups[0].clickReward,
+                  program.groups[0].leadReward,
+                  program.groups[0].saleReward,
+                ].filter(Boolean)
+              : [],
+          discount:
+            program.groups.length > 0 ? program.groups[0].discount : null,
+          categories: program.categories.map(({ category }) => category),
+        })),
     ),
   );
 });

apps/web/app/(ee)/api/track/open/route.ts

@@ -29,6 +29,7 @@ export const POST = withAxiom(async (req) => {
     const identityHash = await getIdentityHash(req);
 
     if (!deepLinkUrl) {
+      // Probabilistic IP-based tracking
       if (ip) {
         // if ip address is present, check if there's a cached click
         console.log(`Checking cache for ${ip}:${dubDomain}:*`);
@@ -105,9 +106,16 @@ export const POST = withAxiom(async (req) => {
       });
     }
 
+    const linkData = {
+      id: cachedLink.id,
+      domain,
+      key,
+      url: cachedLink.url,
+    };
+
     // if there's no cached clickId, track the click event
     if (!cachedClickId) {
-      await recordClick({
+      const clickData = await recordClick({
         req,
         clickId,
         workspaceId: cachedLink.projectId,
@@ -121,16 +129,22 @@ export const POST = withAxiom(async (req) => {
         shouldCacheClickId: true,
         trigger: "deeplink",
       });
+
+      // return early with clickId = null if no click data was recorded (bot detected)
+      if (!clickData) {
+        return NextResponse.json(
+          trackOpenResponseSchema.parse({
+            clickId: null,
+            link: linkData,
+          }),
+          { headers: COMMON_CORS_HEADERS },
+        );
+      }
     }
 
     const response = trackOpenResponseSchema.parse({
       clickId,
-      link: {
-        id: cachedLink.id,
-        domain,
-        key,
-        url: cachedLink.url,
-      },
+      link: linkData,
     });
 
     return NextResponse.json(response, { headers: COMMON_CORS_HEADERS });

apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/page.tsx

@@ -8,7 +8,8 @@ import { ProgramCategory } from "@/ui/partners/program-marketplace/program-categ
 import { ProgramRewardsDisplay } from "@/ui/partners/program-marketplace/program-rewards-display";
 import { prisma } from "@dub/prisma";
 import { ChevronRight, Shop, Tooltip } from "@dub/ui";
-import { OG_AVATAR_URL, cn } from "@dub/utils";
+import { Globe } from "@dub/ui/icons";
+import { OG_AVATAR_URL, cn, getDomainWithoutWWW } from "@dub/utils";
 import Link from "next/link";
 import { redirect } from "next/navigation";
 import { ProgramStatusBadge } from "../program-status-badge";
@@ -128,7 +129,9 @@ export default async function MarketplaceProgramPage(props: {
                   <span
                     className={cn(
                       "block text-xs font-medium",
-                      isDarkImage && "text-content-inverted/70",
+                      isDarkImage
+                        ? "text-content-inverted"
+                        : "text-neutral-400",
                     )}
                   >
                     Rewards
@@ -147,7 +150,9 @@ export default async function MarketplaceProgramPage(props: {
                   <span
                     className={cn(
                       "block text-xs font-medium",
-                      isDarkImage && "text-content-inverted/70",
+                      isDarkImage
+                        ? "text-content-inverted"
+                        : "text-neutral-400",
                     )}
                   >
                     Category
@@ -191,6 +196,29 @@ export default async function MarketplaceProgramPage(props: {
                   </div>
                 </div>
               )}
+              {program.url && (
+                <div className="min-w-0">
+                  <span className="block text-xs font-medium text-neutral-400">
+                    Website
+                  </span>
+                  <Link
+                    href={program.url}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className={cn(
+                      "mt-1 flex max-w-[220px] items-center gap-1.5 text-sm font-medium",
+                      isDarkImage
+                        ? "text-content-inverted/90 hover:text-content-inverted"
+                        : "text-content-default hover:text-content-emphasis",
+                    )}
+                  >
+                    <Globe className="size-4 shrink-0" />
+                    <span className="truncate">
+                      {getDomainWithoutWWW(program.url)} ↗
+                    </span>
+                  </Link>
+                </div>
+              )}
             </div>
           </div>
         </div>

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx

@@ -1,6 +1,6 @@
 import { usePartnerMessagesCount } from "@/lib/swr/use-partner-messages-count";
 import usePartnersCount from "@/lib/swr/use-partners-count";
-import usePayoutsCount from "@/lib/swr/use-payouts-count";
+import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { ProgramOverviewCard } from "@/ui/partners/overview/program-overview-card";
 import { MoneyBills2, Msgs, UserCheck } from "@dub/ui";
@@ -21,6 +21,7 @@ export function OverviewTasks() {
   } = usePayoutsCount<number | undefined>({
     eligibility: "eligible",
     status: "pending",
+    ignoreParams: true,
   });
 
   const { count: unreadMessagesCount, isLoading: unreadMessagesLoading } =

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { clientAccessCheck } from "@/lib/client-access-check";
-import usePayoutsCount from "@/lib/swr/use-payouts-count";
+import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { PayoutsCount } from "@/lib/types";
 import { ConfirmPayoutsSheet } from "@/ui/partners/confirm-payouts-sheet";

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx

@@ -2,7 +2,7 @@
 
 import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import { useFraudGroupCount } from "@/lib/swr/use-fraud-groups-count";
-import usePayoutsCount from "@/lib/swr/use-payouts-count";
+import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
 import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { FraudGroupCountByPartner, PayoutResponse } from "@/lib/types";

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx

@@ -1,5 +1,5 @@
 import usePartners from "@/lib/swr/use-partners";
-import usePayoutsCount from "@/lib/swr/use-payouts-count";
+import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
 import { EnrolledPartnerProps, PayoutsCount } from "@/lib/types";
 import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";
 import { useRouterStuff } from "@dub/ui";

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx

@@ -71,9 +71,9 @@ export default function PlanUsage() {
   const { users } = useWorkspaceUsers();
 
   const { partnersCount } = usePartnersCount<number>({
-    programId: defaultProgramId ?? undefined,
     status: "approved",
     ignoreParams: true,
+    enabled: Boolean(defaultProgramId),
   });
 
   const { groupsCount } = useGroupsCount();

apps/web/app/app.dub.co/(dashboard)/[slug]/links/page-client.tsx

@@ -228,10 +228,7 @@ function WorkspaceLinks() {
               </div>
 
               {isLoading ? (
-                <div className="flex grow-0 animate-pulse items-center space-x-2">
-                  <div className="h-10 w-24 rounded-md bg-neutral-200" />
-                  <div className="h-10 w-10 rounded-md bg-neutral-200" />
-                </div>
+                <div className="h-10 w-[2.125rem] animate-pulse rounded-md bg-neutral-200" />
               ) : canCreateLinks ? (
                 <MoreLinkOptions />
               ) : (