bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'notification-account' into 'develop'

Browse source 
Switch back to using account-container in notification list

Closes #1343

See merge request soapbox-pub/soapbox!2238
This commit is contained in:
marcin mikołajczak 2023-01-29 22:31:13 +00:00
commit 8763bdfa9f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/soapbox/features/notifications/components/notification.tsx
View file

@ -8,9 +8,9 @@ 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';
@ -289,16 +289,16 @@ const Notification: React.FC<INotificaton> = (props) => {
case 'follow':
case 'user_approved':
return account && typeof account === 'object' ? (
<Account
account={account}
<AccountContainer
id={account.id}
hidden={hidden}
avatarSize={avatarSize}
/>
) : null;
case 'follow_request':
return account && typeof account === 'object' ? (
<Account
account={account}
<AccountContainer
id={account.id}
hidden={hidden}
avatarSize={avatarSize}
actionType='follow_request'
@ -306,8 +306,8 @@ const Notification: React.FC<INotificaton> = (props) => {
) : null;
case 'move':
return account && typeof account === 'object' && notification.target && typeof notification.target === 'object' ? (
<Account
account={notification.target}
<AccountContainer
id={notification.target.id}
hidden={hidden}
avatarSize={avatarSize}
/>