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 67aa62af78..8300dfb371 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 @@ -28,9 +28,9 @@ import { AccountHeaderFields } from './fields'; import { AccountInfo } from './info'; import { MemorialNote } from './memorial_note'; import { MovedNote } from './moved_note'; -import { AccountNote as AccountNoteRedesign } from './note'; +import { AccountNote } from './note'; import { AccountNumberFields } from './number_fields'; -import redesignClasses from './redesign.module.scss'; +import classes from './styles.module.scss'; import { AccountTabs } from './tabs'; const titleFromAccount = (account: Account) => { @@ -112,12 +112,7 @@ export const AccountHeader: React.FC<{ )} -
+
{me !== account.id && relationship && ( )} @@ -131,16 +126,11 @@ export const AccountHeader: React.FC<{ )}
-
+
@@ -185,7 +175,7 @@ export const AccountHeader: React.FC<{
{me && account.id !== me && ( - + )} @@ -208,8 +198,8 @@ export const AccountHeader: React.FC<{ = ({ accountId }) => { const intl = useIntl(); @@ -64,7 +64,7 @@ export const AccountMenu: FC<{ accountId: string }> = ({ accountId }) => { return []; } - return redesignMenuItems({ + return getMenuItems({ account, signedIn: !isMe && signedIn, permissions, @@ -226,7 +226,7 @@ const redesignMessages = defineMessages({ }, }); -function redesignMenuItems({ +function getMenuItems({ account, signedIn, permissions, diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/note.tsx b/app/javascript/flavours/glitch/features/account_timeline/components/note.tsx index 67a6da3030..80beea8049 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/components/note.tsx +++ b/app/javascript/flavours/glitch/features/account_timeline/components/note.tsx @@ -10,7 +10,7 @@ import { IconButton } from '@/flavours/glitch/components/icon_button'; import { useAppDispatch, useAppSelector } from '@/flavours/glitch/store'; import EditIcon from '@/material-icons/400-24px/edit_square.svg?react'; -import classes from './redesign.module.scss'; +import classes from './styles.module.scss'; const messages = defineMessages({ title: { diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/redesign.module.scss b/app/javascript/flavours/glitch/features/account_timeline/components/styles.module.scss similarity index 100% rename from app/javascript/flavours/glitch/features/account_timeline/components/redesign.module.scss rename to app/javascript/flavours/glitch/features/account_timeline/components/styles.module.scss diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/tabs.tsx b/app/javascript/flavours/glitch/features/account_timeline/components/tabs.tsx index d37c5db812..3f95ce6420 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/components/tabs.tsx +++ b/app/javascript/flavours/glitch/features/account_timeline/components/tabs.tsx @@ -10,7 +10,7 @@ import { useAccountId } from '@/flavours/glitch/hooks/useAccountId'; import { areCollectionsEnabled } from '../../collections/utils'; -import classes from './redesign.module.scss'; +import classes from './styles.module.scss'; const isActive: Required['isActive'] = (match, location) => match?.url === location.pathname ||