The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Use Avatar components everywhere (#3623)
Steven Tey98f23308e285
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsxindex 60bbbf4e77..7a44f1abfc 100644--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsx@@ -7,6 +7,7 @@ import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";import { BLOCK_COMPONENTS } from "@/ui/partners/lander/blocks";import { LanderHero } from "@/ui/partners/lander/lander-hero";import { LanderRewards } from "@/ui/partners/lander/lander-rewards";+import { UserAvatar } from "@/ui/users/user-avatar";import { prisma } from "@dub/prisma";import { Reward } from "@dub/prisma/client";import { CircleCheckFill } from "@dub/ui";@@ -91,9 +92,8 @@ export default async function ProgramInvitePage(props: {alt={program.name}className="z-10 size-20 rotate-[-15deg] rounded-full drop-shadow-md"/>- <img- src={user?.image || `${OG_AVATAR_URL}${user?.id}`}- alt={user?.name || "Your avatar"}+ <UserAvatar+ user={user}className="-ml-4 size-20 rotate-[15deg] rounded-full drop-shadow-md"/><div className="absolute -bottom-2 left-1/2 z-10 -translate-x-1/2 rounded-full bg-white p-0.5">diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/use-bounty-submission-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/use-bounty-submission-filters.tsxindex 68f3314664..338ccc08cd 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/use-bounty-submission-filters.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/use-bounty-submission-filters.tsx@@ -8,9 +8,10 @@ import usePartners from "@/lib/swr/use-partners";import useWorkspace from "@/lib/swr/use-workspace";import { BountyProps, EnrolledPartnerProps } from "@/lib/types";import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { CircleDotted, useRouterStuff } from "@dub/ui";import { Users, Users6 } from "@dub/ui/icons";-import { cn, nFormatter, OG_AVATAR_URL } from "@dub/utils";+import { cn, nFormatter } from "@dub/utils";import { useCallback, useMemo, useState } from "react";import { useDebounce } from "use-debounce";@@ -48,10 +49,9 @@ export function useBountySubmissionFilters({value: id,label: name,icon: (- <img- src={image || `${OG_AVATAR_URL}${id}`}- alt={`${name} image`}- className="size-4 rounded-full"+ <PartnerAvatar+ partner={{ id, name, image }}+ className="size-4"/>),};diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page-client.tsxindex 1362ec6e3c..6a75972bb8 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page-client.tsx@@ -13,8 +13,10 @@ import { CommissionRowMenu } from "@/ui/partners/commission-row-menu";import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { CommentCardDisplay } from "@/ui/partners/partner-comments";import { ConditionalLink } from "@/ui/shared/conditional-link";+import { UserAvatar } from "@/ui/users/user-avatar";import {ChevronRight,InvoiceDollar,@@ -27,7 +29,6 @@ import {currencyFormatter,formatDateTime,nFormatter,- OG_AVATAR_URL,pluralize,} from "@dub/utils";import { Row } from "@tanstack/react-table";@@ -62,13 +63,9 @@ export function CommissionDetailsPageClient() {<ChevronRight className="text-content-subtle size-2.5 shrink-0 [&_*]:stroke-2" /><div className="flex items-center gap-2">{commission?.partner && (- <img- src={- commission.partner.image ||- `${OG_AVATAR_URL}${commission.partner.name}`- }- alt={commission.partner.name}- className="size-5 rounded-full"+ <PartnerAvatar+ partner={commission.partner}+ className="size-5 shrink-0"/>)}<span className="text-lg font-semibold leading-7 text-neutral-900">@@ -213,13 +210,9 @@ function CommissionDetailsContent({rel="noopener noreferrer"className="flex min-w-0 cursor-alias items-center gap-1.5 text-neutral-500 decoration-dotted hover:text-neutral-950 hover:underline">- <img- src={- commission.partner.image ||- `${OG_AVATAR_URL}${commission.partner.name}`- }- alt={commission.partner.name}- className="size-4 shrink-0 rounded-full"+ <PartnerAvatar+ partner={commission.partner}+ className="size-4 shrink-0"/><span className="truncate">{commission.partner.name}</span></Link>@@ -341,13 +334,9 @@ function CommissionActivity({<><span className="text-sm text-neutral-500">by</span><div className="flex h-6 items-center gap-2 rounded-lg bg-neutral-100 px-2 py-1">- <img- src={- commission.payout.user.image ||- `${OG_AVATAR_URL}${commission.payout.user.id}`- }- alt={commission.payout.user.name ?? ""}- className="size-4 rounded-full"+ <UserAvatar+ user={commission.payout.user}+ className="size-4"/><span className="text-[13px] text-neutral-700">{commission.payout.user.name}@@ -474,14 +463,7 @@ function CommissionActivity({<><span className="text-sm text-neutral-500">by</span><div className="flex h-6 items-center gap-2 rounded-lg bg-neutral-100 px-2 py-1">- <img- src={- commission.user.image ||- `${OG_AVATAR_URL}${commission.user.id}`- }- alt={commission.user.name ?? ""}- className="size-4 rounded-full"- />+ <UserAvatar user={commission.user} className="size-4" /><span className="text-[13px] text-neutral-700">{commission.user.name}</span>diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/use-fraud-group-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/use-fraud-group-filters.tsxindex 183c5ced55..c33426f5ef 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/use-fraud-group-filters.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/use-fraud-group-filters.tsx@@ -3,9 +3,10 @@ import { useFraudGroupCount } from "@/lib/swr/use-fraud-groups-count";import usePartners from "@/lib/swr/use-partners";import { EnrolledPartnerProps, FraudGroupCountByType } from "@/lib/types";import { fraudGroupCountQuerySchema } from "@/lib/zod/schemas/fraud";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { useRouterStuff } from "@dub/ui";import { ShieldKeyhole, Users } from "@dub/ui/icons";-import { nFormatter, OG_AVATAR_URL } from "@dub/utils";+import { nFormatter } from "@dub/utils";import { useCallback, useMemo, useState } from "react";import { useDebounce } from "use-debounce";import * as z from "zod/v4";@@ -54,10 +55,9 @@ export function useFraudGroupFilters({value: id,label: name,icon: (- <img- src={image || `${OG_AVATAR_URL}${id}`}- alt={`${name} image`}- className="size-4 rounded-full"+ <PartnerAvatar+ partner={{ id, name, image }}+ className="size-4"/>),};diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page-client.tsxindex 9cf2826ddb..c3c296b5c1 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page-client.tsx@@ -17,8 +17,10 @@ import { ActivityEvent } from "@/ui/partners/activity-event";import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";import { CommissionRowMenu } from "@/ui/partners/commission-row-menu";import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";import { ConditionalLink } from "@/ui/shared/conditional-link";+import { UserAvatar } from "@/ui/users/user-avatar";import { PayoutStatus } from "@dub/prisma/client";import {Button,@@ -40,7 +42,6 @@ import {fetcher,formatDateTime,formatDateTimeSmart,- OG_AVATAR_URL,pluralize,} from "@dub/utils";import { formatPeriod } from "@dub/utils/src/functions/datetime";@@ -83,13 +84,9 @@ export function PayoutDetailsPageClient() {<ChevronRight className="text-content-subtle size-2.5 shrink-0 [&_*]:stroke-2" /><div className="flex items-center gap-2">{payout?.partner && (- <img- src={- payout.partner.image ||- `${OG_AVATAR_URL}${payout.partner.name}`- }- alt={payout.partner.name}- className="size-5 rounded-full"+ <PartnerAvatar+ partner={payout.partner}+ className="size-5 shrink-0"/>)}<span className="text-lg font-semibold leading-7 text-neutral-900">@@ -171,12 +168,9 @@ function PayoutDetailsContent({<ConditionalLinkhref={`/${slug}/program/partners/${payout.partner.id}`}>- <img- src={- payout.partner.image || `${OG_AVATAR_URL}${payout.partner.name}`- }- alt={payout.partner.name}- className="mr-1.5 inline-flex size-5 rounded-full"+ <PartnerAvatar+ partner={payout.partner}+ className="mr-1.5 inline-flex size-5 shrink-0"/>{payout.partner.name}</ConditionalLink>@@ -430,13 +424,7 @@ function PayoutDetailsContent({<><span className="text-sm text-neutral-500">by</span><div className="flex h-6 items-center gap-2 rounded-lg bg-neutral-100 px-2 py-1">- <img- src={- item.user.image || `${OG_AVATAR_URL}${item.user.id}`- }- alt={item.user.name ?? ""}- className="size-4 rounded-full"- />+ <UserAvatar user={item.user} className="size-4" /><span className="text-[13px] text-sm text-neutral-700">{item.user.name}</span>diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-paid-cell.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-paid-cell.tsxindex 1174007ece..c1eea787e9 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-paid-cell.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-paid-cell.tsx@@ -1,7 +1,8 @@import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";+import { UserAvatar } from "@/ui/users/user-avatar";import { CopyText, Tooltip } from "@dub/ui";import { CircleHalfDottedClock } from "@dub/ui/icons";-import { formatDateSmart, formatDateTime, OG_AVATAR_URL } from "@dub/utils";+import { formatDateSmart, formatDateTime } from "@dub/utils";import { addBusinessDays } from "date-fns";type PayoutPaidCellUser = {@@ -35,11 +36,7 @@ export function PayoutPaidCell({<div className="flex flex-col gap-1 p-2.5">{user && (<div className="flex flex-col gap-2">- <img- src={user.image || `${OG_AVATAR_URL}${user.id}`}- alt={user.name ?? user.email ?? user.id}- className="size-6 shrink-0 rounded-full"- />+ <UserAvatar user={user} className="size-6" /><p className="text-sm font-medium">{user.name ?? user.email ?? user.id}</p>@@ -104,13 +101,7 @@ export function PayoutPaidCell({}><div className="flex items-center gap-2">- {user && (- <img- src={user.image || `${OG_AVATAR_URL}${user.id}`}- alt={user.name ?? user.email ?? user.id}- className="size-5 shrink-0 rounded-full"- />- )}+ {user && <UserAvatar user={user} className="size-5 shrink-0" />}{paidAt ? (<span className="hover:text-content-emphasis underline decoration-dotted underline-offset-2">{formatDateSmart(paidAt, {diff --git a/apps/web/app/app.dub.co/(invites)/[slug]/invite/page.tsx b/apps/web/app/app.dub.co/(invites)/[slug]/invite/page.tsxindex 1f1ec76cc1..9def71813d 100644--- a/apps/web/app/app.dub.co/(invites)/[slug]/invite/page.tsx+++ b/apps/web/app/app.dub.co/(invites)/[slug]/invite/page.tsx@@ -316,9 +316,8 @@ function Hero({alt={invite.project.name}className="z-10 size-20 rotate-[-15deg] rounded-full drop-shadow-md"/>- <img- src={user?.image || `${OG_AVATAR_URL}${user?.id}`}- alt={user?.name || "Your avatar"}+ <UserAvatar+ user={user}className="-ml-4 size-20 rotate-[15deg] rounded-full drop-shadow-md"/><div className="absolute -bottom-2 left-1/2 z-10 -translate-x-1/2 rounded-full bg-white p-0.5">diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.tsindex 1e10b3d211..ac169f748e 100644--- a/apps/web/lib/analytics/get-events.ts+++ b/apps/web/lib/analytics/get-events.ts@@ -1,7 +1,6 @@import { tb } from "@/lib/tinybird";import { prisma } from "@dub/prisma";import { Link } from "@dub/prisma/client";-import { OG_AVATAR_URL } from "@dub/utils";import * as z from "zod/v4";import { decodeLinkIfCaseSensitive } from "../api/links/case-sensitivity";import { transformLink } from "../api/links/utils/transform-link";@@ -215,7 +214,6 @@ export const getEvents = async (params: EventsFilters) => {id: evt.customer_id,name: "Deleted Customer",email: "[email protected]",- avatar: `${OG_AVATAR_URL}${evt.customer_id}`,externalId: evt.customer_id,createdAt: new Date("1970-01-01"),},@@ -285,7 +283,7 @@ const getCustomersMap = async (customerIds: string[]) => {externalId: customer.externalId || "",name: customer.name || customer.email || generateRandomName(),email: customer.email || "",- avatar: customer.avatar || `${OG_AVATAR_URL}${customer.id}`,+ avatar: customer.avatar,country: customer.country || "",createdAt: customer.createdAt,});diff --git a/apps/web/lib/api/customers/get-customer-or-throw.ts b/apps/web/lib/api/customers/get-customer-or-throw.tsindex 816afb062d..e4ecf63b1e 100644--- a/apps/web/lib/api/customers/get-customer-or-throw.ts+++ b/apps/web/lib/api/customers/get-customer-or-throw.ts@@ -1,5 +1,4 @@import { prisma } from "@dub/prisma";-import { OG_AVATAR_URL } from "@dub/utils";import { DubApiError } from "../errors";import { CustomerWithLink } from "./transform-customer";@@ -51,9 +50,5 @@ export const getCustomerOrThrow = async (});}- if (!customer.avatar) {- customer.avatar = `${OG_AVATAR_URL}${customer.id}`;- }-return customer;};diff --git a/apps/web/lib/webhook/transform.ts b/apps/web/lib/webhook/transform.tsindex cc29e337d0..bf07f1e987 100644--- a/apps/web/lib/webhook/transform.ts+++ b/apps/web/lib/webhook/transform.ts@@ -3,7 +3,7 @@ import {webhookPayloadSchema,} from "@/lib/webhook/schemas";import { Webhook } from "@dub/prisma/client";-import { OG_AVATAR_URL, nanoid, toCamelCase } from "@dub/utils";+import { nanoid, toCamelCase } from "@dub/utils";import { ExpandedLink, transformLink } from "../api/links/utils/transform-link";import { generateRandomName } from "../names";import { ClickEventTB, WebhookTrigger } from "../types";@@ -58,7 +58,7 @@ const transformWebhookCustomer = (customer: any) => {name: customer.name || customer.email || generateRandomName(),externalId: customer.externalId || "",country: undefined,- avatar: customer.avatar || `${OG_AVATAR_URL}${customer.id}`,+ avatar: customer.avatar,};};diff --git a/apps/web/ui/activity-logs/activity-entry-chips.tsx b/apps/web/ui/activity-logs/activity-entry-chips.tsxindex 5204b04a25..8a3f27d631 100644--- a/apps/web/ui/activity-logs/activity-entry-chips.tsx+++ b/apps/web/ui/activity-logs/activity-entry-chips.tsx@@ -5,6 +5,7 @@ import { ReferralStatus } from "@dub/prisma/client";import { Bolt, Tooltip } from "@dub/ui";import { cn, OG_AVATAR_URL } from "@dub/utils";import { ReactNode } from "react";+import { UserAvatar } from "../users/user-avatar";import { useActivityLogContext } from "./activity-log-context";import { getActorType } from "./activity-log-registry";@@ -77,11 +78,7 @@ export function SourcePill({ icon, label }: SourcePillProps) {export function UserChip({ user }: UserChipProps) {return (<ActivityChip>- <img- src={user.image || `${OG_AVATAR_URL}${user.id}`}- alt={`${user.name || user.email || "Deleted user"}`}- className="size-4 shrink-0 rounded-full"- />+ <UserAvatar user={user} className="size-4 shrink-0" />{user.name || user.email || "Deleted user"}</ActivityChip>);@@ -136,19 +133,14 @@ export function ReferralStatusPill({ status }: { status: ReferralStatus }) {export function ActivityLogUserAvatar({ user }: { user: ActivityLog["user"] }) {if (!user) return null;- const image = user.image || `${OG_AVATAR_URL}${user.id}`;- const name = user.name || user.email || "User";-return (<Tooltipcontent={<div className="flex flex-col gap-1 p-2.5">- <img- src={image}- alt={name}- className="size-6 shrink-0 rounded-full"- />- <p className="text-sm font-medium text-neutral-900">{name}</p>+ <UserAvatar user={user} className="size-6 shrink-0" />+ <p className="text-sm font-medium text-neutral-900">+ {user.name || user.email || "User"}+ </p>{user.email && user.name && (<p className="text-xs text-neutral-500">{user.email}</p>)}@@ -156,10 +148,9 @@ export function ActivityLogUserAvatar({ user }: { user: ActivityLog["user"] }) {}><div>- <img- src={image}- alt={name}- className="size-4 shrink-0 rounded-full transition-transform duration-100 hover:scale-110 hover:cursor-pointer"+ <UserAvatar+ user={user}+ className="size-4 shrink-0 transition-transform duration-100 hover:scale-110 hover:cursor-pointer"/></div></Tooltip>diff --git a/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx b/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsxindex d61dcd0c68..a481741c22 100644--- a/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx+++ b/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx@@ -7,6 +7,7 @@ import { useBanPartnerModal } from "@/ui/modals/ban-partner-modal";import { useRejectPartnerApplicationModal } from "@/ui/modals/reject-partner-application-modal";import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { X } from "@/ui/shared/icons";+import { UserAvatar } from "@/ui/users/user-avatar";import {Button,ChevronLeft,@@ -19,7 +20,7 @@ import {useKeyboardShortcut,useRouterStuff,} from "@dub/ui";-import { OG_AVATAR_URL, cn, formatDateTime } from "@dub/utils";+import { cn, formatDateTime } from "@dub/utils";import Link from "next/link";import { useParams } from "next/navigation";import { Dispatch, SetStateAction } from "react";@@ -244,10 +245,9 @@ function FraudReviewSheetContent({<div className="flex flex-col gap-1 p-2.5">{user && (<div className="flex flex-col gap-2">- <img- src={user.image || `${OG_AVATAR_URL}${user.id}`}- alt={user.name ?? user.email ?? user.id}- className="size-6 shrink-0 rounded-full"+ <UserAvatar+ user={user}+ className="size-6 shrink-0"/><p className="text-sm font-medium">{user.name}</p></div>@@ -265,11 +265,7 @@ function FraudReviewSheetContent({}>{user && (- <img- src={user.image || `${OG_AVATAR_URL}${user.id}`}- alt={user.name ?? user.email ?? user.id}- className="size-5 shrink-0 rounded-full"- />+ <UserAvatar user={user} className="size-5 shrink-0" />)}</Tooltip>