diff --git a/src/components/Instance/Auth.tsx b/src/components/Instance/Auth.tsx index 8d0e9e49..305174dc 100644 --- a/src/components/Instance/Auth.tsx +++ b/src/components/Instance/Auth.tsx @@ -1,11 +1,11 @@ import { useNavigation } from '@react-navigation/native' import { TabMeStackNavigationProp } from '@utils/navigation/navigators' import addInstance from '@utils/slices/instances/add' -import { Instance } from '@utils/slices/instancesSlice' +import { checkInstanceFeature, Instance } from '@utils/slices/instancesSlice' import * as AuthSession from 'expo-auth-session' import React, { useEffect } from 'react' import { useQueryClient } from 'react-query' -import { useDispatch } from 'react-redux' +import { useDispatch, useSelector } from 'react-redux' export interface Props { instanceDomain: string @@ -27,11 +27,16 @@ const InstanceAuth = React.memo( const queryClient = useQueryClient() const dispatch = useDispatch() + const deprecateAuthFollow = useSelector( + checkInstanceFeature('deprecate_auth_follow') + ) const [request, response, promptAsync] = AuthSession.useAuthRequest( { clientId: appData.clientId, clientSecret: appData.clientSecret, - scopes: ['read', 'write', 'follow', 'push'], + scopes: deprecateAuthFollow + ? ['read', 'write', 'push'] + : ['read', 'write', 'follow', 'push'], redirectUri }, { diff --git a/src/components/Timeline/Shared/Feedback.tsx b/src/components/Timeline/Shared/Feedback.tsx index 022b4bed..bd975d07 100644 --- a/src/components/Timeline/Shared/Feedback.tsx +++ b/src/components/Timeline/Shared/Feedback.tsx @@ -35,7 +35,7 @@ const TimelineFeedback = React.memo( return ( - + {status.reblogs_count > 0 ? (