diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx b/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx index 1021106e04..873542ed39 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx +++ b/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx @@ -122,7 +122,7 @@ export const AccountHeader: React.FC<{ isRedesign && redesignClasses.header, )} > - {me !== account.id && relationship && !isRedesign && ( + {me !== account.id && relationship && ( )} diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/info.tsx b/app/javascript/flavours/glitch/features/account_timeline/components/info.tsx index 0b3a54213a..81c789a5f2 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/components/info.tsx +++ b/app/javascript/flavours/glitch/features/account_timeline/components/info.tsx @@ -4,9 +4,13 @@ import { FormattedMessage } from 'react-intl'; import type { Relationship } from '@/flavours/glitch/models/relationship'; +import { isRedesignEnabled } from '../common'; + export const AccountInfo: FC<{ relationship?: Relationship }> = ({ relationship, }) => { + const isRedesign = isRedesignEnabled(); + if (!relationship) { return null; } @@ -17,17 +21,17 @@ export const AccountInfo: FC<{ relationship?: Relationship }> = ({ )} - {relationship.blocking && ( + {!isRedesign && relationship.blocking && ( )} - {relationship.muting && ( + {!isRedesign && relationship.muting && ( )} - {relationship.domain_blocking && ( + {!isRedesign && relationship.domain_blocking && (