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

back to use AccountContainer in Notification component

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2022-12-30 22:43:58 +01:00
parent b4601d13cf
commit 925087024c
2 changed files with 8 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 { openModal } from 'soapbox/actions/modals';
import { getSettings } from 'soapbox/actions/settings'; import { getSettings } from 'soapbox/actions/settings';
import { hideStatus, revealStatus } from 'soapbox/actions/statuses'; import { hideStatus, revealStatus } from 'soapbox/actions/statuses';
import Account from 'soapbox/components/account';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';
import { HStack, Text, Emoji } from 'soapbox/components/ui'; import { HStack, Text, Emoji } from 'soapbox/components/ui';
import AccountContainer from 'soapbox/containers/account-container';
import StatusContainer from 'soapbox/containers/status-container'; import StatusContainer from 'soapbox/containers/status-container';
import { useAppDispatch, useAppSelector, useInstance } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector, useInstance } from 'soapbox/hooks';
import { makeGetNotification } from 'soapbox/selectors'; import { makeGetNotification } from 'soapbox/selectors';
@ -287,16 +287,16 @@ const Notification: React.FC<INotificaton> = (props) => {
case 'follow': case 'follow':
case 'user_approved': case 'user_approved':
return account && typeof account === 'object' ? ( return account && typeof account === 'object' ? (
<Account <AccountContainer
account={account} id={account.id}
hidden={hidden} hidden={hidden}
avatarSize={48} avatarSize={48}
/> />
) : null; ) : null;
case 'follow_request': case 'follow_request':
return account && typeof account === 'object' ? ( return account && typeof account === 'object' ? (
<Account <AccountContainer
account={account} id={account.id}
hidden={hidden} hidden={hidden}
avatarSize={48} avatarSize={48}
actionType='follow_request' actionType='follow_request'
@ -304,8 +304,8 @@ const Notification: React.FC<INotificaton> = (props) => {
) : null; ) : null;
case 'move': case 'move':
return account && typeof account === 'object' && notification.target && typeof notification.target === 'object' ? ( return account && typeof account === 'object' && notification.target && typeof notification.target === 'object' ? (
<Account <AccountContainer
account={notification.target} id={notification.target.id}
hidden={hidden} hidden={hidden}
avatarSize={48} avatarSize={48}
/> />

1
app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx
View file

@ -36,6 +36,7 @@ const ScheduledStatus: React.FC<IScheduledStatus> = ({ statusId, ...other }) =>
account={account} account={account}
timestamp={status.created_at} timestamp={status.created_at}
futureTimestamp futureTimestamp
hideActions
/> />
</HStack> </HStack>
</div> </div>