diff --git a/src/components/ContextMenu/share.ts b/src/components/ContextMenu/share.ts index 58df0bbf..5d7052c6 100644 --- a/src/components/ContextMenu/share.ts +++ b/src/components/ContextMenu/share.ts @@ -25,7 +25,7 @@ const contextMenuShare = ({ copiableContent, actions, type, url }: Props) => { title: t(`share.${type}.action`), systemIcon: 'square.and.arrow.up' }) - Platform.OS !== 'android' && + Platform.OS !== 'android' && type === 'status' && actions.push({ id: 'copy', title: t(`copy.action`), diff --git a/src/components/Timeline/Default.tsx b/src/components/Timeline/Default.tsx index ed3a344f..f7755a63 100644 --- a/src/components/Timeline/Default.tsx +++ b/src/components/Timeline/Default.tsx @@ -16,7 +16,7 @@ import { getInstanceAccount } from '@utils/slices/instancesSlice' import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' import { uniqBy } from 'lodash' -import React, { useCallback, useEffect, useRef } from 'react' +import React, { useCallback, useRef } from 'react' import { Pressable, View } from 'react-native' import { useSelector } from 'react-redux' import TimelineContextMenu from './Shared/ContextMenu' @@ -47,8 +47,7 @@ const TimelineDefault: React.FC = ({ }) => { const { colors } = useTheme() const instanceAccount = useSelector(getInstanceAccount, () => true) - const navigation = - useNavigation>() + const navigation = useNavigation>() const actualStatus = item.reblog ? item.reblog : item @@ -60,9 +59,9 @@ const TimelineDefault: React.FC = ({ }) if ( - !highlighted && queryKey && - shouldFilter({ copiableContent, status: actualStatus, queryKey }) + shouldFilter({ copiableContent, status: actualStatus, queryKey }) && + !highlighted ) { return } @@ -92,9 +91,7 @@ const TimelineDefault: React.FC = ({ padding: StyleConstants.Spacing.Global.PagePadding, backgroundColor: colors.backgroundDefault, paddingBottom: - disableDetails && disableOnPress - ? StyleConstants.Spacing.Global.PagePadding - : 0 + disableDetails && disableOnPress ? StyleConstants.Spacing.Global.PagePadding : 0 }} onPress={onPress} onLongPress={() => {}} @@ -121,13 +118,10 @@ const TimelineDefault: React.FC = ({ - {typeof actualStatus.content === 'string' && - actualStatus.content.length > 0 ? ( + {typeof actualStatus.content === 'string' && actualStatus.content.length > 0 ? ( = ({ actualStatus.media_attachments.length ? ( ) : null} - {!disableDetails && actualStatus.card ? ( - - ) : null} + {!disableDetails && actualStatus.card ? : null} {!disableDetails ? ( - + ) : null} @@ -170,10 +159,7 @@ const TimelineDefault: React.FC = ({ status={actualStatus} ownAccount={ownAccount} accts={uniqBy( - ( - [actualStatus.account] as Mastodon.Account[] & - Mastodon.Mention[] - ) + ([actualStatus.account] as Mastodon.Account[] & Mastodon.Mention[]) .concat(actualStatus.mentions) .filter(d => d?.id !== instanceAccount?.id), d => d?.id