Merge branch 'main' into link-page

Author: steven-tey

apps/web/app/api/programs/[programId]/payouts/route.ts

@@ -69,6 +69,7 @@ export const GET = withWorkspace(
       },
       include: {
         partner: true,
+        user: true,
         _count: {
           select: {
             commissions: true,

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

@@ -20,13 +20,19 @@ import {
   Popover,
   StatusBadge,
   Table,
+  Tooltip,
   usePagination,
   useRouterStuff,
   useTable,
 } from "@dub/ui";
 import { CircleCheck, Dots, MoneyBill2, MoneyBills2 } from "@dub/ui/icons";
-import { cn } from "@dub/utils";
-import { formatDate, formatPeriod } from "@dub/utils/src/functions/datetime";
+import {
+  cn,
+  DICEBEAR_AVATAR_URL,
+  formatDate,
+  formatDateTime,
+} from "@dub/utils";
+import { formatPeriod } from "@dub/utils/src/functions/datetime";
 import { fetcher } from "@dub/utils/src/functions/fetcher";
 import { Row } from "@tanstack/react-table";
 import { Command } from "cmdk";
@@ -137,16 +143,62 @@ const PayoutTableInner = memo(
           },
         },
         {
-          id: "paidAt",
           header: "Paid",
           cell: ({ row }) =>
-            row.original.paidAt
-              ? formatDate(row.original.paidAt, {
-                  month: "short",
-                  day: "numeric",
-                  year: undefined,
-                })
-              : "-",
+            row.original.paidAt ? (
+              <Tooltip
+                content={
+                  <div className="flex flex-col gap-1 p-2.5">
+                    {row.original.user && (
+                      <div className="flex flex-col gap-2">
+                        <img
+                          src={
+                            row.original.user.image ||
+                            `${DICEBEAR_AVATAR_URL}${row.original.user.name}`
+                          }
+                          alt={row.original.user.name}
+                          className="size-6 shrink-0 rounded-full"
+                        />
+                        <p className="text-sm font-medium">
+                          {row.original.user.name}
+                        </p>
+                      </div>
+                    )}
+                    <div className="text-xs text-neutral-500">
+                      Paid at{" "}
+                      <span className="font-medium text-neutral-700">
+                        {formatDateTime(row.original.paidAt, {
+                          month: "short",
+                          day: "numeric",
+                          year: "numeric",
+                          hour: "numeric",
+                          minute: "numeric",
+                        })}
+                      </span>
+                    </div>
+                  </div>
+                }
+              >
+                <div className="flex items-center gap-2">
+                  {row.original.user && (
+                    <img
+                      src={
+                        row.original.user.image ||
+                        `${DICEBEAR_AVATAR_URL}${row.original.user.name}`
+                      }
+                      alt={row.original.user.name}
+                      className="size-5 shrink-0 rounded-full"
+                    />
+                  )}
+                  {formatDate(row.original.paidAt, {
+                    month: "short",
+                    year: undefined,
+                  })}
+                </div>
+              </Tooltip>
+            ) : (
+              "-"
+            ),
         },
         {
           id: "amount",

apps/web/app/partners.dub.co/(dashboard)/programs/[programSlug]/earnings/earnings-table.tsx

@@ -20,7 +20,6 @@ import { CircleDollar } from "@dub/ui/icons";
 import {
   currencyFormatter,
   fetcher,
-  formatDate,
   formatDateTime,
   getApexDomain,
   getPrettyUrl,
@@ -70,9 +69,13 @@ export function EarningsTablePartner({ limit }: { limit?: number }) {
         id: "createdAt",
         header: "Date",
         accessorKey: "timestamp",
+        minSize: 140,
         cell: ({ row }) => (
           <p title={formatDateTime(row.original.createdAt)}>
-            {formatDate(row.original.createdAt, { month: "short" })}
+            {formatDateTime(row.original.createdAt, {
+              month: "short",
+              year: undefined,
+            })}
           </p>
         ),
       },

apps/web/app/partners.dub.co/(dashboard)/settings/payouts/payout-table.tsx

@@ -16,8 +16,7 @@ import {
   useTable,
 } from "@dub/ui";
 import { MoneyBill2 } from "@dub/ui/icons";
-import { DICEBEAR_AVATAR_URL } from "@dub/utils";
-import { formatPeriod } from "@dub/utils/src/functions/datetime";
+import { DICEBEAR_AVATAR_URL, formatPeriod } from "@dub/utils";
 import { useEffect, useState } from "react";
 import { PayoutDetailsSheet } from "./payout-details-sheet";
 

apps/web/lib/actions/partners/confirm-payouts.ts

@@ -23,7 +23,7 @@ const allowedPaymentMethods = ["us_bank_account", "card", "link"];
 export const confirmPayoutsAction = authActionClient
   .schema(confirmPayoutsSchema)
   .action(async ({ parsedInput, ctx }) => {
-    const { workspace } = ctx;
+    const { workspace, user } = ctx;
     const { programId, paymentMethodId } = parsedInput;
 
     const { minPayoutAmount } = await getProgramOrThrow({
@@ -148,6 +148,7 @@ export const confirmPayoutsAction = authActionClient
         data: {
           invoiceId: invoice.id,
           status: "processing",
+          userId: user.id,
         },
       });
 

apps/web/lib/middleware/utils/bots-list.ts

@@ -8,7 +8,6 @@ export const UA_BOTS = [
   "meta-externalagent", // Meta external agent
   "WhatsApp", // WhatsApp crawler
   "google", // Google crawler
-  "linkedin", // LinkedIn crawler
   "baidu", // Baidu crawler
   "bing", // Bing crawler
   "msn", // MSN crawler

apps/web/lib/zod/schemas/payouts.ts

@@ -74,6 +74,13 @@ export const PayoutSchema = z.object({
 export const PayoutResponseSchema = PayoutSchema.merge(
   z.object({
     partner: PartnerSchema,
+    user: z
+      .object({
+        id: z.string(),
+        name: z.string(),
+        image: z.string(),
+      })
+      .nullish(),
     _count: z.object({ commissions: z.number() }),
   }),
 );

packages/prisma/schema/payout.prisma

@@ -18,6 +18,7 @@ model Payout {
   programId        String
   partnerId        String
   invoiceId        String?
+  userId           String?
   amount           Int          @default(0)
   currency         String       @default("USD")
   status           PayoutStatus @default(pending)
@@ -34,10 +35,12 @@ model Payout {
   program     Program      @relation(fields: [programId], references: [id])
   partner     Partner      @relation(fields: [partnerId], references: [id])
   invoice     Invoice?     @relation(fields: [invoiceId], references: [id])
+  user        User?        @relation(fields: [userId], references: [id])
   commissions Commission[]
 
   @@index(programId)
   @@index(partnerId)
   @@index(invoiceId)
   @@index(status)
+  @@index(userId)
 }

packages/prisma/schema/schema.prisma

@@ -42,6 +42,7 @@ model User {
   folders               FolderUser[]
   folderAccessRequests  FolderAccessRequest[]
   utmTemplates          UtmTemplate[]
+  payouts               Payout[]
 
   @@index(source)
   @@index(defaultWorkspace)