diff --git a/src/components/Timeline/Shared/FullConversation.tsx b/src/components/Timeline/Shared/FullConversation.tsx index 8842ad77..f3e0bbb1 100644 --- a/src/components/Timeline/Shared/FullConversation.tsx +++ b/src/components/Timeline/Shared/FullConversation.tsx @@ -15,8 +15,8 @@ const TimelineFullConversation = () => { return queryKey && queryKey[1].page !== 'Toot' && status.in_reply_to_account_id && - (status.mentions.length === 0 || - status.mentions.filter(mention => mention.id !== status.in_reply_to_account_id).length) ? ( + (status.mentions?.length === 0 || + status.mentions?.filter(mention => mention.id !== status.in_reply_to_account_id).length) ? ( { excludeMentions && (excludeMentions.current = mentionsBeginning?.length && status?.mentions - ? status.mentions.filter(mention => mentionsBeginning.includes(`@${mention.username}`)) + ? status.mentions?.filter(mention => mentionsBeginning.includes(`@${mention.username}`)) : []) return excludeMentions?.current.length ? ( diff --git a/src/components/contextMenu/status.ts b/src/components/contextMenu/status.ts index 8e8a964f..ab804699 100644 --- a/src/components/contextMenu/status.ts +++ b/src/components/contextMenu/status.ts @@ -197,7 +197,7 @@ const menuStatus = ({ hidden: !ownAccount && queryKey[1].page !== 'Notifications' && - !status.mentions.find( + !status.mentions?.find( mention => mention.acct === accountAcct && mention.username === accountAcct ) && !status.muted diff --git a/src/screens/Tabs/Me/Root/Collections.tsx b/src/screens/Tabs/Me/Root/Collections.tsx index 1e181b9e..85e34b02 100644 --- a/src/screens/Tabs/Me/Root/Collections.tsx +++ b/src/screens/Tabs/Me/Root/Collections.tsx @@ -96,10 +96,10 @@ const Collections: React.FC = () => { iconBack='chevron-right' title={t('screenTabs:me.stacks.push.name')} content={ - typeof instancePush.global === 'boolean' + typeof instancePush?.global === 'boolean' ? t('screenTabs:me.root.push.content', { defaultValue: 'false', - context: instancePush.global.toString() + context: instancePush?.global.toString() }) : undefined } diff --git a/src/utils/helpers/appendRemote.ts b/src/utils/helpers/appendRemote.ts index 2ebf92cf..5447abe1 100644 --- a/src/utils/helpers/appendRemote.ts +++ b/src/utils/helpers/appendRemote.ts @@ -19,5 +19,5 @@ export const appendRemote = { _remote: true }), mentions: (mentions: Mastodon.Mention[]) => - mentions.map(mention => ({ ...mention, _remote: true })) + mentions?.map(mention => ({ ...mention, _remote: true })) }