The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Add reusable PartnerAvatar component (#3590)
Kiran K49e9c0b015f9
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/payouts/paypal/client.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/payouts/paypal/client.tsxindex dc285bbd9e..cb0a6e071d 100644--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/payouts/paypal/client.tsx+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/payouts/paypal/client.tsx@@ -1,6 +1,7 @@"use client";import type { PaypalPayoutResponse } from "@/lib/paypal/get-pending-payouts";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";import { FilterButtonTableRow } from "@/ui/shared/filter-button-table-row";import {@@ -54,16 +55,7 @@ export default function PaypalPayoutsPageClient() {header: "Partner",cell: ({ row }) => (<div className="flex items-center gap-1.5">- <img- src={- row.original.partner.image ||- `${OG_AVATAR_URL}${row.original.partner.email || ""}`- }- alt={row.original.partner.email || ""}- width={20}- height={20}- className="size-4 rounded-full"- />+ <PartnerAvatar partner={row.original.partner} className="size-4" /><span className="text-sm text-neutral-900">{row.original.partner.email || "-"}</span>diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsxindex 22cd6b2ed5..ca7352501f 100644--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx@@ -7,6 +7,7 @@ import {} from "@/lib/constants/payouts";import usePartnerProfile from "@/lib/swr/use-partner-profile";import { PartnerEarningsResponse, PartnerPayoutResponse } from "@/lib/types";+import { CustomerAvatar } from "@/ui/customers/customer-avatar";import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";@@ -276,13 +277,9 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {/></div>) : (- <img- src={- row.original.customer.avatar ||- `${OG_AVATAR_URL}${row.original.customer.id}`- }- alt={row.original.customer.id}- className="size-6 rounded-full"+ <CustomerAvatar+ customer={row.original.customer}+ className="size-6"/>)}diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/members/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/members/page-client.tsxindex a13ddf2089..0e5b411beb 100644--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/members/page-client.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/members/page-client.tsx@@ -8,9 +8,9 @@ import { useInvitePartnerUserModal } from "@/ui/modals/invite-partner-user-modalimport { useRemovePartnerUserModal } from "@/ui/modals/remove-partner-user-modal";import { useUpdatePartnerUserModal } from "@/ui/modals/update-partner-user-modal";import { SearchBoxPersisted } from "@/ui/shared/search-box";+import { UserAvatar } from "@/ui/users/user-avatar";import { PartnerRole } from "@dub/prisma/client";import {- Avatar,Button,Filter,Popover,@@ -144,7 +144,7 @@ export function ProfileMembersPageClient() {return (<div className="flex items-center space-x-3">- <Avatar user={user} />+ <UserAvatar user={user} /><div className="flex flex-col"><h3 className="text-sm font-medium">{user.name || user.email}diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[id]/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[id]/page-client.tsxindex 57eb1c9c6e..e6f00ec22f 100644--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[id]/page-client.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[id]/page-client.tsx@@ -12,7 +12,8 @@ import { PostbackEventListSkeleton } from "@/ui/postbacks/postback-event-list-skimport { usePostbackSecretModal } from "@/ui/postbacks/postback-secret-modal";import { PostbackStatus } from "@/ui/postbacks/postback-status";import { BackLink } from "@/ui/shared/back-link";-import { EmptyState, TokenAvatar, Webhook } from "@dub/ui";+import { TokenAvatar } from "@/ui/token-avatar";+import { EmptyState, Webhook } from "@dub/ui";import { fetcher } from "@dub/utils";import { redirect, useRouter } from "next/navigation";import { useState } from "react";diff --git a/apps/web/app/api/og/avatar/[[...seed]]/route.tsx b/apps/web/app/api/og/avatar/[[...seed]]/route.tsxindex 62ade8ef8d..baad892537 100644--- a/apps/web/app/api/og/avatar/[[...seed]]/route.tsx+++ b/apps/web/app/api/og/avatar/[[...seed]]/route.tsx@@ -1,6 +1,6 @@+import { getAvatarTheme } from "@dub/utils";import { ImageResponse } from "next/og";import { NextRequest } from "next/server";-import { getTheme } from "./utils";export const runtime = "edge";@@ -22,7 +22,7 @@ export async function GET(const { searchParams } = new URL(req.url);const seed = params.seed?.[0] ?? searchParams.get("seed");- const theme = getTheme(seed);+ const theme = getAvatarTheme(seed);return new ImageResponse((diff --git a/apps/web/app/api/og/avatar/[[...seed]]/utils.ts b/apps/web/app/api/og/avatar/[[...seed]]/utils.tsdeleted file mode 100644index 232a8cbaa9..0000000000--- a/apps/web/app/api/og/avatar/[[...seed]]/utils.ts+++ /dev/null@@ -1,23 +0,0 @@-import { THEMES } from "./themes";--// Simple but effective hash function for strings-function hashCode(str: string) {- let hash = 0;- for (let i = 0; i < str.length; i++) {- const char = str.charCodeAt(i);- hash = (hash << 5) - hash + char;- hash = hash & hash; // Convert to 32-bit integer- }- return Math.abs(hash);-}--// Get theme based on seed-export function getTheme(seed?: string | null) {- if (!seed) {- // If no seed provided, return random theme- return THEMES[Math.floor(Math.random() * THEMES.length)];- }- // Use hash function to get deterministic index- const index = hashCode(seed) % THEMES.length;- return THEMES[index];-}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/earnings/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/earnings/page-client.tsxindex 77631c424f..6b8567459c 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/earnings/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/earnings/page-client.tsx@@ -5,8 +5,9 @@ import useCustomer from "@/lib/swr/use-customer";import useWorkspace from "@/lib/swr/use-workspace";import { CommissionResponse, CustomerEnriched } from "@/lib/types";import { CustomerPartnerEarningsTable } from "@/ui/customers/customer-partner-earnings-table";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { ArrowUpRight } from "@dub/ui";-import { OG_AVATAR_URL, fetcher } from "@dub/utils";+import { fetcher } from "@dub/utils";import Link from "next/link";import { redirect, useParams } from "next/navigation";import { memo } from "react";@@ -37,14 +38,7 @@ export function CustomerEarningsPageClient() {<div className="flex min-w-0 items-center gap-3">{customer?.partner ? (<>- <img- src={- customer?.partner?.image ||- `${OG_AVATAR_URL}${customer?.partner?.name}`- }- alt={customer.partner.name}- className="size-5 rounded-full"- />+ <PartnerAvatar partner={customer.partner} className="size-5" /><span className="block min-w-0 truncate text-sm font-medium text-neutral-900">{customer.partner.name}</span>diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsxindex f4a68ab77f..6da499c3f3 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx@@ -16,6 +16,7 @@ import { getBountyRewardCriteria } from "@/ui/partners/bounties/bounty-reward-crimport { BountySocialContentPreview } from "@/ui/partners/bounties/bounty-social-content-preview";import { BountySocialMetricsRewardsTable } from "@/ui/partners/bounties/bounty-social-metrics-rewards-table";import { useRejectBountySubmissionModal } from "@/ui/partners/bounties/reject-bounty-submission-modal";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { ButtonLink } from "@/ui/placeholders/button-link";import { AmountInput } from "@/ui/shared/amount-input";import { X } from "@/ui/shared/icons";@@ -38,7 +39,6 @@ import {formatDate,getPrettyUrl,nFormatter,- OG_AVATAR_URL,timeAgo,} from "@dub/utils";import Linkify from "linkify-react";@@ -218,14 +218,7 @@ function BountySubmissionDetailsSheetContent({<div className="flex grow flex-col"><div className="px-6 pt-6"><div className="flex items-center gap-4 rounded-xl bg-neutral-100 px-4 py-3">- <img- src={- submission.partner.image ||- `${OG_AVATAR_URL}${submission.partner.id}`- }- alt={submission.partner.name}- className="size-10 shrink-0 rounded-full"- />+ <PartnerAvatar partner={submission.partner} className="size-10" /><div className="min-w-0 flex-1"><div className="text-base font-semibold text-neutral-800">{submission.partner.name}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-events-columns.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-events-columns.tsxindex 6f6b7d50bd..d200431e14 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-events-columns.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-events-columns.tsx@@ -1,6 +1,7 @@import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { TimestampTooltip } from "@dub/ui";-import { OG_AVATAR_URL, timeAgo } from "@dub/utils";+import { timeAgo } from "@dub/utils";import { CampaignEvent } from "./campaign-events";export const campaignEventsColumns = [@@ -11,13 +12,9 @@ export const campaignEventsColumns = [cell: ({ row }: { row: { original: CampaignEvent } }) => (<div className="flex gap-2"><div className="flex h-8 shrink-0 items-center justify-center">- <img- src={- row.original.partner.image ||- `${OG_AVATAR_URL}${row.original.partner.name}`- }- alt={row.original.partner.name}- className="size-7 rounded-full object-cover"+ <PartnerAvatar+ partner={row.original.partner}+ className="size-7 object-cover"/></div><div className="flex h-8 min-w-0 flex-1 flex-col">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 798dd4a100..1362ec6e3c 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@@ -4,6 +4,7 @@ import { useCommission } from "@/lib/swr/use-commission";import useGroups from "@/lib/swr/use-groups";import useWorkspace from "@/lib/swr/use-workspace";import { CommissionDetail, CommissionResponse } from "@/lib/types";+import { CustomerAvatar } from "@/ui/customers/customer-avatar";import { PageContent } from "@/ui/layout/page-content";import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";import { ActivityEvent } from "@/ui/partners/activity-event";@@ -133,13 +134,9 @@ function CommissionDetailsContent({/></div>) : (- <img- src={customer?.avatar || `${OG_AVATAR_URL}${customer?.id}`}- alt={customer?.id}- className="size-6 rounded-full"- title={customer?.name}- loading="lazy"- />+ customer && (+ <CustomerAvatar customer={customer} className="size-6" />+ ))}<div className="flex flex-col">diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsxindex e96dc6a9c6..d11da96189 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx@@ -4,13 +4,15 @@ import useGroups from "@/lib/swr/use-groups";import usePartners from "@/lib/swr/use-partners";import useWorkspace from "@/lib/swr/use-workspace";import { CustomerProps, EnrolledPartnerProps } from "@/lib/types";+import { CustomerAvatar } from "@/ui/customers/customer-avatar";import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { CommissionType } from "@dub/prisma/client";import { CircleDotted, useRouterStuff } from "@dub/ui";import { Sliders, User, Users, Users6 } from "@dub/ui/icons";-import { capitalize, cn, nFormatter, OG_AVATAR_URL } from "@dub/utils";+import { capitalize, cn, nFormatter } from "@dub/utils";import { useCallback, useMemo, useState } from "react";import { useDebounce } from "use-debounce";@@ -41,17 +43,11 @@ export function useCommissionFilters() {label: "Customer",shouldFilter: false,options:- customers?.map(({ id, email, name, avatar }) => {+ customers?.map((customer) => {return {- value: id,- label: email ?? name,- icon: (- <img- src={avatar || `${OG_AVATAR_URL}${id}`}- alt={`${email} avatar`}- className="size-4 rounded-full"- />- ),+ value: customer.id,+ label: customer.email ?? customer.name,+ icon: <CustomerAvatar customer={customer} className="size-4" />,};}) ?? null,},@@ -61,17 +57,11 @@ export function useCommissionFilters() {label: "Partner",shouldFilter: false,options:- partners?.map(({ id, name, image }) => {+ partners?.map((partner) => {return {- value: id,- label: name,- icon: (- <img- src={image || `${OG_AVATAR_URL}${id}`}- alt={`${name} image`}- className="size-4 rounded-full"- />- ),+ value: partner.id,+ label: partner.name,+ icon: <PartnerAvatar partner={partner} className="size-4" />,};}) ?? null,},diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/[customerId]/earnings/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/[customerId]/earnings/page-client.tsxindex 77631c424f..6b8567459c 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/[customerId]/earnings/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/[customerId]/earnings/page-client.tsx@@ -5,8 +5,9 @@ import useCustomer from "@/lib/swr/use-customer";import useWorkspace from "@/lib/swr/use-workspace";import { CommissionResponse, CustomerEnriched } from "@/lib/types";import { CustomerPartnerEarningsTable } from "@/ui/customers/customer-partner-earnings-table";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { ArrowUpRight } from "@dub/ui";-import { OG_AVATAR_URL, fetcher } from "@dub/utils";+import { fetcher } from "@dub/utils";import Link from "next/link";import { redirect, useParams } from "next/navigation";import { memo } from "react";@@ -37,14 +38,7 @@ export function CustomerEarningsPageClient() {<div className="flex min-w-0 items-center gap-3">{customer?.partner ? (<>- <img- src={- customer?.partner?.image ||- `${OG_AVATAR_URL}${customer?.partner?.name}`- }- alt={customer.partner.name}- className="size-5 rounded-full"- />+ <PartnerAvatar partner={customer.partner} className="size-5" /><span className="block min-w-0 truncate text-sm font-medium text-neutral-900">{customer.partner.name}</span>diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/example-fraud-events.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/example-fraud-events.tsxindex f1aa779829..40fa459ecb 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/example-fraud-events.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/example-fraud-events.tsx@@ -1,7 +1,8 @@import { FRAUD_RULES_BY_TYPE } from "@/lib/api/fraud/constants";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { FraudRuleType } from "@dub/prisma/client";import { Button, ShieldKeyhole } from "@dub/ui";-import { formatDate, OG_AVATAR_URL } from "@dub/utils";+import { formatDate } from "@dub/utils";const EXAMPLE_FRAUD_EVENTS: {type: FraudRuleType;@@ -53,10 +54,9 @@ function ExampleFraudEvent({ event }: { event: ExampleFraudEventProps }) {{rule.name}</span><div className="flex items-center gap-2">- <img- src={`${OG_AVATAR_URL}${event.partnerName}`}- alt={event.partnerName}- className="size-5 shrink-0 rounded-full bg-white"+ <PartnerAvatar+ partner={{ name: event.partnerName }}+ className="size-5 bg-white"/><span className="text-content-default whitespace-nowrap text-sm font-medium">{event.partnerName}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsxindex dda4c25f0c..fb5f07339e 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx@@ -12,13 +12,14 @@ import useWorkspace from "@/lib/swr/use-workspace";import { useMessagesContext } from "@/ui/messages/messages-context";import { MessagesPanel } from "@/ui/messages/messages-panel";import { ToggleSidePanelButton } from "@/ui/messages/toggle-side-panel-button";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { PartnerInfoGroup } from "@/ui/partners/partner-info-group";import { PartnerInfoSection } from "@/ui/partners/partner-info-section";import { PartnerInfoStats } from "@/ui/partners/partner-info-stats";import { X } from "@/ui/shared/icons";import { Button } from "@dub/ui";import { ChevronLeft } from "@dub/ui/icons";-import { OG_AVATAR_URL, cn } from "@dub/utils";+import { cn } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import Link from "next/link";import { redirect, useParams } from "next/navigation";@@ -115,11 +116,7 @@ export function ProgramMessagesPartnerPageClient() {</>) : (<>- <img- src={partner?.image || `${OG_AVATAR_URL}${partner?.name}`}- alt={`${partner?.name} avatar`}- className="size-6 shrink-0 rounded-full"- />+ <PartnerAvatar partner={partner} className="size-6" /><h2 className="text-content-emphasis text-lg font-semibold leading-7">{partner?.name ?? "Partner"}</h2>diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsxindex 1964b7801a..3255f4cbf2 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsx@@ -7,6 +7,7 @@ import useWorkspace from "@/lib/swr/use-workspace";import { NetworkPartnerProps } from "@/lib/types";import { PARTNER_NETWORK_MAX_PAGE_SIZE } from "@/lib/zod/schemas/partner-network";import { ConversionScoreIcon } from "@/ui/partners/conversion-score-icon";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { ConversionScoreTooltip } from "@/ui/partners/partner-network/conversion-score-tooltip";import { NetworkPartnerSheet } from "@/ui/partners/partner-network/network-partner-sheet";import { PartnerStarButton } from "@/ui/partners/partner-star-button";@@ -28,7 +29,6 @@ import type { Icon } from "@dub/ui/icons";import { EnvelopeArrowRight, Globe } from "@dub/ui/icons";import {COUNTRIES,- OG_AVATAR_URL,capitalize,cn,fetcher,@@ -440,10 +440,9 @@ function PartnerCard({{/* Avatar + country icon */}<div className="relative w-fit">{partner ? (- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-16 rounded-full border border-neutral-100"+ <PartnerAvatar+ partner={partner}+ className="size-16 border border-neutral-100"/>) : (<div className="size-16 animate-pulse rounded-full bg-neutral-200" />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 39712b55e1..9cf2826ddb 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@@ -10,6 +10,7 @@ import {FraudGroupCountByPartner,PayoutResponse,} from "@/lib/types";+import { CustomerAvatar } from "@/ui/customers/customer-avatar";import { PageContent } from "@/ui/layout/page-content";import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";import { ActivityEvent } from "@/ui/partners/activity-event";@@ -320,13 +321,9 @@ function PayoutDetailsContent({/></div>) : (- <img- src={- row.original.customer.avatar ||- `${OG_AVATAR_URL}${row.original.customer.id}`- }- alt={row.original.customer.id}- className="size-6 rounded-full"+ <CustomerAvatar+ customer={row.original.customer}+ className="size-6"/>)}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsxindex 3700cb185f..a0977eecb1 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx@@ -1,10 +1,11 @@import usePartners from "@/lib/swr/use-partners";import { usePayoutsCount } from "@/lib/swr/use-payouts-count";import { EnrolledPartnerProps, PayoutsCount } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";import { useRouterStuff } from "@dub/ui";import { CircleDotted, InvoiceDollar, Users } 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";@@ -31,17 +32,11 @@ export function usePayoutFilters() {label: "Partner",shouldFilter: false,options:- partners?.map(({ id, name, image }) => {+ partners?.map((partner) => {return {- value: id,- label: name,- icon: (- <img- src={image || `${OG_AVATAR_URL}${id}`}- alt={`${name} image`}- className="size-4 rounded-full"- />- ),+ value: partner.id,+ label: partner.name,+ icon: <PartnerAvatar partner={partner} className="size-4" />,};}) ?? null,},diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsxindex e508bf9add..a4b13d9c18 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsx@@ -14,8 +14,8 @@ import { useUninstallIntegrationModal } from "@/ui/modals/uninstall-integration-import { BackLink } from "@/ui/shared/back-link";import { ThreeDots } from "@/ui/shared/icons";import { Markdown } from "@/ui/shared/markdown";+import { UserAvatar } from "@/ui/users/user-avatar";import {- Avatar,BlurImage,Button,buttonVariants,@@ -188,7 +188,7 @@ export default function IntegrationPageClient({label: "Enabled by",content: (<span className="text-neutral-700">- <Avatar+ <UserAvataruser={integration.installed.by}className="inline-block size-3 -translate-y-0.5 border-0"/>{" "}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/enabled/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/enabled/page.tsxindex 00edaa0638..a8c31a3099 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/enabled/page.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/enabled/page.tsx@@ -2,8 +2,9 @@ import { IntegrationLogo } from "@/ui/integrations/integration-logo";import LayoutLoader from "@/ui/layout/layout-loader";import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";import { BackLink } from "@/ui/shared/back-link";+import { UserAvatar } from "@/ui/users/user-avatar";import { prisma } from "@dub/prisma";-import { Avatar, ConnectedDots } from "@dub/ui";+import { ConnectedDots } from "@dub/ui";import { cn, formatDate, truncate } from "@dub/utils";import { ChevronRight } from "lucide-react";import Link from "next/link";@@ -106,7 +107,7 @@ async function EnabledIntegrationsPageRSC({ slug }: { slug: string }) {{installerName ? (<>by{" "}- <Avatar+ <UserAvataruser={installation.user}className="inline-block size-3 -translate-y-0.5 border-0"/>{" "}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsxindex 8a5a919e31..f6a5db5ab7 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx@@ -14,9 +14,9 @@ import { useInviteWorkspaceUserModal } from "@/ui/modals/invite-workspace-user-mimport { useRemoveWorkspaceUserModal } from "@/ui/modals/remove-workspace-user-modal";import { useWorkspaceUserRoleModal } from "@/ui/modals/update-workspace-user-role";import { SearchBoxPersisted } from "@/ui/shared/search-box";+import { UserAvatar } from "@/ui/users/user-avatar";import { WorkspaceRole } from "@dub/prisma/client";import {- Avatar,Button,Filter,Popover,@@ -159,7 +159,7 @@ export function WorkspaceMembersClient() {return (<div className="flex items-center space-x-3">- <Avatar user={user} />+ <UserAvatar user={user} /><div className="flex flex-col"><h3 className="text-sm font-medium">{user.name || user.email}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/oauth-apps/[appId]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/oauth-apps/[appId]/page-client.tsxindex e8fd0911dd..f7fe61bf24 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/oauth-apps/[appId]/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/oauth-apps/[appId]/page-client.tsx@@ -10,14 +10,8 @@ import AddOAuthAppForm from "@/ui/oauth-apps/add-edit-app-form";import OAuthAppCredentials from "@/ui/oauth-apps/oauth-app-credentials";import { BackLink } from "@/ui/shared/back-link";import { ThreeDots } from "@/ui/shared/icons";-import {- BlurImage,- Button,- MaxWidthWrapper,- Popover,- Refresh2,- TokenAvatar,-} from "@dub/ui";+import { TokenAvatar } from "@/ui/token-avatar";+import { BlurImage, Button, MaxWidthWrapper, Popover, Refresh2 } from "@dub/ui";import { fetcher } from "@dub/utils";import { Trash, Upload } from "lucide-react";import { useAction } from "next-safe-action/hooks";diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/links/folders/[folderId]/members/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/folders/[folderId]/members/page-client.tsxindex 139ccc7153..757212762b 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/links/folders/[folderId]/members/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/folders/[folderId]/members/page-client.tsx@@ -15,8 +15,9 @@ import useWorkspace from "@/lib/swr/use-workspace";import { Folder, FolderUser } from "@/lib/types";import { FolderIcon } from "@/ui/folders/folder-icon";import { RequestFolderEditAccessButton } from "@/ui/folders/request-edit-button";+import { UserAvatar } from "@/ui/users/user-avatar";import { FolderUserRole } from "@dub/prisma/client";-import { Avatar, BlurImage, Globe } from "@dub/ui";+import { BlurImage, Globe } from "@dub/ui";import { cn, fetcher, nFormatter, OG_AVATAR_URL, pluralize } from "@dub/utils";import { ChevronLeft } from "lucide-react";import { useSession } from "next-auth/react";@@ -222,7 +223,7 @@ const FolderUserRow = ({><div className="flex items-start space-x-3"><div className="flex items-center space-x-3">- <Avatar user={user} />+ <UserAvatar user={user} /><div className="flex flex-col"><h3 className="text-xs font-medium text-neutral-800">{user.name || user.email}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/links/utm/template-card.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/utm/template-card.tsxindex f23b90c447..f6b47fe291 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/links/utm/template-card.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/utm/template-card.tsx@@ -4,8 +4,8 @@ import useWorkspace from "@/lib/swr/use-workspace";import { UtmTemplateWithUserProps } from "@/lib/types";import { useAddEditUtmTemplateModal } from "@/ui/modals/add-edit-utm-template.modal";import { Delete, ThreeDots } from "@/ui/shared/icons";+import { UserAvatar } from "@/ui/users/user-avatar";import {- Avatar,Button,CardList,Popover,@@ -83,7 +83,7 @@ export function TemplateCard({</span></div><div className="shrink-0">- <UserAvatar template={template} />+ <UserTemplateAvatar template={template} /></div></div>@@ -206,14 +206,18 @@ function TemplateCardKeyboardShortcuts({return null;}-function UserAvatar({ template }: { template: UtmTemplateWithUserProps }) {+function UserTemplateAvatar({+ template,+}: {+ template: UtmTemplateWithUserProps;+}) {const { user } = template;return (<Tooltipcontent={<div className="w-full p-3">- <Avatar user={user} className="h-8 w-8" />+ <UserAvatar user={user} className="h-8 w-8" /><div className="mt-2 flex items-center gap-1.5"><p className="text-sm font-semibold text-neutral-700">{user?.name || user?.email || "Anonymous User"}@@ -226,7 +230,7 @@ function UserAvatar({ template }: { template: UtmTemplateWithUserProps }) {}><div>- <Avatar user={user} className="h-4 w-4" />+ <UserAvatar user={user} className="h-4 w-4" /></div></Tooltip>);diff --git a/apps/web/app/app.dub.co/(dashboard)/account/settings/tokens/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/account/settings/tokens/page-client.tsxindex dea26d9684..2da0e6b23c 100644--- a/apps/web/app/app.dub.co/(dashboard)/account/settings/tokens/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/account/settings/tokens/page-client.tsx@@ -2,13 +2,8 @@import { TokenProps } from "@/lib/types";import { useDeleteTokenModal } from "@/ui/modals/delete-token-modal";-import {- IconMenu,- LoadingSpinner,- Popover,- TokenAvatar,- TriangleWarning,-} from "@dub/ui";+import { TokenAvatar } from "@/ui/token-avatar";+import { IconMenu, LoadingSpinner, Popover, TriangleWarning } from "@dub/ui";import { fetcher, timeAgo } from "@dub/utils";import { FolderOpen, MoreVertical, Trash } from "lucide-react";import { useState } from "react";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 8466a34877..1f1ec76cc1 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@@ -1,8 +1,8 @@import { getSession } from "@/lib/auth";+import { UserAvatar } from "@/ui/users/user-avatar";import { prisma } from "@dub/prisma";import { Project, ProjectInvite, User } from "@dub/prisma/client";import {- Avatar,Book2Fill,CircleCheckFill,CircleHalfDottedClock,@@ -196,7 +196,10 @@ export default async function WorkspaceInvitePage({className="flex items-center justify-between gap-2 px-2.5 py-2"><div className="flex min-w-0 items-center gap-2">- <Avatar user={{ id, name, image }} className="size-6" />+ <UserAvatar+ user={{ id, name, image }}+ className="size-6"+ /><span className="text-content-default min-w-0 truncate text-sm font-medium">{name || email}</span>diff --git a/apps/web/lib/types.ts b/apps/web/lib/types.tsindex 2bd4f557e4..4114737a19 100644--- a/apps/web/lib/types.ts+++ b/apps/web/lib/types.ts@@ -883,3 +883,7 @@ export type PostbackEventProps = z.infer<typeof postbackEventInputSchemaTB>;export type PostbackTrigger = (typeof POSTBACK_TRIGGERS)[number];export type CommissionDetail = z.infer<typeof CommissionDetailSchema>;++export type NullableOptional<T> = {+ [K in keyof T]?: T[K] | null;+};diff --git a/apps/web/ui/account/upload-avatar.tsx b/apps/web/ui/account/upload-avatar.tsxindex 13bc8e80c5..d18a155410 100644--- a/apps/web/ui/account/upload-avatar.tsx+++ b/apps/web/ui/account/upload-avatar.tsx@@ -1,6 +1,7 @@"use client";-import { Button, FileUpload, getUserAvatarUrl } from "@dub/ui";+import { getUserAvatarUrl } from "@/ui/users/user-avatar";+import { Button, FileUpload } from "@dub/ui";import { useSession } from "next-auth/react";import { useEffect, useState } from "react";import { toast } from "sonner";@@ -8,10 +9,12 @@ import { toast } from "sonner";export default function UploadAvatar() {const { data: session, update } = useSession();- const [image, setImage] = useState<string | null>();+ const [image, setImage] = useState<string | null>(null);useEffect(() => {- setImage(session?.user ? getUserAvatarUrl(session.user) : null);+ if (session?.user) {+ getUserAvatarUrl(session.user).then((url) => setImage(url));+ }}, [session]);const [uploading, setUploading] = useState(false);diff --git a/apps/web/ui/activity-logs/action-renderers/reward-activity-renderer.tsx b/apps/web/ui/activity-logs/action-renderers/reward-activity-renderer.tsxindex f20beeec89..6276a55b0f 100644--- a/apps/web/ui/activity-logs/action-renderers/reward-activity-renderer.tsx+++ b/apps/web/ui/activity-logs/action-renderers/reward-activity-renderer.tsx@@ -5,7 +5,7 @@ import { ProgramRewardDescription } from "@/ui/partners/program-reward-descriptiimport { ProgramRewardModifiersTooltipContent } from "@/ui/partners/program-reward-modifiers-tooltip";import { TimestampTooltip } from "@dub/ui";import { formatDate } from "@dub/utils";-import { UserAvatar } from "../activity-entry-chips";+import { ActivityLogUserAvatar } from "../activity-entry-chips";interface RewardActivityConfig {title: string;@@ -83,7 +83,7 @@ export function RewardActivityRenderer({ log }: RewardActivityRendererProps) {<div className="flex w-full flex-col gap-4"><div className="flex items-center justify-between gap-2"><div className="flex items-center gap-2">- <UserAvatar user={log.user} />+ <ActivityLogUserAvatar user={log.user} /><span className="text-sm font-medium leading-5 text-neutral-800">{config.title}</span>diff --git a/apps/web/ui/activity-logs/activity-entry-chips.tsx b/apps/web/ui/activity-logs/activity-entry-chips.tsxindex 4ebc13a43b..5204b04a25 100644--- a/apps/web/ui/activity-logs/activity-entry-chips.tsx+++ b/apps/web/ui/activity-logs/activity-entry-chips.tsx@@ -133,7 +133,7 @@ export function ReferralStatusPill({ status }: { status: ReferralStatus }) {return <ActivityChip className={badge.className}>{badge.label}</ActivityChip>;}-export function UserAvatar({ user }: { user: ActivityLog["user"] }) {+export function ActivityLogUserAvatar({ user }: { user: ActivityLog["user"] }) {if (!user) return null;const image = user.image || `${OG_AVATAR_URL}${user.id}`;diff --git a/apps/web/ui/analytics/use-analytics-filters.tsx b/apps/web/ui/analytics/use-analytics-filters.tsxindex b771192473..e17678cf87 100644--- a/apps/web/ui/analytics/use-analytics-filters.tsx+++ b/apps/web/ui/analytics/use-analytics-filters.tsx@@ -3,6 +3,8 @@ import { VALID_ANALYTICS_FILTERS } from "@/lib/analytics/constants";import useCustomer from "@/lib/swr/use-customer";import usePartner from "@/lib/swr/use-partner";import usePartnerCustomer from "@/lib/swr/use-partner-customer";+import { CustomerAvatar } from "@/ui/customers/customer-avatar";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { readStreamableValue } from "@ai-sdk/rsc";import {BlurImage,@@ -12,7 +14,6 @@ import {useRouterStuff,UTM_PARAMETERS,} from "@dub/ui";-import {Calendar6,Cube,@@ -46,7 +47,6 @@ import {GOOGLE_FAVICON_URL,linkConstructor,nFormatter,- OG_AVATAR_URL,parseFilterValue,REGIONS,type FilterOperator,@@ -461,11 +461,7 @@ export function useAnalyticsFilters({value: partner.id,label: partner.name,icon: (- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-4 rounded-full"- />+ <PartnerAvatar partner={partner} className="size-4" />),right: getFilterOptionTotal(rest),};@@ -788,14 +784,7 @@ export function useAnalyticsFilters({hideInFilterDropdown: true,getOptionIcon: () => {return selectedCustomer ? (- <img- src={- selectedCustomer["avatar"] ||- `${OG_AVATAR_URL}${selectedCustomer.id}`- }- alt={`${selectedCustomer.email} avatar`}- className="size-4 rounded-full"- />+ <CustomerAvatar customer={selectedCustomer} className="size-4" />) : null;},getOptionPermalink: () => {@@ -814,13 +803,7 @@ export function useAnalyticsFilters({hideInFilterDropdown: true,getOptionIcon: () => {return selectedPartner ? (- <img- src={- selectedPartner.image || `${OG_AVATAR_URL}${selectedPartner.id}`- }- alt={`${selectedPartner.email} avatar`}- className="size-4 rounded-full"- />+ <PartnerAvatar partner={selectedPartner} className="size-4" />) : null;},getOptionLabel: () => {diff --git a/apps/web/ui/customers/customer-avatar.tsx b/apps/web/ui/customers/customer-avatar.tsxnew file mode 100644index 0000000000..b6a7c5051b--- /dev/null+++ b/apps/web/ui/customers/customer-avatar.tsx@@ -0,0 +1,20 @@+import { CustomerProps, NullableOptional } from "@/lib/types";+import { Avatar } from "@dub/ui";++export function CustomerAvatar({+ customer,+ className,+}: {+ customer: NullableOptional<+ Pick<CustomerProps, "id" | "name" | "email" | "avatar">+ >;+ className?: string;+}) {+ return (+ <Avatar+ imageUrl={customer.avatar}+ identifier={customer.id || customer.name || customer.email || "Unknown"}+ className={className}+ />+ );+}diff --git a/apps/web/ui/customers/customer-details-column.tsx b/apps/web/ui/customers/customer-details-column.tsxindex fb6472f327..edb10a3077 100644--- a/apps/web/ui/customers/customer-details-column.tsx+++ b/apps/web/ui/customers/customer-details-column.tsx@@ -1,4 +1,5 @@import { CustomerActivityResponse, CustomerEnriched } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import {Button,CalendarIcon,@@ -16,7 +17,6 @@ import {COUNTRIES,getParamsFromURL,getPrettyUrl,- OG_AVATAR_URL,} from "@dub/utils";import { Pencil } from "lucide-react";import { useParams } from "next/navigation";@@ -24,6 +24,7 @@ import { Fragment, HTMLProps, useMemo } from "react";import { DeviceIcon } from "../analytics/device-icon";import { useEditCustomerModal } from "../modals/edit-customer-modal";import { ConditionalLink } from "../shared/conditional-link";+import { CustomerAvatar } from "./customer-avatar";export function CustomerDetailsColumn({customer,@@ -120,10 +121,9 @@ export function CustomerDetailsColumn({<div className="flex items-start justify-between gap-2"><div className="relative w-fit">{customer ? (- <img- src={customer.avatar || `${OG_AVATAR_URL}${customer.id}`}- alt={customer.id}- className="size-10 rounded-full border border-neutral-100"+ <CustomerAvatar+ customer={customer}+ className="size-10 border border-neutral-100"/>) : (<div className="size-10 animate-pulse rounded-full bg-neutral-200" />@@ -311,11 +311,7 @@ export function CustomerDetailsColumn({{partner && (<div className="mb-4 flex items-center gap-2">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt=""- className="size-5 rounded-full"- />+ <PartnerAvatar partner={partner} className="size-5" /><ConditionalLinkhref={workspaceSlugdiff --git a/apps/web/ui/customers/customer-row-item.tsx b/apps/web/ui/customers/customer-row-item.tsxindex 3bd989e666..576a70366c 100644--- a/apps/web/ui/customers/customer-row-item.tsx+++ b/apps/web/ui/customers/customer-row-item.tsx@@ -1,8 +1,9 @@import { generateRandomName } from "@/lib/names";import { ChartActivity2 } from "@dub/ui";-import { cn, OG_AVATAR_URL } from "@dub/utils";+import { cn } from "@dub/utils";import Link from "next/link";import React, { ComponentProps } from "react";+import { CustomerAvatar } from "./customer-avatar";export function CustomerRowItem({customer,@@ -35,13 +36,9 @@ export function CustomerRowItem({)}><div className="flex items-center gap-2 truncate" title={display}>- <img- alt={display}- src={customer.avatar || `${OG_AVATAR_URL}${customer.id}`}- className={cn(- "size-5 shrink-0 rounded-full border border-neutral-200",- avatarClassName,- )}+ <CustomerAvatar+ customer={customer}+ className={cn("size-5 border border-neutral-200", avatarClassName)}/><span className="truncate">{display}</span></div>diff --git a/apps/web/ui/customers/customer-selector.tsx b/apps/web/ui/customers/customer-selector.tsxindex 720a93c191..e831ee00f6 100644--- a/apps/web/ui/customers/customer-selector.tsx+++ b/apps/web/ui/customers/customer-selector.tsx@@ -1,13 +1,14 @@import useCustomers from "@/lib/swr/use-customers";import { CUSTOMERS_MAX_PAGE_SIZE } from "@/lib/zod/schemas/customers";import { Combobox, ComboboxProps } from "@dub/ui";-import { cn, OG_AVATAR_URL } from "@dub/utils";+import { cn } from "@dub/utils";import { useEffect, useMemo, useState } from "react";import { useDebounce } from "use-debounce";import {AddCustomerModal,type AddCustomerInitialData,} from "../modals/add-customer-modal";+import { CustomerAvatar } from "./customer-avatar";type CustomerSelectorProps = {selectedCustomerId: string | null;@@ -57,18 +58,7 @@ export function CustomerSelector({label: customer.name || customer.email || customer.externalId,icon: (<span className="shrink-0 text-neutral-600">- <img- src={customer.avatar || `${OG_AVATAR_URL}${customer.id}`}- alt=""- className="size-4 rounded-full"- onError={(e) => {- // Fallback to OG avatar if image fails to load- const target = e.target as HTMLImageElement;- if (target.src !== `${OG_AVATAR_URL}${customer.id}`) {- target.src = `${OG_AVATAR_URL}${customer.id}`;- }- }}- />+ <CustomerAvatar customer={customer} className="size-4" /></span>),})) || []@@ -89,18 +79,7 @@ export function CustomerSelector({label: customer.name || customer.email || customer.externalId,icon: (<span className="shrink-0 text-neutral-600">- <img- src={customer.avatar || `${OG_AVATAR_URL}${customer.id}`}- alt=""- className="size-4 rounded-full"- onError={(e) => {- // Fallback to OG avatar if image fails to load- const target = e.target as HTMLImageElement;- if (target.src !== `${OG_AVATAR_URL}${customer.id}`) {- target.src = `${OG_AVATAR_URL}${customer.id}`;- }- }}- />+ <CustomerAvatar customer={customer} className="size-4" /></span>),};diff --git a/apps/web/ui/folders/edit-folder-sheet.tsx b/apps/web/ui/folders/edit-folder-sheet.tsxindex 761d9b5de6..43f2083a31 100644--- a/apps/web/ui/folders/edit-folder-sheet.tsx+++ b/apps/web/ui/folders/edit-folder-sheet.tsx@@ -11,9 +11,9 @@ import {import { useFolderUsers } from "@/lib/swr/use-folder-users";import useWorkspace from "@/lib/swr/use-workspace";import { Folder, FolderUser } from "@/lib/types";+import { UserAvatar } from "@/ui/users/user-avatar";import { FolderUserRole, WorkspaceRole } from "@dub/prisma/client";import {- Avatar,BlurImage,Button,DynamicTooltipWrapper,@@ -259,7 +259,7 @@ const FolderUserRow = ({return (<div key={user.id} className="flex items-center justify-between gap-3"><div className="flex min-w-12 items-center gap-3">- <Avatar user={user} className="size-8" />+ <UserAvatar user={user} className="size-8" /><div className="min-w-0"><h3 className="truncate text-xs font-medium text-neutral-800">{user.name || user.email}diff --git a/apps/web/ui/folders/folder-info-panel.tsx b/apps/web/ui/folders/folder-info-panel.tsxindex 154b7ad199..40942930f9 100644--- a/apps/web/ui/folders/folder-info-panel.tsx+++ b/apps/web/ui/folders/folder-info-panel.tsx@@ -4,7 +4,8 @@ import useFolder from "@/lib/swr/use-folder";import { useFolderUsers } from "@/lib/swr/use-folder-users";import useWorkspace from "@/lib/swr/use-workspace";import { FolderUser } from "@/lib/types";-import { Avatar, BlurImage, LoadingSpinner } from "@dub/ui";+import { UserAvatar } from "@/ui/users/user-avatar";+import { BlurImage, LoadingSpinner } from "@dub/ui";import { PropsWithChildren } from "react";import { FolderActions } from "./folder-actions";@@ -117,7 +118,7 @@ const UserList = ({)): users?.map((user) => (<div key={user.id} className="flex min-w-12 items-center gap-3">- <Avatar user={user} className="size-8" />+ <UserAvatar user={user} className="size-8" /><div className="min-w-0"><h3 className="truncate text-xs font-medium text-neutral-800">{user?.name || user?.email || "Anonymous User"}diff --git a/apps/web/ui/layout/sidebar/user-dropdown.tsx b/apps/web/ui/layout/sidebar/user-dropdown.tsxindex c6c63f8b52..792be8a925 100644--- a/apps/web/ui/layout/sidebar/user-dropdown.tsx+++ b/apps/web/ui/layout/sidebar/user-dropdown.tsx@@ -1,9 +1,9 @@"use client";import usePartnerProfile from "@/lib/swr/use-partner-profile";+import { UserAvatar } from "@/ui/users/user-avatar";import {ArrowsOppositeDirectionX,- Avatar,Gift,Icon,Popover,@@ -125,7 +125,7 @@ export function UserDropdown() {)}>{session?.user ? (- <Avatar+ <UserAvataruser={session.user}className="size-7 border-none duration-75 sm:size-7"/>diff --git a/apps/web/ui/layout/sidebar/workspace-dropdown.tsx b/apps/web/ui/layout/sidebar/workspace-dropdown.tsxindex 5cfe2c11dd..081e5ea842 100644--- a/apps/web/ui/layout/sidebar/workspace-dropdown.tsx+++ b/apps/web/ui/layout/sidebar/workspace-dropdown.tsx@@ -4,12 +4,8 @@ import useWorkspaceUsers from "@/lib/swr/use-workspace-users";import useWorkspaces from "@/lib/swr/use-workspaces";import { PlanProps, WorkspaceProps } from "@/lib/types";import { ModalContext } from "@/ui/modals/modal-provider";-import {- BlurImage,- getUserAvatarUrl,- Popover,- useScrollProgress,-} from "@dub/ui";+import { getUserAvatarUrl } from "@/ui/users/user-avatar";+import { BlurImage, Popover, useScrollProgress } from "@dub/ui";import { Check2, Gear, Plus, UserPlus } from "@dub/ui/icons";import { cn, isLegacyBusinessPlan, pluralize } from "@dub/utils";import { useSession } from "next-auth/react";@@ -61,7 +57,7 @@ export function WorkspaceDropdown() {} else {return {name: session?.user?.name || session?.user?.email,- image: getUserAvatarUrl(session?.user),+ image: getUserAvatarUrl(session?.user).then((url) => url),plan: "free",};}diff --git a/apps/web/ui/links/link-builder/link-creator-info.tsx b/apps/web/ui/links/link-builder/link-creator-info.tsxindex 986ecfb8f0..438a7102c1 100644--- a/apps/web/ui/links/link-builder/link-creator-info.tsx+++ b/apps/web/ui/links/link-builder/link-creator-info.tsx@@ -1,15 +1,10 @@import { ExpandedLinkProps } from "@/lib/types";-import { UserAvatar } from "@/ui/links/link-title-column";+import { UserAvatarWithTooltip } from "@/ui/links/link-title-column";import { TimestampTooltip } from "@dub/ui";import { timeAgo } from "@dub/utils";import Link from "next/link";import { useParams } from "next/navigation";-interface LinkCreatorInfoProps {- link: ExpandedLinkProps;- className?: string;-}-export function LinkCreatorInfo({ link }: { link: ExpandedLinkProps }) {const { slug } = useParams();@@ -17,7 +12,7 @@ export function LinkCreatorInfo({ link }: { link: ExpandedLinkProps }) {return (<div className="flex items-center gap-1 border-t border-neutral-200 py-8 text-sm text-neutral-600">- <UserAvatar user={link.user} />+ <UserAvatarWithTooltip user={link.user} /><span>Created by</span><Linkhref={`/${slug}/links?userId=${link.user.id}`}diff --git a/apps/web/ui/links/link-builder/link-partner-details.tsx b/apps/web/ui/links/link-builder/link-partner-details.tsxindex 51b9154f05..020616f24c 100644--- a/apps/web/ui/links/link-builder/link-partner-details.tsx+++ b/apps/web/ui/links/link-builder/link-partner-details.tsx@@ -1,8 +1,9 @@import useWorkspace from "@/lib/swr/use-workspace";import { EnrolledPartnerProps, LinkProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { PartnerStatusBadgeWithTooltip } from "@/ui/partners/partner-status-badge-with-tooltip";import { ArrowUpRight } from "@dub/ui/icons";-import { currencyFormatter, OG_AVATAR_URL } from "@dub/utils";+import { currencyFormatter } from "@dub/utils";import Link from "next/link";export function LinkPartnerDetails({@@ -23,11 +24,7 @@ export function LinkPartnerDetails({><div className="flex min-w-0 items-center gap-3">{partner ? (- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-8 rounded-full"- />+ <PartnerAvatar partner={partner} className="size-8" />) : (<div className="size-8 animate-pulse rounded-full bg-neutral-200" />)}diff --git a/apps/web/ui/links/link-title-column.tsx b/apps/web/ui/links/link-title-column.tsxindex 07788e7809..4e87676b33 100644--- a/apps/web/ui/links/link-title-column.tsx+++ b/apps/web/ui/links/link-title-column.tsx@@ -5,9 +5,9 @@ import useDomain from "@/lib/swr/use-domain";import useFolder from "@/lib/swr/use-folder";import useWorkspace from "@/lib/swr/use-workspace";import { UserProps } from "@/lib/types";+import { UserAvatar } from "@/ui/users/user-avatar";import {ArrowTurnRight2,- Avatar,CardList,CopyButton,LinkLogo,@@ -381,7 +381,7 @@ const Details = memo(displayProperties.includes("user") && "sm:block",)}>- <UserAvatar user={link.user} />+ <UserAvatarWithTooltip user={link.user} /></div><divclassName={cn(@@ -402,13 +402,13 @@ const Details = memo(},);-export function UserAvatar({ user }: { user: UserProps }) {+export function UserAvatarWithTooltip({ user }: { user: UserProps }) {const { slug } = useParams();return (<Tooltipcontent={<div className="w-full p-3">- <Avatar user={user} className="h-8 w-8" />+ <UserAvatar user={user} className="h-8 w-8" /><div className="mt-2 flex items-center gap-1.5"><p className="text-sm font-semibold text-neutral-700">{user?.name || user?.email || "Anonymous User"}@@ -430,7 +430,7 @@ export function UserAvatar({ user }: { user: UserProps }) {delayDuration={150}><div>- <Avatar user={user} className="size-4" />+ <UserAvatar user={user} className="size-4" /></div></Tooltip>);diff --git a/apps/web/ui/links/use-link-filters.tsx b/apps/web/ui/links/use-link-filters.tsxindex 3cf63ef943..69bf43955d 100644--- a/apps/web/ui/links/use-link-filters.tsx+++ b/apps/web/ui/links/use-link-filters.tsx@@ -5,7 +5,8 @@ import useTagsCount from "@/lib/swr/use-tags-count";import useWorkspaceUsers from "@/lib/swr/use-workspace-users";import { TagProps } from "@/lib/types";import { TAGS_MAX_PAGE_SIZE } from "@/lib/zod/schemas/tags";-import { Avatar, BlurImage, Globe, Tag, User, useRouterStuff } from "@dub/ui";+import { UserAvatar } from "@/ui/users/user-avatar";+import { BlurImage, Globe, Tag, User, useRouterStuff } from "@dub/ui";import { GOOGLE_FAVICON_URL, nFormatter } from "@dub/utils";import { useContext, useMemo, useState } from "react";import { useDebounce } from "use-debounce";@@ -93,7 +94,7 @@ export function useLinkFilters() {value: id,label: name,icon: (- <Avatar+ <UserAvataruser={{id,name,diff --git a/apps/web/ui/modals/archive-partner-modal.tsx b/apps/web/ui/modals/archive-partner-modal.tsxindex bef79fadb6..b6c152461a 100644--- a/apps/web/ui/modals/archive-partner-modal.tsx+++ b/apps/web/ui/modals/archive-partner-modal.tsx@@ -2,8 +2,9 @@ import { archivePartnerAction } from "@/lib/actions/partners/archive-partner";import { mutatePrefix } from "@/lib/swr/mutate";import useWorkspace from "@/lib/swr/use-workspace";import { EnrolledPartnerProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Modal } from "@dub/ui";-import { capitalize, OG_AVATAR_URL } from "@dub/utils";+import { capitalize } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -67,11 +68,7 @@ function ArchivePartnerModal({<div className="flex flex-col gap-6 bg-neutral-50 p-4 sm:p-6"><div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3"><div className="flex items-center gap-4">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-10 rounded-full bg-white"- />+ <PartnerAvatar partner={partner} className="size-10 bg-white" /><div className="flex min-w-0 flex-col"><h4 className="truncate text-sm font-medium text-neutral-900">{partner.name}diff --git a/apps/web/ui/modals/ban-partner-modal.tsx b/apps/web/ui/modals/ban-partner-modal.tsxindex fe00331e64..5ca9fb2a79 100644--- a/apps/web/ui/modals/ban-partner-modal.tsx+++ b/apps/web/ui/modals/ban-partner-modal.tsx@@ -5,8 +5,9 @@ import {BAN_PARTNER_REASONS,banPartnerSchema,} from "@/lib/zod/schemas/partners";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Modal } from "@dub/ui";-import { cn, OG_AVATAR_URL } from "@dub/utils";+import { cn } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -93,11 +94,7 @@ function BanPartnerModal({<div className="flex flex-col gap-6 bg-neutral-50 p-4 sm:p-6"><div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3"><div className="flex items-center gap-4">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-10 rounded-full bg-white"- />+ <PartnerAvatar partner={partner} className="size-10 bg-white" /><div className="flex min-w-0 flex-col"><h4 className="truncate text-sm font-medium text-neutral-900">{partner.name}diff --git a/apps/web/ui/modals/bulk-approve-partners-modal.tsx b/apps/web/ui/modals/bulk-approve-partners-modal.tsxindex a7a65b1c2e..4d363d51ae 100644--- a/apps/web/ui/modals/bulk-approve-partners-modal.tsx+++ b/apps/web/ui/modals/bulk-approve-partners-modal.tsx@@ -4,8 +4,9 @@ import useProgram from "@/lib/swr/use-program";import useWorkspace from "@/lib/swr/use-workspace";import { EnrolledPartnerProps } from "@/lib/types";import { GroupSelector } from "@/ui/partners/groups/group-selector";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Modal } from "@dub/ui";-import { cn, OG_AVATAR_URL, pluralize } from "@dub/utils";+import { cn, pluralize } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -80,12 +81,11 @@ function BulkApprovePartnersModal({<div className="flex items-center gap-3 rounded-lg border border-neutral-200 bg-neutral-100 p-3"><div className="flex items-center">{partners.slice(0, 3).map((partner, index) => (- <img+ <PartnerAvatarkey={partner.id}- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}+ partner={partner}className={cn(- "inline-block size-7 rounded-full border-2 border-neutral-100",+ "inline-block size-7 border-2 border-neutral-100",index > 0 && "-ml-2.5",)}/>diff --git a/apps/web/ui/modals/bulk-archive-partners-modal.tsx b/apps/web/ui/modals/bulk-archive-partners-modal.tsxindex 183dcbafff..6ca5d87755 100644--- a/apps/web/ui/modals/bulk-archive-partners-modal.tsx+++ b/apps/web/ui/modals/bulk-archive-partners-modal.tsx@@ -1,8 +1,9 @@import { bulkArchivePartnersAction } from "@/lib/actions/partners/bulk-archive-partners";import useWorkspace from "@/lib/swr/use-workspace";import { EnrolledPartnerProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Modal } from "@dub/ui";-import { cn, OG_AVATAR_URL, pluralize } from "@dub/utils";+import { cn, pluralize } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -81,10 +82,9 @@ function BulkArchivePartnersModal({<div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3">{partners.length === 1 ? (<div className="flex items-center gap-4">- <img- src={partners[0].image || `${OG_AVATAR_URL}${partners[0].name}`}- alt={partners[0].name}- className="size-10 rounded-full bg-white"+ <PartnerAvatar+ partner={partners[0]}+ className="size-10 bg-white"/><div className="flex min-w-0 flex-col"><h4 className="truncate text-sm font-medium text-neutral-900">@@ -101,12 +101,11 @@ function BulkArchivePartnersModal({<div className="flex items-center gap-3"><div className="flex items-center">{partners.slice(0, 3).map((partner, index) => (- <img+ <PartnerAvatarkey={partner.id}- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}+ partner={partner}className={cn(- "inline-block size-7 rounded-full border-2 border-neutral-100 bg-white",+ "inline-block size-7 border-2 border-neutral-100 bg-white",index > 0 && "-ml-2.5",)}/>diff --git a/apps/web/ui/modals/bulk-ban-partners-modal.tsx b/apps/web/ui/modals/bulk-ban-partners-modal.tsxindex 1141a0a1d8..c527ed1622 100644--- a/apps/web/ui/modals/bulk-ban-partners-modal.tsx+++ b/apps/web/ui/modals/bulk-ban-partners-modal.tsx@@ -6,8 +6,9 @@ import {BAN_PARTNER_REASONS,bulkBanPartnersSchema,} from "@/lib/zod/schemas/partners";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Modal } from "@dub/ui";-import { cn, OG_AVATAR_URL, pluralize } from "@dub/utils";+import { cn, pluralize } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -162,12 +163,9 @@ function BulkBanPartnersModal({<div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3">{partners.length === 1 ? (<div className="flex items-center gap-4">- <img- src={- partners[0].image || `${OG_AVATAR_URL}${partners[0].name}`- }- alt={partners[0].name}- className="size-10 rounded-full bg-white"+ <PartnerAvatar+ partner={partners[0]}+ className="size-10 bg-white"/><div className="flex min-w-0 flex-col"><h4 className="truncate text-sm font-medium text-neutral-900">@@ -184,12 +182,11 @@ function BulkBanPartnersModal({<div className="flex items-center gap-3"><div className="flex items-center">{partners.slice(0, 3).map((partner, index) => (- <img+ <PartnerAvatarkey={partner.id}- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}+ partner={partner}className={cn(- "inline-block size-7 rounded-full border-2 border-neutral-100 bg-white",+ "inline-block size-7 border-2 border-neutral-100 bg-white",index > 0 && "-ml-2.5",)}/>diff --git a/apps/web/ui/modals/bulk-deactivate-partners-modal.tsx b/apps/web/ui/modals/bulk-deactivate-partners-modal.tsxindex e2cbbc2b60..34c258474d 100644--- a/apps/web/ui/modals/bulk-deactivate-partners-modal.tsx+++ b/apps/web/ui/modals/bulk-deactivate-partners-modal.tsx@@ -1,8 +1,9 @@import { bulkDeactivatePartnersAction } from "@/lib/actions/partners/bulk-deactivate-partners";import useWorkspace from "@/lib/swr/use-workspace";import { EnrolledPartnerProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Modal } from "@dub/ui";-import { cn, OG_AVATAR_URL, pluralize } from "@dub/utils";+import { cn, pluralize } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -108,12 +109,9 @@ function BulkDeactivatePartnersModal({<div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3">{partners.length === 1 ? (<div className="flex items-center gap-4">- <img- src={- partners[0].image || `${OG_AVATAR_URL}${partners[0].name}`- }- alt={partners[0].name}- className="size-10 rounded-full bg-white"+ <PartnerAvatar+ partner={partners[0]}+ className="size-10 bg-white"/><div className="flex min-w-0 flex-col"><h4 className="truncate text-sm font-medium text-neutral-900">@@ -130,12 +128,11 @@ function BulkDeactivatePartnersModal({<div className="flex items-center gap-3"><div className="flex items-center">{partners.slice(0, 3).map((partner, index) => (- <img+ <PartnerAvatarkey={partner.id}- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}+ partner={partner}className={cn(- "inline-block size-7 rounded-full border-2 border-neutral-100 bg-white",+ "inline-block size-7 border-2 border-neutral-100 bg-white",index > 0 && "-ml-2.5",)}/>diff --git a/apps/web/ui/modals/bulk-reject-partners-modal.tsx b/apps/web/ui/modals/bulk-reject-partners-modal.tsxindex 60f76a722c..3a464dd413 100644--- a/apps/web/ui/modals/bulk-reject-partners-modal.tsx+++ b/apps/web/ui/modals/bulk-reject-partners-modal.tsx@@ -2,8 +2,9 @@ import { bulkRejectPartnerApplicationsAction } from "@/lib/actions/partners/bulkimport { mutatePrefix } from "@/lib/swr/mutate";import useWorkspace from "@/lib/swr/use-workspace";import { EnrolledPartnerProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Checkbox, Modal } from "@dub/ui";-import { cn, OG_AVATAR_URL, pluralize } from "@dub/utils";+import { cn, pluralize } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -84,12 +85,11 @@ function BulkRejectPartnersModal({<div className="flex items-center gap-3 rounded-lg border border-neutral-200 bg-neutral-100 p-3"><div className="flex items-center">{partners.slice(0, 3).map((partner, index) => (- <img+ <PartnerAvatarkey={partner.id}- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}+ partner={partner}className={cn(- "inline-block size-7 rounded-full border-2 border-neutral-100",+ "inline-block size-7 border-2 border-neutral-100",index > 0 && "-ml-2.5",)}/>diff --git a/apps/web/ui/modals/change-group-modal.tsx b/apps/web/ui/modals/change-group-modal.tsxindex 6157db441c..0fa0cd724c 100644--- a/apps/web/ui/modals/change-group-modal.tsx+++ b/apps/web/ui/modals/change-group-modal.tsx@@ -3,8 +3,9 @@ import { mutatePrefix } from "@/lib/swr/mutate";import { useApiMutation } from "@/lib/swr/use-api-mutation";import useWorkspace from "@/lib/swr/use-workspace";import { EnrolledPartnerExtendedProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, InfoTooltip, Modal, Switch } from "@dub/ui";-import { cn, OG_AVATAR_URL } from "@dub/utils";+import { cn } from "@dub/utils";import {Dispatch,SetStateAction,@@ -103,10 +104,9 @@ function ChangeGroupModal({<div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3">{isSinglePartner ? (<div className="flex items-center gap-4">- <img- src={partners[0].image || `${OG_AVATAR_URL}${partners[0].name}`}- alt={partners[0].name}- className="size-10 rounded-full bg-white"+ <PartnerAvatar+ partner={partners[0]}+ className="size-10 bg-white"/><div className="flex min-w-0 flex-col"><h4 className="truncate text-sm font-medium text-neutral-900">@@ -123,12 +123,11 @@ function ChangeGroupModal({<div className="flex items-center gap-3"><div className="flex items-center">{partners.slice(0, 3).map((partner, index) => (- <img+ <PartnerAvatarkey={partner.id}- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}+ partner={partner}className={cn(- "inline-block size-7 rounded-full border-2 border-neutral-100 bg-white",+ "inline-block size-7 border-2 border-neutral-100 bg-white",index > 0 && "-ml-2.5",)}/>diff --git a/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx b/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsxindex 86d93cc821..e5a090629b 100644--- a/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx+++ b/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx@@ -6,8 +6,9 @@ import { resolveBountyDetails } from "@/lib/bounty/utils";import { mutatePrefix } from "@/lib/swr/mutate";import useWorkspace from "@/lib/swr/use-workspace";import { BountyProps, BountySubmissionProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Modal } from "@dub/ui";-import { currencyFormatter, OG_AVATAR_URL } from "@dub/utils";+import { currencyFormatter } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import { useMemo, useState } from "react";import { toast } from "sonner";@@ -105,13 +106,9 @@ function ConfirmApproveBountySubmissionModal({/><div className="relative flex items-center justify-between gap-4"><div className="flex min-w-0 flex-1 items-center gap-4">- <img- src={- submission.partner.image ||- `${OG_AVATAR_URL}${submission.partner.id}`- }- alt={submission.partner.name}- className="size-10 shrink-0 rounded-full"+ <PartnerAvatar+ partner={submission.partner}+ className="size-10"/><div className="min-w-0 flex-1"><div className="truncate text-base font-semibold text-neutral-800">diff --git a/apps/web/ui/modals/deactivate-partner-modal.tsx b/apps/web/ui/modals/deactivate-partner-modal.tsxindex 0e99bb819e..59e7dd43f6 100644--- a/apps/web/ui/modals/deactivate-partner-modal.tsx+++ b/apps/web/ui/modals/deactivate-partner-modal.tsx@@ -2,8 +2,9 @@ import { deactivatePartnerAction } from "@/lib/actions/partners/deactivate-partnimport { mutatePrefix } from "@/lib/swr/mutate";import useWorkspace from "@/lib/swr/use-workspace";import { PartnerProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Modal } from "@dub/ui";-import { cn, OG_AVATAR_URL } from "@dub/utils";+import { cn } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -84,11 +85,7 @@ function DeactivatePartnerModal({<div className="flex flex-col gap-6 bg-neutral-50 p-4 sm:p-6"><div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3"><div className="flex items-center gap-4">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-10 rounded-full bg-white"- />+ <PartnerAvatar partner={partner} className="size-10 bg-white" /><div className="flex min-w-0 flex-col"><h4 className="truncate text-sm font-medium text-neutral-900">{partner.name}diff --git a/apps/web/ui/modals/delete-account-modal.tsx b/apps/web/ui/modals/delete-account-modal.tsxindex 7e71c51603..d524853327 100644--- a/apps/web/ui/modals/delete-account-modal.tsx+++ b/apps/web/ui/modals/delete-account-modal.tsx@@ -1,4 +1,5 @@-import { Avatar, Button, Modal, useMediaQuery } from "@dub/ui";+import { UserAvatar } from "@/ui/users/user-avatar";+import { Button, Modal, useMediaQuery } from "@dub/ui";import { cn } from "@dub/utils";import { useSession } from "next-auth/react";import { useRouter } from "next/navigation";@@ -82,7 +83,7 @@ function DeleteAccountModal({className="flex flex-col space-y-4 bg-neutral-50 px-4 py-4 sm:px-6"><div className="relative flex items-center gap-3 rounded-md border border-neutral-300 bg-white px-4 py-2">- <Avatar user={session?.user} className="size-7" />+ <UserAvatar user={session?.user} className="size-7" /><div className="flex flex-1 flex-col gap-0.5"><h3 className="line-clamp-1 text-sm font-medium text-neutral-600">{session?.user?.name || session?.user?.email}diff --git a/apps/web/ui/modals/reactivate-partner-modal.tsx b/apps/web/ui/modals/reactivate-partner-modal.tsxindex 9d2696e21c..3b8595713a 100644--- a/apps/web/ui/modals/reactivate-partner-modal.tsx+++ b/apps/web/ui/modals/reactivate-partner-modal.tsx@@ -2,8 +2,8 @@ import { reactivatePartnerAction } from "@/lib/actions/partners/reactivate-partnimport { mutatePrefix } from "@/lib/swr/mutate";import useWorkspace from "@/lib/swr/use-workspace";import { PartnerProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Modal } from "@dub/ui";-import { OG_AVATAR_URL } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -59,11 +59,7 @@ function ReactivatePartnerModal({<div className="flex flex-col gap-6 bg-neutral-50 p-4 sm:p-6"><div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3"><div className="flex items-center gap-4">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-10 rounded-full bg-white"- />+ <PartnerAvatar partner={partner} className="size-10 bg-white" /><div className="flex min-w-0 flex-col"><h4 className="truncate text-sm font-medium text-neutral-900">{partner.name}diff --git a/apps/web/ui/modals/reject-partner-application-modal.tsx b/apps/web/ui/modals/reject-partner-application-modal.tsxindex 804cc052ff..18120d8a06 100644--- a/apps/web/ui/modals/reject-partner-application-modal.tsx+++ b/apps/web/ui/modals/reject-partner-application-modal.tsx@@ -1,8 +1,8 @@import { rejectPartnerApplicationAction } from "@/lib/actions/partners/reject-partner-application";import useWorkspace from "@/lib/swr/use-workspace";import { PartnerProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Checkbox, Modal, useKeyboardShortcut } from "@dub/ui";-import { OG_AVATAR_URL } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -85,11 +85,7 @@ export function RejectPartnerApplicationModal({<div className="flex flex-col gap-6 bg-neutral-50 p-4 sm:p-6"><div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3"><div className="flex items-center gap-4">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-10 rounded-full bg-white"- />+ <PartnerAvatar partner={partner} className="size-10 bg-white" /><div className="flex min-w-0 flex-col"><h4 className="truncate text-sm font-medium text-neutral-900">{partner.name}diff --git a/apps/web/ui/modals/remove-partner-user-modal.tsx b/apps/web/ui/modals/remove-partner-user-modal.tsxindex 841214cce9..d51084dbe5 100644--- a/apps/web/ui/modals/remove-partner-user-modal.tsx+++ b/apps/web/ui/modals/remove-partner-user-modal.tsx@@ -1,7 +1,8 @@import { mutatePrefix } from "@/lib/swr/mutate";import usePartnerProfile from "@/lib/swr/use-partner-profile";import { PartnerUserProps } from "@/lib/types";-import { Avatar, Button, Modal, useMediaQuery } from "@dub/ui";+import { UserAvatar } from "@/ui/users/user-avatar";+import { Button, Modal, useMediaQuery } from "@dub/ui";import { signOut, useSession } from "next-auth/react";import { useSearchParams } from "next/navigation";@@ -121,7 +122,7 @@ function RemovePartnerUserModal({<div className="flex flex-col space-y-4 bg-neutral-50 px-4 py-4 sm:px-6"><div className="relative flex items-center gap-2 space-x-3 rounded-md border border-neutral-300 bg-white px-4 py-2"><div className="flex items-center gap-2">- <Avatar user={user} className="size-10" />+ <UserAvatar user={user} className="size-10" /><div className="flex flex-col">{isInvite ? (<p className="text-content-subtle text-sm font-medium">diff --git a/apps/web/ui/modals/remove-workspace-user-modal.tsx b/apps/web/ui/modals/remove-workspace-user-modal.tsxindex 5ea3d09acd..1103a8eace 100644--- a/apps/web/ui/modals/remove-workspace-user-modal.tsx+++ b/apps/web/ui/modals/remove-workspace-user-modal.tsx@@ -1,7 +1,8 @@import { mutatePrefix } from "@/lib/swr/mutate";import useWorkspace from "@/lib/swr/use-workspace";import { TokenProps, UserProps } from "@/lib/types";-import { Avatar, Button, Modal, useMediaQuery } from "@dub/ui";+import { UserAvatar } from "@/ui/users/user-avatar";+import { Button, Modal, useMediaQuery } from "@dub/ui";import { TriangleWarning } from "@dub/ui/icons";import { fetcher, timeAgo } from "@dub/utils";import { useSession } from "next-auth/react";@@ -124,7 +125,7 @@ function RemoveWorkspaceUserModal({<div className="relative flex items-center gap-2 space-x-3 rounded-md border border-neutral-300 bg-white px-4 py-2"><div className="flex items-center gap-2">- <Avatar user={user} className="size-10" />+ <UserAvatar user={user} className="size-10" /><div className="flex flex-col"><p className="text-sm font-medium text-neutral-900">{user.name || user.email}diff --git a/apps/web/ui/modals/unban-partner-modal.tsx b/apps/web/ui/modals/unban-partner-modal.tsxindex 02ea700105..7c1da016ec 100644--- a/apps/web/ui/modals/unban-partner-modal.tsx+++ b/apps/web/ui/modals/unban-partner-modal.tsx@@ -2,8 +2,9 @@ import { unbanPartnerAction } from "@/lib/actions/partners/unban-partner";import { mutatePrefix } from "@/lib/swr/mutate";import useWorkspace from "@/lib/swr/use-workspace";import { PartnerProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Modal } from "@dub/ui";-import { cn, OG_AVATAR_URL } from "@dub/utils";+import { cn } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -84,11 +85,7 @@ function UnbanPartnerModal({<div className="flex flex-col gap-6 bg-neutral-50 p-4 sm:p-6"><div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3"><div className="flex items-center gap-4">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-10 rounded-full bg-white"- />+ <PartnerAvatar partner={partner} className="size-10 bg-white" /><div className="flex min-w-0 flex-col"><h4 className="truncate text-sm font-medium text-neutral-900">{partner.name}diff --git a/apps/web/ui/modals/uninstall-integration-modal.tsx b/apps/web/ui/modals/uninstall-integration-modal.tsxindex 1cd6dabf65..73db33116e 100644--- a/apps/web/ui/modals/uninstall-integration-modal.tsx+++ b/apps/web/ui/modals/uninstall-integration-modal.tsx@@ -1,13 +1,7 @@import useWorkspace from "@/lib/swr/use-workspace";import { InstalledIntegrationInfoProps } from "@/lib/types";-import {- BlurImage,- Button,- Logo,- Modal,- TokenAvatar,- useMediaQuery,-} from "@dub/ui";+import { TokenAvatar } from "@/ui/token-avatar";+import { BlurImage, Button, Logo, Modal, useMediaQuery } from "@dub/ui";import { useRouter } from "next/navigation";import {Dispatch,diff --git a/apps/web/ui/modals/update-partner-user-modal.tsx b/apps/web/ui/modals/update-partner-user-modal.tsxindex cdd8e7a2e4..6db5219476 100644--- a/apps/web/ui/modals/update-partner-user-modal.tsx+++ b/apps/web/ui/modals/update-partner-user-modal.tsx@@ -1,7 +1,8 @@import { mutatePrefix } from "@/lib/swr/mutate";import { PartnerUserProps } from "@/lib/types";+import { UserAvatar } from "@/ui/users/user-avatar";import { PartnerRole } from "@dub/prisma/client";-import { Avatar, Button, Modal, useMediaQuery } from "@dub/ui";+import { Button, Modal, useMediaQuery } from "@dub/ui";import { useSearchParams } from "next/navigation";import {Dispatch,@@ -85,7 +86,7 @@ function UpdatePartnerUserModal({<div className="flex flex-col space-y-4 bg-neutral-50 px-4 py-4 sm:px-6"><div className="relative flex items-center gap-2 space-x-3 rounded-md border border-neutral-300 bg-white px-4 py-2"><div className="flex items-center gap-2">- <Avatar user={user} className="size-10" />+ <UserAvatar user={user} className="size-10" /><div className="flex flex-col">{isInvite ? (<p className="text-content-subtle text-sm font-medium">diff --git a/apps/web/ui/modals/update-workspace-user-role.tsx b/apps/web/ui/modals/update-workspace-user-role.tsxindex 6d8795914b..833b819854 100644--- a/apps/web/ui/modals/update-workspace-user-role.tsx+++ b/apps/web/ui/modals/update-workspace-user-role.tsx@@ -1,8 +1,9 @@import { mutatePrefix } from "@/lib/swr/mutate";import useWorkspace from "@/lib/swr/use-workspace";import { UserProps } from "@/lib/types";+import { UserAvatar } from "@/ui/users/user-avatar";import { WorkspaceRole } from "@dub/prisma/client";-import { Avatar, Button, Modal, useMediaQuery } from "@dub/ui";+import { Button, Modal, useMediaQuery } from "@dub/ui";import { useSearchParams } from "next/navigation";import {Dispatch,@@ -87,7 +88,7 @@ function WorkspaceUserRoleModal({<div className="flex flex-col space-y-4 bg-neutral-50 px-4 py-4 sm:px-6"><div className="relative flex items-center gap-2 space-x-3 rounded-md border border-neutral-300 bg-white px-4 py-2"><div className="flex items-center gap-2">- <Avatar user={user} className="size-10" />+ <UserAvatar user={user} className="size-10" /><div className="flex flex-col">{isInvite ? (<p className="text-content-subtle text-sm font-medium">diff --git a/apps/web/ui/oauth-apps/oauth-app-card.tsx b/apps/web/ui/oauth-apps/oauth-app-card.tsxindex 51956b7666..61f0670c83 100644--- a/apps/web/ui/oauth-apps/oauth-app-card.tsx+++ b/apps/web/ui/oauth-apps/oauth-app-card.tsx@@ -1,6 +1,7 @@import useWorkspace from "@/lib/swr/use-workspace";import { OAuthAppProps } from "@/lib/types";-import { BlurImage, TokenAvatar } from "@dub/ui";+import { TokenAvatar } from "@/ui/token-avatar";+import { BlurImage } from "@dub/ui";import { formatDate } from "@dub/utils";import Link from "next/link";diff --git a/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx b/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsxindex 6d7ca8f170..d61dcd0c68 100644--- a/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx+++ b/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx@@ -5,6 +5,7 @@ import { mutatePrefix } from "@/lib/swr/mutate";import { FraudGroupProps } from "@/lib/types";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 {Button,@@ -176,11 +177,7 @@ function FraudReviewSheetContent({Partner details</h2><div className="flex min-w-0 items-center gap-3">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-10 rounded-full"- />+ <PartnerAvatar partner={partner} className="size-10" /><div className="flex min-w-0 flex-col"><span className="text-content-emphasis truncate text-sm font-semibold">{partner.name}diff --git a/apps/web/ui/partners/fraud-risks/resolve-fraud-group-modal.tsx b/apps/web/ui/partners/fraud-risks/resolve-fraud-group-modal.tsxindex 5eade92934..e5fac6b434 100644--- a/apps/web/ui/partners/fraud-risks/resolve-fraud-group-modal.tsx+++ b/apps/web/ui/partners/fraud-risks/resolve-fraud-group-modal.tsx@@ -8,9 +8,10 @@ import {MAX_RESOLUTION_REASON_LENGTH,resolveFraudGroupSchema,} from "@/lib/zod/schemas/fraud";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { MaxCharactersCounter } from "@/ui/shared/max-characters-counter";import { Button, Modal } from "@dub/ui";-import { cn, OG_AVATAR_URL, pluralize } from "@dub/utils";+import { cn, pluralize } from "@dub/utils";import { useAction } from "next-safe-action/hooks";import {Dispatch,@@ -92,11 +93,7 @@ function ResolveFraudGroupModal({{partner && (<div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3"><div className="flex items-center gap-4">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-10 rounded-full bg-white"- />+ <PartnerAvatar partner={partner} className="size-10 bg-white" /><div className="flex min-w-0 flex-col"><h4 className="truncate text-sm font-medium text-neutral-900">{partner.name || "Unknown"}diff --git a/apps/web/ui/partners/groups/reward-discount-partners-card.tsx b/apps/web/ui/partners/groups/reward-discount-partners-card.tsxindex c04f70f2f5..46cb98394d 100644--- a/apps/web/ui/partners/groups/reward-discount-partners-card.tsx+++ b/apps/web/ui/partners/groups/reward-discount-partners-card.tsx@@ -1,9 +1,10 @@import usePartners from "@/lib/swr/use-partners";import usePartnersCount from "@/lib/swr/use-partners-count";import { EnrolledPartnerProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, ChevronRight, Table, useTable } from "@dub/ui";import { Users } from "@dub/ui/icons";-import { cn, nFormatter, OG_AVATAR_URL, pluralize } from "@dub/utils";+import { cn, nFormatter, pluralize } from "@dub/utils";import { motion } from "motion/react";import Link from "next/link";import { useParams } from "next/navigation";@@ -105,11 +106,7 @@ function PartnersCompactTable({header: "Partner",cell: ({ row }) => (<div className="flex items-center gap-2">- <img- src={row.original.image || `${OG_AVATAR_URL}${row.original.name}`}- alt={row.original.name}- className="size-6 shrink-0 rounded-full"- />+ <PartnerAvatar partner={row.original} className="size-6" /><span className="truncate text-sm text-neutral-700">{row.original.name}</span>@@ -204,13 +201,11 @@ function PartnerPreviewOrCount({!showAvatars && "pointer-events-none translate-y-0.5 opacity-0",)}>- {previewPartners.map(({ id, name, image }) => (- <img- key={id}- src={image || `${OG_AVATAR_URL}${name}`}- alt={`${name} avatar`}- title={name}- className="-ml-1.5 size-[1.125rem] shrink-0 rounded-full border border-white"+ {previewPartners.map((partner) => (+ <PartnerAvatar+ key={partner.id}+ partner={partner}+ className="-ml-1.5 size-[1.125rem] border border-white"/>))}{partnersCount > 3 && (diff --git a/apps/web/ui/partners/merge-accounts/merge-account-form.tsx b/apps/web/ui/partners/merge-accounts/merge-account-form.tsxindex 4c0b0a107f..4c6ccce789 100644--- a/apps/web/ui/partners/merge-accounts/merge-account-form.tsx+++ b/apps/web/ui/partners/merge-accounts/merge-account-form.tsx@@ -1,5 +1,6 @@import { mergePartnerAccountsAction } from "@/lib/actions/partners/merge-partner-accounts";import useUser from "@/lib/swr/use-user";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button } from "@dub/ui";import { AlertTriangle, ArrowDown } from "lucide-react";import { signOut } from "next-auth/react";@@ -55,13 +56,13 @@ export function MergeAccountForm({<div className="flex flex-col gap-4"><AccountInputGroup title="Source account"><div className="flex items-center gap-4">- <img- src={- sourceAccount.avatarUrl ||- `https://api.dub.co/og/avatar/${sourceAccount.email}`- }- alt={sourceAccount.name}- className="size-12 rounded-full object-cover"+ <PartnerAvatar+ partner={{+ image: sourceAccount.avatarUrl,+ name: sourceAccount.name,+ id: sourceAccount.email,+ }}+ className="size-12 object-cover"/><div><div className="text-base font-semibold leading-4 text-neutral-900">@@ -80,13 +81,13 @@ export function MergeAccountForm({<AccountInputGroup title="Target account"><div className="flex items-center gap-4">- <img- src={- targetAccount.avatarUrl ||- `https://api.dub.co/og/avatar/${targetAccount.email}`- }- alt={targetAccount.name}- className="size-12 rounded-full object-cover"+ <PartnerAvatar+ partner={{+ image: targetAccount.avatarUrl,+ name: targetAccount.name,+ id: targetAccount.email,+ }}+ className="size-12 object-cover"/><div><div className="text-base font-semibold leading-4 text-neutral-900">diff --git a/apps/web/ui/partners/overview/blocks/commissions-block.tsx b/apps/web/ui/partners/overview/blocks/commissions-block.tsxindex 3f41caa920..07fdd3c2db 100644--- a/apps/web/ui/partners/overview/blocks/commissions-block.tsx+++ b/apps/web/ui/partners/overview/blocks/commissions-block.tsx@@ -1,8 +1,9 @@import useWorkspace from "@/lib/swr/use-workspace";import { CommissionResponse } from "@/lib/types";import { AnalyticsContext } from "@/ui/analytics/analytics-provider";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { ArrowRight, LoadingSpinner, StatusBadge } from "@dub/ui";-import { currencyFormatter, fetcher, OG_AVATAR_URL } from "@dub/utils";+import { currencyFormatter, fetcher } from "@dub/utils";import Link from "next/link";import { useContext } from "react";import useSWR from "swr";@@ -51,11 +52,7 @@ export function CommissionsBlock() {className="text-content-default group flex h-10 items-center justify-between text-xs font-medium"><div className="flex min-w-0 items-center gap-2">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-4 rounded-full"- />+ <PartnerAvatar partner={partner} className="size-4" /><span className="min-w-0 truncate">{partner.name}</span><ArrowRight className="text-content-emphasis size-2.5 -translate-x-0.5 opacity-0 transition-[opacity,transform] group-hover:translate-x-0 group-hover:opacity-100 [&_*]:stroke-2" /></div>diff --git a/apps/web/ui/partners/overview/blocks/partners-block.tsx b/apps/web/ui/partners/overview/blocks/partners-block.tsxindex 7b9f2a7d71..f8db967812 100644--- a/apps/web/ui/partners/overview/blocks/partners-block.tsx+++ b/apps/web/ui/partners/overview/blocks/partners-block.tsx@@ -4,13 +4,9 @@ import useWorkspace from "@/lib/swr/use-workspace";import { PartnerProps } from "@/lib/types";import { AnalyticsContext } from "@/ui/analytics/analytics-provider";import { ExceededEventsLimit } from "@/ui/partners/overview/exceeded-events-limit";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { ArrowRight, LoadingSpinner } from "@dub/ui";-import {- currencyFormatter,- fetcher,- nFormatter,- OG_AVATAR_URL,-} from "@dub/utils";+import { currencyFormatter, fetcher, nFormatter } from "@dub/utils";import Link from "next/link";import { useContext } from "react";import useSWR from "swr";@@ -66,14 +62,7 @@ export function PartnersBlock() {className="text-content-default group flex h-10 items-center justify-between text-xs font-medium"><div className="flex min-w-0 items-center gap-2">- <img- src={- partner.partner.image ||- `${OG_AVATAR_URL}${partner.partner.name}`- }- alt={`${partner.partner.name} avatar`}- className="size-4 rounded-full"- />+ <PartnerAvatar partner={partner.partner} className="size-4" /><span className="min-w-0 truncate">{partner.partner.name}</span><ArrowRight className="text-content-emphasis size-2.5 -translate-x-0.5 opacity-0 transition-[opacity,transform] group-hover:translate-x-0 group-hover:opacity-100 [&_*]:stroke-2" /></div>diff --git a/apps/web/ui/partners/partner-avatar.tsx b/apps/web/ui/partners/partner-avatar.tsxnew file mode 100644index 0000000000..a070d9c116--- /dev/null+++ b/apps/web/ui/partners/partner-avatar.tsx@@ -0,0 +1,18 @@+import { NullableOptional, PartnerProps } from "@/lib/types";+import { Avatar } from "@dub/ui";++export function PartnerAvatar({+ partner,+ className,+}: {+ partner: NullableOptional<PartnerProps>;+ className?: string;+}) {+ return (+ <Avatar+ imageUrl={partner.image}+ identifier={partner.id || partner.name || partner.email || "Unknown"}+ className={className}+ />+ );+}diff --git a/apps/web/ui/partners/partner-info-cards.tsx b/apps/web/ui/partners/partner-info-cards.tsxindex b880ef4f6a..f16c39eca3 100644--- a/apps/web/ui/partners/partner-info-cards.tsx+++ b/apps/web/ui/partners/partner-info-cards.tsx@@ -23,7 +23,6 @@ import {} from "@dub/ui";import {COUNTRIES,- OG_AVATAR_URL,capitalize,fetcher,formatDate,@@ -40,6 +39,7 @@ import {PartnerFraudBanner,} from "./fraud-risks/partner-fraud-banner";import { PartnerFraudIndicator } from "./fraud-risks/partner-fraud-indicator";+import { PartnerAvatar } from "./partner-avatar";import { PartnerInfoGroup } from "./partner-info-group";import { ConversionScoreTooltip } from "./partner-network/conversion-score-tooltip";import { PartnerStarButton } from "./partner-star-button";@@ -256,10 +256,9 @@ export function PartnerInfoCards({<div className="flex items-start justify-between gap-2"><div className="relative w-fit shrink-0">{partner ? (- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-20 rounded-full border border-neutral-100"+ <PartnerAvatar+ partner={partner}+ className="size-20 border border-neutral-100"/>) : (<div className="size-20 animate-pulse rounded-full bg-neutral-200" />diff --git a/apps/web/ui/partners/partner-info-section.tsx b/apps/web/ui/partners/partner-info-section.tsxindex a41ec7cb86..4a89e227bd 100644--- a/apps/web/ui/partners/partner-info-section.tsx+++ b/apps/web/ui/partners/partner-info-section.tsx@@ -1,7 +1,8 @@import { EnrolledPartnerProps } from "@/lib/types";import { CopyButton, Tooltip } from "@dub/ui";-import { COUNTRIES, OG_AVATAR_URL } from "@dub/utils";+import { COUNTRIES } from "@dub/utils";import { PropsWithChildren } from "react";+import { PartnerAvatar } from "./partner-avatar";import { PartnerStatusBadgeWithTooltip } from "./partner-status-badge-with-tooltip";export function PartnerInfoSection({@@ -26,11 +27,7 @@ export function PartnerInfoSection({<div className="flex items-start justify-between gap-6"><div><div className="relative w-fit">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-12 rounded-full"- />+ <PartnerAvatar partner={partner} className="size-12" />{partner.country && (<Tooltip content={COUNTRIES[partner.country]}><div className="absolute -right-1 top-0 overflow-hidden rounded-full bg-neutral-50 p-0.5 transition-transform duration-100 hover:scale-[1.15]">diff --git a/apps/web/ui/partners/partner-row-item.tsx b/apps/web/ui/partners/partner-row-item.tsxindex af8be865d4..b8b7b637a4 100644--- a/apps/web/ui/partners/partner-row-item.tsx+++ b/apps/web/ui/partners/partner-row-item.tsx@@ -2,11 +2,11 @@ import useProgram from "@/lib/swr/use-program";import { PartnerPayoutMethod } from "@dub/prisma/client";import { CircleArrowRight, DynamicTooltipWrapper, GreekTemple } from "@dub/ui";import { cn, formatDateTimeSmart } from "@dub/utils";-import { OG_AVATAR_URL } from "@dub/utils/src/constants";import { CircleMinus } from "lucide-react";import Link from "next/link";import { useParams } from "next/navigation";import { PartnerFraudIndicator } from "./fraud-risks/partner-fraud-indicator";+import { PartnerAvatar } from "./partner-avatar";import {getPayoutMethodIconConfig,getPayoutMethodLabel,@@ -192,11 +192,7 @@ export function PartnerRowItem({}><div className="relative shrink-0">- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- alt={partner.id}- className="size-5 shrink-0 rounded-full"- />+ <PartnerAvatar partner={partner} className="size-5" />{showPayoutsEnabled && statusKey && (<divclassName={cn(diff --git a/apps/web/ui/partners/partner-selector.tsx b/apps/web/ui/partners/partner-selector.tsxindex 62b21ddf89..09f95ca77f 100644--- a/apps/web/ui/partners/partner-selector.tsx+++ b/apps/web/ui/partners/partner-selector.tsx@@ -2,9 +2,10 @@ import usePartners from "@/lib/swr/use-partners";import { PartnerProps } from "@/lib/types";import { PARTNERS_MAX_PAGE_SIZE } from "@/lib/zod/schemas/partners";import { Combobox, ComboboxProps } from "@dub/ui";-import { cn, OG_AVATAR_URL } from "@dub/utils";+import { cn } from "@dub/utils";import { useEffect, useMemo, useState } from "react";import { useDebounce } from "use-debounce";+import { PartnerAvatar } from "./partner-avatar";export type Partner = Pick<PartnerProps, "id" | "name">;@@ -48,12 +49,7 @@ export function PartnerSelector({return partners?.map((partner) => ({value: partner.id,label: partner.name,- icon: (- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- className="size-4 rounded-full"- />- ),+ icon: <PartnerAvatar partner={partner} className="size-4" />,}));}, [partners]);@@ -69,12 +65,7 @@ export function PartnerSelector({return {value: partner.id,label: partner.name,- icon: (- <img- src={partner.image || `${OG_AVATAR_URL}${partner.id}`}- className="size-4 rounded-full"- />- ),+ icon: <PartnerAvatar partner={partner} className="size-4" />,};}, [partners, selectedPartners, selectedPartnerId]);diff --git a/apps/web/ui/partners/program-application-sheet.tsx b/apps/web/ui/partners/program-application-sheet.tsxindex 2e0da6acb5..791f4283db 100644--- a/apps/web/ui/partners/program-application-sheet.tsx+++ b/apps/web/ui/partners/program-application-sheet.tsx@@ -30,6 +30,7 @@ import useSWR, { mutate } from "swr";import * as z from "zod/v4";import { ProgramApplicationFormField } from "./groups/design/application-form/fields";import { formDataForApplicationFormData } from "./groups/design/application-form/form-data-for-application-form-data";+import { PartnerAvatar } from "./partner-avatar";interface ProgramApplicationSheetProps {setIsOpen: Dispatch<SetStateAction<boolean>>;@@ -283,10 +284,13 @@ function ProgramApplicationSheetForm({alt={program.name}className="z-10 size-20 rotate-[-15deg] rounded-full drop-shadow-md"/>- <img- src={partner?.image || `${OG_AVATAR_URL}${partner?.name}`}- alt={partner?.name || "Your avatar"}- className="-ml-4 size-20 rotate-[15deg] rounded-full drop-shadow-md"+ <PartnerAvatar+ partner={{+ id: partner?.id,+ name: partner?.name,+ image: partner?.image,+ }}+ className="-ml-4 size-20 rotate-[15deg] drop-shadow-md"/><div className="absolute -bottom-2 left-1/2 z-10 -translate-x-1/2 rounded-full bg-white p-0.5"><CircleCheckFill className="size-8 text-green-500" />diff --git a/apps/web/ui/partners/rewards/reward-preview-card.tsx b/apps/web/ui/partners/rewards/reward-preview-card.tsxindex 8eea65fef0..5d97408602 100644--- a/apps/web/ui/partners/rewards/reward-preview-card.tsx+++ b/apps/web/ui/partners/rewards/reward-preview-card.tsx@@ -1,6 +1,7 @@import { EnrolledPartnerProps } from "@/lib/types";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { Button, Table, useTable } from "@dub/ui";-import { cn, nFormatter, OG_AVATAR_URL, pluralize } from "@dub/utils";+import { cn, nFormatter, pluralize } from "@dub/utils";import Link from "next/link";import { useParams } from "next/navigation";import { useWatch } from "react-hook-form";@@ -63,11 +64,7 @@ function PartnersCompactTable({header: "Partner",cell: ({ row }) => (<div className="flex items-center gap-2">- <img- src={row.original.image || `${OG_AVATAR_URL}${row.original.name}`}- alt={row.original.name}- className="size-6 shrink-0 rounded-full"- />+ <PartnerAvatar partner={row.original} className="size-6" /><span className="truncate text-sm text-neutral-700">{row.original.name}</span>@@ -162,13 +159,11 @@ function PartnerPreviewOrCount({!showAvatars && "pointer-events-none translate-y-0.5 opacity-0",)}>- {previewPartners.map(({ id, name, image }) => (- <img- key={id}- src={image || `${OG_AVATAR_URL}${name}`}- alt={`${name} avatar`}- title={name}- className="-ml-1.5 size-[1.125rem] shrink-0 rounded-full border border-white"+ {previewPartners.map((partner) => (+ <PartnerAvatar+ key={partner.id}+ partner={partner}+ className="-ml-1.5 size-[1.125rem] border border-white"/>))}{partnersCount > 3 && (diff --git a/apps/web/ui/postbacks/postback-card.tsx b/apps/web/ui/postbacks/postback-card.tsxindex 73e5569335..b465546a5e 100644--- a/apps/web/ui/postbacks/postback-card.tsx+++ b/apps/web/ui/postbacks/postback-card.tsx@@ -1,5 +1,6 @@import { PostbackProps } from "@/lib/types";-import { Slack, TokenAvatar } from "@dub/ui";+import { TokenAvatar } from "@/ui/token-avatar";+import { Slack } from "@dub/ui";import Link from "next/link";import { PostbackStatus } from "./postback-status";diff --git a/apps/web/ui/referrals/referral-partner-details.tsx b/apps/web/ui/referrals/referral-partner-details.tsxindex 1d32a26e3e..87297b62b4 100644--- a/apps/web/ui/referrals/referral-partner-details.tsx+++ b/apps/web/ui/referrals/referral-partner-details.tsx@@ -1,5 +1,5 @@import { ReferralProps } from "@/lib/types";-import { OG_AVATAR_URL } from "@dub/utils";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";import Link from "next/link";import { useParams } from "next/navigation";@@ -22,12 +22,9 @@ export function ReferralPartnerDetails({target="_blank"className="flex items-center gap-2 transition-opacity hover:opacity-80">- <img- src={- referral.partner.image || `${OG_AVATAR_URL}${referral.partner.id}`- }- alt={referral.partner.name}- className="size-5 rounded-full border border-neutral-100"+ <PartnerAvatar+ partner={referral.partner}+ className="size-5 border border-neutral-100"/><div className="text-content-emphasis cursor-alias text-sm font-semibold decoration-dotted hover:underline">{referral.partner.name}diff --git a/apps/web/ui/token-avatar.tsx b/apps/web/ui/token-avatar.tsxnew file mode 100644index 0000000000..ddb067f3a6--- /dev/null+++ b/apps/web/ui/token-avatar.tsx@@ -0,0 +1,18 @@+import { cn } from "@dub/utils";++export function TokenAvatar({+ id,+ className,+}: {+ id: string;+ className?: string;+}) {+ return (+ <img+ src={`https://api.dicebear.com/9.x/shapes/svg?seed=${id}`}+ alt="avatar"+ className={cn("h-10 w-10 rounded-full", className)}+ draggable={false}+ />+ );+}diff --git a/apps/web/ui/users/user-avatar.tsx b/apps/web/ui/users/user-avatar.tsxnew file mode 100644index 0000000000..0dfd8863ad--- /dev/null+++ b/apps/web/ui/users/user-avatar.tsx@@ -0,0 +1,67 @@+"use client";++import { cn, hashStringSHA256 } from "@dub/utils";+import { useEffect, useState } from "react";++type User = {+ id?: string | null | undefined;+ name?: string | null | undefined;+ email?: string | null | undefined;+ image?: string | null | undefined;+};++export async function getUserAvatarUrl(user?: User | null) {+ if (user?.image) return user.image;++ if (!user?.id) return "https://api.dub.co/og/avatar";++ const ogAvatar = `https://api.dub.co/og/avatar/${user.id}`;++ return user.email+ ? `https://0.gravatar.com/avatar/${await hashStringSHA256(user.email)}?d=${ogAvatar}`+ : ogAvatar;+}++export function UserAvatar({+ user = {},+ className,+}: {+ user?: User;+ className?: string;+}) {+ const [src, setSrc] = useState<string | null>(null);++ useEffect(() => {+ let cancelled = false;+ getUserAvatarUrl(user).then((url) => {+ if (!cancelled) setSrc(url);+ });+ return () => {+ cancelled = true;+ };+ }, [user?.id, user?.email, user?.image]);++ if (!user || !src) {+ return (+ <div+ className={cn(+ "h-10 w-10 animate-pulse rounded-full border border-neutral-300 bg-neutral-100",+ className,+ )}+ />+ );+ }++ return (+ <img+ alt={`Avatar for ${user.name || user.email}`}+ referrerPolicy="no-referrer"+ src={src}+ className={cn(+ "h-10 w-10 rounded-full border border-neutral-300",+ className,+ )}+ draggable={false}+ />+ );+}diff --git a/apps/web/ui/webhooks/webhook-card.tsx b/apps/web/ui/webhooks/webhook-card.tsxindex 08932bc0bc..50cb3cdc2a 100644--- a/apps/web/ui/webhooks/webhook-card.tsx+++ b/apps/web/ui/webhooks/webhook-card.tsx@@ -1,6 +1,6 @@import useWorkspace from "@/lib/swr/use-workspace";import { WebhookProps } from "@/lib/types";-import { TokenAvatar } from "@dub/ui";+import { TokenAvatar } from "@/ui/token-avatar";import Link from "next/link";import { WebhookStatus } from "./webhook-status";diff --git a/apps/web/ui/webhooks/webhook-header.tsx b/apps/web/ui/webhooks/webhook-header.tsxindex fd27ff3301..944650b793 100644--- a/apps/web/ui/webhooks/webhook-header.tsx+++ b/apps/web/ui/webhooks/webhook-header.tsx@@ -5,6 +5,7 @@ import { clientAccessCheck } from "@/lib/client-access-check";import useWebhook from "@/lib/swr/use-webhook";import useWorkspace from "@/lib/swr/use-workspace";import { ThreeDots } from "@/ui/shared/icons";+import { TokenAvatar } from "@/ui/token-avatar";import {Button,CircleCheck,@@ -12,12 +13,11 @@ import {MaxWidthWrapper,Popover,TabSelect,- TokenAvatar,useCopyToClipboard,} from "@dub/ui";import { CircleX, Send, Trash } from "lucide-react";import { useAction } from "next-safe-action/hooks";-import { redirect, useRouter, useSelectedLayoutSegment } from "next/navigation";+import { redirect, useSelectedLayoutSegment } from "next/navigation";import { useState } from "react";import { toast } from "sonner";import { useDeleteWebhookModal } from "../modals/delete-webhook-modal";@@ -26,7 +26,6 @@ import { BackLink } from "../shared/back-link";import { WebhookStatus } from "./webhook-status";export default function WebhookHeader({ webhookId }: { webhookId: string }) {- const router = useRouter();const { webhook, isLoading, mutate } = useWebhook();const { slug, id: workspaceId, role } = useWorkspace();const [copiedWebhookId, copyToClipboard] = useCopyToClipboard();diff --git a/packages/ui/src/avatar.tsx b/packages/ui/src/avatar.tsxindex 795a572efd..aae9b09c7b 100644--- a/packages/ui/src/avatar.tsx+++ b/packages/ui/src/avatar.tsx@@ -1,76 +1,66 @@-import { cn } from "@dub/utils";-import { sha256 } from "js-sha256";-import { useState } from "react";+import { cn, getAvatarTheme } from "@dub/utils";-type User = {- id?: string | null | undefined;- name?: string | null | undefined;- email?: string | null | undefined;- image?: string | null | undefined;+const headStyle = {+ backgroundImage:+ "linear-gradient(135deg, rgba(255,255,255,0) 0%, rgba(0,0,0,0.2) 100%)",+ boxShadow:+ "inset 6px -5px 11px rgba(0,0,0,0.13), inset -18px -12px 19px rgba(255,255,255,0.4)",};-export function getUserAvatarUrl(user?: User | null) {- if (user?.image) return user.image;-- if (!user?.id) return "https://api.dub.co/og/avatar";-- const ogAvatar = `https://api.dub.co/og/avatar/${user.id}`;-- return user.email- ? `https://0.gravatar.com/avatar/${sha256(user.email)}?d=${ogAvatar}`- : ogAvatar;-}+const shouldersStyle = {+ backgroundImage:+ "linear-gradient(135deg, rgba(255,255,255,0) 0%, rgba(0,0,0,0.2) 100%)",+ boxShadow:+ "inset 10px -12px 19px rgba(0,0,0,0.4), inset -18px -12px 19px rgba(255,255,255,0.4), inset 2px -1px 11px rgba(0,0,0,0.1)",+};export function Avatar({- user = {},+ imageUrl,+ identifier,className,}: {- user?: User;+ imageUrl?: string | null;+ identifier: string;className?: string;}) {- if (!user) {+ if (imageUrl) {return (- <div- className={cn(- "h-10 w-10 animate-pulse rounded-full border border-neutral-300 bg-neutral-100",- className,- )}+ <img+ src={imageUrl}+ alt={identifier}+ className={cn("shrink-0 rounded-full", className)}/>);}- const [url, setUrl] = useState(getUserAvatarUrl(user));+ const theme = getAvatarTheme(identifier);return (- <img- alt={`Avatar for ${user.name || user.email}`}- referrerPolicy="no-referrer"- src={url}+ <divclassName={cn(- "h-10 w-10 rounded-full border border-neutral-300",+ "relative shrink-0 overflow-hidden rounded-full",className,)}- draggable={false}- onError={() => {- setUrl(`https://api.dub.co/og/avatar/${user.id}`);- }}- />- );-}--export function TokenAvatar({- id,- className,-}: {- id: string;- className?: string;-}) {- return (- <img- src={`https://api.dicebear.com/9.x/shapes/svg?seed=${id}`}- alt="avatar"- className={cn("h-10 w-10 rounded-full", className)}- draggable={false}- />+ style={{ background: theme.bg }}+ role="img"+ aria-label={identifier}+ >+ <div className="absolute left-0 top-0 h-full w-full">+ <div+ className="absolute left-[30%] top-[22%] aspect-square w-[40%] rounded-full"+ style={{+ background: theme.fg,+ ...headStyle,+ }}+ />+ <div+ className="absolute left-[10%] top-[70%] h-[40%] w-[80%] rounded-t-full"+ style={{+ background: theme.fg,+ ...shouldersStyle,+ }}+ />+ </div>+ </div>);}diff --git a/apps/web/app/api/og/avatar/[[...seed]]/themes.tsx b/packages/utils/src/functions/avatar.tssimilarity index 60%rename from apps/web/app/api/og/avatar/[[...seed]]/themes.tsxrename to packages/utils/src/functions/avatar.tsindex 3bb3434a95..55f544b39a 100644--- a/apps/web/app/api/og/avatar/[[...seed]]/themes.tsx+++ b/packages/utils/src/functions/avatar.ts@@ -1,4 +1,4 @@-export const THEMES = [+const AVATAR_THEMES = [// Blues{ bg: "#DBEAFE", fg: "#2B7FFF" },{ bg: "#DFF2FE", fg: "#00A6F4" },@@ -26,3 +26,23 @@ export const THEMES = [{ bg: "#F5F5F5", fg: "#404040" },{ bg: "#FAFAFA", fg: "#FAFAFA" },] as const;++function hashCode(str: string) {+ let hash = 0;+ for (let i = 0; i < str.length; i++) {+ const char = str.charCodeAt(i);+ hash = (hash << 5) - hash + char;+ hash = hash & hash;+ }+ return Math.abs(hash);+}++export function getAvatarTheme(+ seed?: string | null,+): (typeof AVATAR_THEMES)[number] {+ if (!seed) {+ return AVATAR_THEMES[Math.floor(Math.random() * AVATAR_THEMES.length)];+ }+ const index = hashCode(seed) % AVATAR_THEMES.length;+ return AVATAR_THEMES[index];+}diff --git a/packages/utils/src/functions/index.ts b/packages/utils/src/functions/index.tsindex b21d605084..580ba56f47 100644--- a/packages/utils/src/functions/index.ts+++ b/packages/utils/src/functions/index.ts@@ -1,4 +1,5 @@export * from "./array-equal";+export * from "./avatar";export * from "./camel-case";export * from "./capitalize";export * from "./chunk";