use real api for listSubscriptions

src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx

@@ -3,7 +3,6 @@ import {type ListRenderItemInfo, Text as RNText, View} from 'react-native'
 import {type ModerationOpts} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {useInfiniteQuery} from '@tanstack/react-query'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
 import {
@@ -13,8 +12,8 @@ import {
 import {cleanError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
+import {useActivitySubscriptionsQuery} from '#/state/queries/activity-subscriptions'
 import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
-import {useAgent} from '#/state/session'
 import {List} from '#/view/com/util/List'
 import {atoms as a, useTheme} from '#/alf'
 import * as Admonition from '#/components/Admonition'
@@ -40,10 +39,9 @@ export function ActivityNotificationSettingsScreen({}: Props) {
   const t = useTheme()
   const {_} = useLingui()
   const {data: preferences, isError} = useNotificationSettingsQuery()
-  const agent = useAgent()
+
   const moderationOpts = useModerationOpts()
 
-  // TODO: Fetch subscriptions
   const {
     data: subscriptions,
     isPending,
@@ -51,22 +49,11 @@ export function ActivityNotificationSettingsScreen({}: Props) {
     isFetchingNextPage,
     fetchNextPage,
     hasNextPage,
-  } = useInfiniteQuery({
+  } = useActivitySubscriptionsQuery()
-    queryKey: ['TEMP'],
-    queryFn: async ({pageParam}) => {
-      const response = await agent.getFollows({
-        actor: agent.assertDid,
-        cursor: pageParam,
-      })
-      return response.data
-    },
-    initialPageParam: undefined as string | undefined,
-    getNextPageParam: prev => prev.cursor,
-  })
 
   const items = useMemo(() => {
     if (!subscriptions) return []
-    return subscriptions?.pages.flatMap(page => page.follows)
+    return subscriptions?.pages.flatMap(page => page.subscriptions)
   }, [subscriptions])
 
   const renderItem = useCallback(
@@ -138,6 +125,7 @@ export function ActivityNotificationSettingsScreen({}: Props) {
         onEndReached={onEndReached}
         onEndReachedThreshold={4}
         ListEmptyComponent={
+          error ? null : (
             <View style={[a.px_xl, a.py_md]}>
               {!isPending ? (
                 <Admonition.Outer type="tip">
@@ -161,8 +149,8 @@ export function ActivityNotificationSettingsScreen({}: Props) {
                       </Admonition.Text>
                       <Admonition.Text>
                         <Trans>
-                        By default, only accounts you follow can receive alerts
+                          By default, only accounts you follow can receive
-                        from you – this can be changed in{' '}
+                          alerts from you – this can be changed in{' '}
                           <InlineLinkText
                             label={_(msg`Privacy & Security settings`)}
                             to={{screen: 'PrivacyAndSecuritySettings'}}
@@ -181,6 +169,7 @@ export function ActivityNotificationSettingsScreen({}: Props) {
                 </View>
               )}
             </View>
+          )
         }
         ListFooterComponent={
           <ListFooter

src/state/queries/activity-subscriptions.ts

@@ -1,12 +1,35 @@
 import {type AppBskyNotificationDeclaration} from '@atproto/api'
 import {t} from '@lingui/macro'
-import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
+import {
+  useInfiniteQuery,
+  useMutation,
+  useQuery,
+  useQueryClient,
+} from '@tanstack/react-query'
 
 import {useAgent, useSession} from '#/state/session'
 import * as Toast from '#/view/com/util/Toast'
 
+const RQKEY_getActivitySubscriptions = ['activity-subscriptions']
 const RQKEY_getNotificationDeclaration = ['notification-declaration']
 
+export function useActivitySubscriptionsQuery() {
+  const agent = useAgent()
+
+  return useInfiniteQuery({
+    queryKey: RQKEY_getActivitySubscriptions,
+    queryFn: async ({pageParam}) => {
+      const response =
+        await agent.app.bsky.notification.listActivitySubscriptions({
+          cursor: pageParam,
+        })
+      return response.data
+    },
+    initialPageParam: undefined as string | undefined,
+    getNextPageParam: prev => prev.cursor,
+  })
+}
+
 export function useNotificationDeclarationQuery() {
   const agent = useAgent()
   const {currentAccount} = useSession()