diff --git a/src/components/GracefullyImage.tsx b/src/components/GracefullyImage.tsx index f4c393e7..fd320107 100644 --- a/src/components/GracefullyImage.tsx +++ b/src/components/GracefullyImage.tsx @@ -53,26 +53,17 @@ const GracefullyImage = ({ }: Props) => { const { reduceMotionEnabled } = useAccessibility() const { colors } = useTheme() - const [originalFailed, setOriginalFailed] = useState(false) const [imageLoaded, setImageLoaded] = useState(false) - const source = originalFailed - ? { uri: uri.remote || undefined } - : { - uri: reduceMotionEnabled && uri.static ? uri.static : uri.original - } - + const source = { + uri: reduceMotionEnabled && uri.static ? uri.static : uri.original + } const onLoad = () => { setImageLoaded(true) if (setImageDimensions && source.uri) { Image.getSize(source.uri, (width, height) => setImageDimensions({ width, height })) } } - const onError = () => { - if (!originalFailed) { - setOriginalFailed(true) - } - } const blurhashView = useMemo(() => { if (hidden || !imageLoaded) { @@ -101,10 +92,11 @@ const GracefullyImage = ({ /> ) : null} {blurhashView} diff --git a/src/components/Relationship/Outgoing.tsx b/src/components/Relationship/Outgoing.tsx index fc082097..6d394b3f 100644 --- a/src/components/Relationship/Outgoing.tsx +++ b/src/components/Relationship/Outgoing.tsx @@ -13,6 +13,8 @@ import { useQueryClient } from '@tanstack/react-query' import { useSelector } from 'react-redux' import { checkInstanceFeature } from '@utils/slices/instancesSlice' import { StyleConstants } from '@utils/styles/constants' +import { View } from 'react-native' +import { useRoute } from '@react-navigation/native' export interface Props { id: Mastodon.Account['id'] @@ -122,9 +124,12 @@ const RelationshipOutgoing: React.FC = ({ id }: Props) => { } } + const { name } = useRoute() + const isPageNotifications = name === 'Tab-Notifications-Root' + return ( - <> - {canFollowNotify && query.data?.following ? ( + + {!isPageNotifications && canFollowNotify && query.data?.following ? (