diff --git a/src/components/NewskieDialog.tsx b/src/components/NewskieDialog.tsx index 30f70f549c..0453d40d7e 100644 --- a/src/components/NewskieDialog.tsx +++ b/src/components/NewskieDialog.tsx @@ -85,17 +85,35 @@ function DialogInner({ const isMe = profile.did === currentAccount?.did const profileName = useMemo(() => { - const name = profile.displayName || profile.handle + if (!moderationOpts) return profile.displayName || profile.handle + const moderation = moderateProfile(profile, moderationOpts) + return sanitizeDisplayName( + profile.displayName || profile.handle, + moderation.ui('displayName'), + ) + }, [moderationOpts, profile]) + + const getJoinMessage = () => { + const timeAgoString = timeAgo(createdAt, now, {format: 'long'}) if (isMe) { - return _(msg`You`) + if (profile.joinedViaStarterPack) { + return _( + msg`You joined Bluesky using a starter pack ${timeAgoString} ago`, + ) + } else { + return _(msg`You joined Bluesky ${timeAgoString} ago`) + } + } else { + if (profile.joinedViaStarterPack) { + return _( + msg`${profileName} joined Bluesky using a starter pack ${timeAgoString} ago`, + ) + } else { + return _(msg`${profileName} joined Bluesky ${timeAgoString} ago`) + } } - - if (!moderationOpts) return name - const moderation = moderateProfile(profile, moderationOpts) - - return sanitizeDisplayName(name, moderation.ui('displayName')) - }, [_, isMe, moderationOpts, profile]) + } return ( - {profile.joinedViaStarterPack ? ( - - {profileName} joined Bluesky using a starter pack{' '} - {timeAgo(createdAt, now, {format: 'long'})} ago - - ) : ( - - {profileName} joined Bluesky{' '} - {timeAgo(createdAt, now, {format: 'long'})} ago - - )} + {getJoinMessage()} {profile.joinedViaStarterPack ? (