diff --git a/app/soapbox/components/__tests__/avatar-overlay.test.tsx b/app/soapbox/components/__tests__/avatar-overlay.test.tsx deleted file mode 100644 index 4e83dd0715..0000000000 --- a/app/soapbox/components/__tests__/avatar-overlay.test.tsx +++ /dev/null @@ -1,31 +0,0 @@ -import React from 'react'; - -import { normalizeAccount } from 'soapbox/normalizers'; - -import { render, screen } from '../../jest/test-helpers'; -import AvatarOverlay from '../avatar-overlay'; - -import type { ReducerAccount } from 'soapbox/reducers/accounts'; - -describe(' { - const account = normalizeAccount({ - username: 'alice', - acct: 'alice', - display_name: 'Alice', - avatar: '/animated/alice.gif', - avatar_static: '/static/alice.jpg', - }) as ReducerAccount; - - const friend = normalizeAccount({ - username: 'eve', - acct: 'eve@blackhat.lair', - display_name: 'Evelyn', - avatar: '/animated/eve.gif', - avatar_static: '/static/eve.jpg', - }) as ReducerAccount; - - it('renders a overlay avatar', () => { - render(); - expect(screen.queryAllByRole('img')).toHaveLength(2); - }); -}); diff --git a/app/soapbox/components/avatar-overlay.tsx b/app/soapbox/components/avatar-overlay.tsx deleted file mode 100644 index a463b35ce4..0000000000 --- a/app/soapbox/components/avatar-overlay.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react'; - -import StillImage from 'soapbox/components/still-image'; - -import type { Account as AccountEntity } from 'soapbox/types/entities'; - -interface IAvatarOverlay { - account: AccountEntity, - friend: AccountEntity, -} - -const AvatarOverlay: React.FC = ({ account, friend }) => ( -
- - -
-); - -export default AvatarOverlay; diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx index 66710bf9cf..822fc95df8 100644 --- a/app/soapbox/components/status.tsx +++ b/app/soapbox/components/status.tsx @@ -45,7 +45,6 @@ export interface IStatus { unread?: boolean, onMoveUp?: (statusId: string, featured?: boolean) => void, onMoveDown?: (statusId: string, featured?: boolean) => void, - group?: ImmutableMap, focusable?: boolean, featured?: boolean, hideActionBar?: boolean, diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx index bf330a6c14..1bc8b17604 100644 --- a/app/soapbox/features/notifications/components/notification.tsx +++ b/app/soapbox/features/notifications/components/notification.tsx @@ -8,16 +8,16 @@ import { reblog, favourite, unreblog, unfavourite } from 'soapbox/actions/intera import { openModal } from 'soapbox/actions/modals'; import { getSettings } from 'soapbox/actions/settings'; import { hideStatus, revealStatus } from 'soapbox/actions/statuses'; +import Account from 'soapbox/components/account'; import Icon from 'soapbox/components/icon'; import { HStack, Text, Emoji } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account-container'; import StatusContainer from 'soapbox/containers/status-container'; import { useAppDispatch, useAppSelector, useInstance } from 'soapbox/hooks'; import { makeGetNotification } from 'soapbox/selectors'; import { NotificationType, validType } from 'soapbox/utils/notification'; import type { ScrollPosition } from 'soapbox/components/status'; -import type { Account, Status as StatusEntity, Notification as NotificationEntity } from 'soapbox/types/entities'; +import type { Account as AccountEntity, Status as StatusEntity, Notification as NotificationEntity } from 'soapbox/types/entities'; const notificationForScreenReader = (intl: IntlShape, message: string, timestamp: Date) => { const output = [message]; @@ -27,7 +27,7 @@ const notificationForScreenReader = (intl: IntlShape, message: string, timestamp return output.join(', '); }; -const buildLink = (account: Account): JSX.Element => ( +const buildLink = (account: AccountEntity): JSX.Element => ( = defineMessages({ const buildMessage = ( intl: IntlShape, type: NotificationType, - account: Account, + account: AccountEntity, totalCount: number | null, targetName: string, instanceTitle: string, @@ -287,16 +287,16 @@ const Notification: React.FC = (props) => { case 'follow': case 'user_approved': return account && typeof account === 'object' ? ( -