The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Message UI improvements (#3252)
Tim Wilsonc0f188773ece
diff --git a/apps/web/ui/messages/messages-panel.tsx b/apps/web/ui/messages/messages-panel.tsxindex 2ed094c4d5..3c49ad4c48 100644--- a/apps/web/ui/messages/messages-panel.tsx+++ b/apps/web/ui/messages/messages-panel.tsx@@ -8,7 +8,7 @@ import {Tooltip,useMediaQuery,} from "@dub/ui";-import { OG_AVATAR_URL, cn, formatDate } from "@dub/utils";+import { OG_AVATAR_URL, cn, formatDateTime } from "@dub/utils";import { ChevronRight } from "lucide-react";import { Fragment, useMemo, useRef, useState } from "react";import ReactMarkdown from "react-markdown";@@ -78,6 +78,21 @@ export function MessagesPanel({: message.senderUserId === currentUserId,);+ const isMessageNewDate = (first: Message, second: Message) =>+ new Date(first.createdAt).toDateString() !==+ new Date(second.createdAt).toDateString();++ const isMessageNewTime = (first: Message, second: Message) =>+ Math.abs(+ new Date(first.createdAt).getTime() -+ new Date(second.createdAt).getTime(),+ ) >+ 5 * 1000 * 60;++ const isMessageSameSender = (first: Message, second: Message) =>+ first.senderUserId === second.senderUserId &&+ first.senderPartnerId === second.senderPartnerId;+return (<div className="flex size-full flex-col">{messages ? (@@ -85,23 +100,24 @@ export function MessagesPanel({ref={scrollRef}className="scrollbar-hide flex grow flex-col-reverse overflow-y-auto">- <div className="flex flex-col items-stretch gap-5 p-6">+ <div className="flex flex-col items-stretch gap-2 p-6">{messages?.map((message, idx) => {const isNewDate =- idx === 0 ||- new Date(messages[idx - 1].createdAt).toDateString() !==- new Date(message.createdAt).toDateString();+ idx === 0 || isMessageNewDate(message, messages[idx - 1]);// If it's been more than 5 minutes since the last messageconst isNewTime =- isNewDate ||- new Date(message.createdAt).getTime() -- new Date(messages[idx - 1].createdAt).getTime() >- 5 * 1000 * 60;+ isNewDate || isMessageNewTime(message, messages[idx - 1]);const isMySide = isMessageMySide(message);const isMe = isMessageFromMe(message);+ // Only show avatar if it's the last from a side+ const showAvatar =+ idx === messages.length - 1 ||+ !isMessageSameSender(message, messages[idx + 1]) ||+ isMessageNewTime(message, messages[idx + 1]);+// Message is new if it was sent within the last 10 seconds (used for intro animations)const isNew =new Date(message.createdAt).getTime() >@@ -116,18 +132,32 @@ export function MessagesPanel({const sender = message.senderPartner || message.senderUser;+ const isFirstFromSender =+ idx === 0 || !isMessageSameSender(message, messages[idx - 1]);+return (<Fragmentkey={`${new Date(message.createdAt).getTime()}-${message.senderUserId}-${message.senderPartnerId}`}>- {isNewDate && (+ {isNewTime && (<divclassName={cn(- "text-content-default text-center text-xs font-semibold",+ "text-content-subtle text-center text-xs font-medium",+ idx > 0 && "pt-5",isNew && "animate-scale-in-fade",+ isNewDate && "text-content-default font-semibold",)}>- {formatDate(message.createdAt)}+ {formatDateTime(+ message.createdAt,+ isNewDate+ ? undefined+ : {+ month: undefined,+ day: undefined,+ year: undefined,+ },+ )}</div>)}@@ -139,6 +169,7 @@ export function MessagesPanel({sender={sender}showStatusIndicator={showStatusIndicator}isNewTime={isNewTime}+ isFirstFromSender={isFirstFromSender}isNew={isNew}program={program}/>@@ -153,11 +184,15 @@ export function MessagesPanel({)}>{/* Avatar */}- <MessageAvatar- sender={sender}- program={program}- message={message}- />+ {showAvatar ? (+ <MessageAvatar+ sender={sender}+ program={program}+ message={message}+ />+ ) : (+ <div className="size-8" />+ )}<divclassName={cn(@@ -172,6 +207,7 @@ export function MessagesPanel({sender={sender}message={message}isNewTime={isNewTime}+ isFirstFromSender={isFirstFromSender}showStatusIndicator={showStatusIndicator}program={program}/>@@ -328,6 +364,7 @@ function MessageHeader({sender,message,isNewTime,+ isFirstFromSender,showStatusIndicator,program,}: {@@ -336,6 +373,7 @@ function MessageHeader({sender: Sender | null;message: Message & { delivered?: boolean };isNewTime: boolean;+ isFirstFromSender: boolean;showStatusIndicator: boolean;program?: Pick<ProgramProps, "logo" | "name"> | null;}) {@@ -343,8 +381,8 @@ function MessageHeader({const name = isCampaign ? program?.name : sender?.name;return (- (!isMySide || isNewTime || showStatusIndicator) && (- <div className="flex items-center gap-1.5">+ ((!isMySide && isFirstFromSender) || isNewTime || showStatusIndicator) && (+ <div className="flex items-center gap-1.5 pt-3">{!isMe && (<><span className="text-content-default min-w-0 truncate text-xs font-medium">@@ -364,14 +402,6 @@ function MessageHeader({</>)}- {isNewTime && (- <span className="text-content-subtle text-xs font-medium">- {new Date(message.createdAt).toLocaleTimeString("en-US", {- hour: "numeric",- minute: "numeric",- })}- </span>- )}{showStatusIndicator && <StatusIndicator message={message} />}</div>)@@ -385,6 +415,7 @@ function CampaignMessage({sender,showStatusIndicator,isNewTime,+ isFirstFromSender,isNew,program,}: {@@ -394,6 +425,7 @@ function CampaignMessage({sender: Sender | null;showStatusIndicator: boolean;isNewTime: boolean;+ isFirstFromSender: boolean;isNew: boolean;program?: Pick<ProgramProps, "logo" | "name"> | null;}) {@@ -423,6 +455,7 @@ function CampaignMessage({sender={sender}message={message}isNewTime={isNewTime}+ isFirstFromSender={isFirstFromSender}showStatusIndicator={showStatusIndicator}program={program}/>