Merge branch 'truncate-bio' into 'develop'

ProfileInfoPanel: truncate bio

Closes #1456

See merge request soapbox-pub/soapbox!2598
environments/review-develop-3zknud/deployments/3616
Alex Gleason 1 year ago
commit 04659a74a4

@ -134,7 +134,6 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
); );
} }
const content = { __html: account.note_emojified };
const deactivated = account.pleroma?.deactivated ?? false; const deactivated = account.pleroma?.deactivated ?? false;
const displayNameHtml = deactivated ? { __html: intl.formatMessage(messages.deactivated) } : { __html: account.display_name_html }; 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 memberSinceDate = intl.formatDate(account.created_at, { month: 'long', year: 'numeric' });
@ -174,7 +173,7 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
<ProfileStats account={account} /> <ProfileStats account={account} />
{account.note.length > 0 && ( {account.note.length > 0 && (
<Markup size='sm' dangerouslySetInnerHTML={content} /> <Markup size='sm' dangerouslySetInnerHTML={{ __html: account.note_emojified }} truncate />
)} )}
<div className='flex flex-col items-start gap-2 md:flex-row md:flex-wrap md:items-center'> <div className='flex flex-col items-start gap-2 md:flex-row md:flex-wrap md:items-center'>

Loading…
Cancel
Save