diff --git a/src/components/Timelines/Timeline/Notifications.tsx b/src/components/Timelines/Timeline/Notifications.tsx index ffd4ac60..483da776 100644 --- a/src/components/Timelines/Timeline/Notifications.tsx +++ b/src/components/Timelines/Timeline/Notifications.tsx @@ -55,45 +55,54 @@ const TimelineNotifications: React.FC = ({ notification /> - - - - - - {notification.status ? ( - - {notification.status.content.length > 0 && ( - - )} - {notification.status.poll && ( - - )} - {notification.status.media_attachments.length > 0 && ( - - )} - {notification.status.card && ( - - )} + + + + - ) : null} + + {notification.status ? ( + + {notification.status.content.length > 0 && ( + + )} + {notification.status.poll && ( + + )} + {notification.status.media_attachments.length > 0 && ( + + )} + {notification.status.card && ( + + )} + + ) : null} + {notification.status && ( = ({ ) @@ -87,11 +87,7 @@ const TimelineActioned: React.FC = ({ {content && ( {account.emojis ? ( - + ) : ( {content} )} diff --git a/src/components/Timelines/Timeline/Shared/HeaderConversation.tsx b/src/components/Timelines/Timeline/Shared/HeaderConversation.tsx index 9e3d3a0c..729b5ab0 100644 --- a/src/components/Timelines/Timeline/Shared/HeaderConversation.tsx +++ b/src/components/Timelines/Timeline/Shared/HeaderConversation.tsx @@ -134,7 +134,8 @@ const styles = StyleSheet.create({ width: '80%' }, name: { - flexDirection: 'row' + flexDirection: 'row', + alignItems: 'center' }, account: { flexShrink: 1, diff --git a/src/components/Timelines/Timeline/Shared/HeaderNotification.tsx b/src/components/Timelines/Timeline/Shared/HeaderNotification.tsx index ac586559..672e45fa 100644 --- a/src/components/Timelines/Timeline/Shared/HeaderNotification.tsx +++ b/src/components/Timelines/Timeline/Shared/HeaderNotification.tsx @@ -17,10 +17,12 @@ export interface Props { } const TimelineHeaderNotification: React.FC = ({ notification }) => { - const name = - notification.account.display_name || notification.account.username - const emojis = notification.account.emojis - const account = notification.account.acct + const actualAccount = notification.status + ? notification.status.account + : notification.account + const name = actualAccount.display_name || actualAccount.username + const emojis = actualAccount.emojis + const account = actualAccount.acct const { theme } = useTheme() const [since, setSince] = useState(relativeTime(notification.created_at)) @@ -123,14 +125,9 @@ const TimelineHeaderNotification: React.FC = ({ notification }) => { return ( - + {emojis?.length ? ( - + ) : (