diff --git a/CHANGELOG.md b/CHANGELOG.md index d6cd9d414..e744bf225 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Posts: let "mute conversation" be clicked from any feed, not just noficiations. - Posts: display all emoji reactions. - Reactions: improved UI of reactions on statuses. +- Profile: make verified badge more prominent, overlapping with avatar. ### Fixed - Chats: media attachments rendering at the wrong size and/or causing the chat to scroll on load. diff --git a/app/soapbox/features/account/components/header.tsx b/app/soapbox/features/account/components/header.tsx index 497e78687..d80bcfeb8 100644 --- a/app/soapbox/features/account/components/header.tsx +++ b/app/soapbox/features/account/components/header.tsx @@ -19,6 +19,7 @@ import Badge from 'soapbox/components/badge'; import DropdownMenu, { Menu } from 'soapbox/components/dropdown-menu'; import StillImage from 'soapbox/components/still-image'; import { Avatar, HStack, IconButton } from 'soapbox/components/ui'; +import VerificationBadge from 'soapbox/components/verification-badge'; import MovedNote from 'soapbox/features/account-timeline/components/moved-note'; import ActionButton from 'soapbox/features/ui/components/action-button'; import SubscriptionButton from 'soapbox/features/ui/components/subscription-button'; @@ -626,7 +627,7 @@ const Header: React.FC = ({ account }) => {
-
+
= ({ account }) => { className='relative h-24 w-24 rounded-full bg-white ring-4 ring-white dark:bg-primary-900 dark:ring-primary-900' /> + {account.verified && ( +
+ +
+ )}
diff --git a/app/soapbox/features/ui/components/profile-info-panel.tsx b/app/soapbox/features/ui/components/profile-info-panel.tsx index 546b0df6d..1fd6035bc 100644 --- a/app/soapbox/features/ui/components/profile-info-panel.tsx +++ b/app/soapbox/features/ui/components/profile-info-panel.tsx @@ -6,7 +6,6 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import Badge from 'soapbox/components/badge'; import Markup from 'soapbox/components/markup'; import { Icon, HStack, Stack, Text } from 'soapbox/components/ui'; -import VerificationBadge from 'soapbox/components/verification-badge'; import { useSoapboxConfig } from 'soapbox/hooks'; import { isLocal } from 'soapbox/utils/accounts'; import { badgeToTag, getBadges as getAccountBadges } from 'soapbox/utils/badges'; @@ -135,7 +134,6 @@ const ProfileInfoPanel: React.FC = ({ account, username }) => const deactivated = !account.pleroma.get('is_active', true) === true; const displayNameHtml = deactivated ? { __html: intl.formatMessage(messages.deactivated) } : { __html: account.display_name_html }; const memberSinceDate = intl.formatDate(account.created_at, { month: 'long', year: 'numeric' }); - const verified = account.verified; const badges = getBadges(); return ( @@ -145,8 +143,6 @@ const ProfileInfoPanel: React.FC = ({ account, username }) => - {verified && } - {account.bot && } {badges.length > 0 && (