[PE-6052] Deprecate user hooks from audius-query (#11992)

Author: DejayJD

packages/common/src/api/account.ts

@@ -2,14 +2,15 @@ import { useMemo } from 'react'
 
 import { Id } from '@audius/sdk'
 import dayjs from 'dayjs'
-import { useSelector } from 'react-redux'
 
 import { managedUserListFromSDK, userManagerListFromSDK } from '~/adapters/user'
-import { QueryHookOptions, createApi } from '~/audius-query'
+import { createApi } from '~/audius-query'
 import { ID, User, UserMetadata } from '~/models'
-import { accountSelectors } from '~/store/account'
 
-import { useGetUserAccount } from './user'
+import {
+  CurrentUserWalletType,
+  useCurrentAccount
+} from './tan-query/users/account/useCurrentAccount'
 
 type ResetPasswordArgs = {
   email: string
@@ -227,37 +228,29 @@ const accountApi = createApi({
   }
 })
 
-export const useGetCurrentUser = (
-  _fetchArgs: {},
-  options?: QueryHookOptions
-) => {
-  const wallets = useSelector(accountSelectors.getWalletAddresses)
-  const result = useGetUserAccount(
-    { wallet: wallets.currentUser! },
-    { ...options, disabled: !wallets.currentUser }
-  )
-  return { ...result, data: result.data ? result.data.user : null }
+// TODO: this is temporary jank to scope down changes - this will go soon when removing this whole file
+export const useGetCurrentUser = (_args?: any, options?: any) => {
+  return {
+    data: useCurrentAccount(CurrentUserWalletType.currentUser, options)?.data
+      ?.user
+  }
 }
 
-export const useGetCurrentWeb3User = (
-  _fetchArgs: {},
-  options?: QueryHookOptions
-) => {
-  const wallets = useSelector(accountSelectors.getWalletAddresses)
-  const result = useGetUserAccount(
-    { wallet: wallets.web3User! },
-    { ...options, disabled: !wallets.web3User }
-  )
-
-  return { ...result, data: result.data ? result.data.user : null }
+// TODO: this is temporary jank to scope down changes - this will go soon when removing this whole file
+export const useGetCurrentWeb3User = (_args?: any, options?: any) => {
+  return {
+    data: useCurrentAccount(CurrentUserWalletType.web3User, options)?.data?.user
+  }
 }
 
-export const useGetCurrentUserId = (
-  ...args: Parameters<typeof useGetCurrentUser>
-) => {
-  const result = useGetCurrentUser(...args)
+// TODO: this is temporary jank to scope down changes - this will go soon when removing this whole file
+export const useGetCurrentUserId = (_args?: any, options?: any) => {
+  const result = useGetCurrentUser(_args, options)
   return useMemo(() => {
-    return { ...result, data: result.data ? result.data.user_id : null }
+    return {
+      ...result,
+      data: result.data ? result.data.user_id : null
+    }
   }, [result])
 }
 

packages/common/src/api/index.ts

@@ -47,11 +47,14 @@ export * from './tan-query/notifications/useNotificationValidTypes'
 
 // Purchases
 export * from './tan-query/purchases/useAudioTransactions'
+export * from './tan-query/purchases/useUSDCTransactions'
+export * from './tan-query/purchases/useUSDCTransactionsCount'
 export * from './tan-query/purchases/useAudioTransactionsCount'
 export * from './tan-query/purchases/usePurchases'
 export * from './tan-query/purchases/usePurchasesCount'
 export * from './tan-query/purchases/usePurchasers'
 export * from './tan-query/purchases/usePurchasersCount'
+export * from './tan-query/purchases/useSalesAggregate'
 
 // Remixes
 export * from './tan-query/remixes/useRemixes'
@@ -81,6 +84,7 @@ export * from './tan-query/tracks/useStems'
 export * from './tan-query/tracks/useFileSizes'
 export * from './tan-query/tracks/useTrackFileInfo'
 export * from './tan-query/tracks/useUpdateTrack'
+export * from './tan-query/tracks/useRemixedTracks'
 
 // Users
 export * from './tan-query/users/account/useCurrentUserId'

packages/common/src/api/tan-query/purchases/useSalesAggregate.ts

@@ -8,16 +8,23 @@ import { QUERY_KEYS } from '../queryKeys'
 import { QueryKey, SelectableQueryOptions } from '../types'
 import { useCurrentUserId } from '../users/account/useCurrentUserId'
 
+export type SalesAggregateWithIntIds = Omit<SalesAggregate, 'contentId'> & {
+  contentId: number
+}
+
 export const getSalesAggregateQueryKey = (userId: ID | null | undefined) => {
   return [QUERY_KEYS.salesAggregate, userId] as unknown as QueryKey<
-    SalesAggregate[] | null
+    SalesAggregateWithIntIds[] | null
   >
 }
 
 export const useSalesAggregate = <
-  TResult = SalesAggregate[] | null | undefined
+  TResult = SalesAggregateWithIntIds[] | null | undefined
 >(
-  options?: SelectableQueryOptions<SalesAggregate[] | null | undefined, TResult>
+  options?: SelectableQueryOptions<
+    SalesAggregateWithIntIds[] | null | undefined,
+    TResult
+  >
 ) => {
   const { audiusSdk } = useAudiusQueryContext()
   const { data: currentUserId } = useCurrentUserId()
@@ -30,7 +37,10 @@ export const useSalesAggregate = <
       const { data } = await sdk.users.getSalesAggregate({
         id: Id.parse(currentUserId)
       })
-      return data
+      return data?.map((sale) => ({
+        ...sale,
+        contentId: parseInt(sale.contentId)
+      }))
     },
     ...options,
     enabled: options?.enabled !== false && !!currentUserId

packages/common/src/api/tan-query/purchases/useUSDCTransactions.ts

@@ -1,5 +1,12 @@
+import { useCallback } from 'react'
+
 import { full, Id } from '@audius/sdk'
-import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'
+import {
+  InfiniteData,
+  useInfiniteQuery,
+  UseInfiniteQueryResult,
+  useQueryClient
+} from '@tanstack/react-query'
 
 import { useAudiusQueryContext } from '~/audius-query'
 import { ID } from '~/models/Identifiers'
@@ -8,6 +15,7 @@ import { USDCTransactionDetails } from '~/models/USDCTransactions'
 import { QUERY_KEYS } from '../queryKeys'
 import { QueryKey, QueryOptions } from '../types'
 import { useCurrentUserId } from '../users/account/useCurrentUserId'
+import { loadNextPage } from '../utils'
 
 const DEFAULT_PAGE_SIZE = 50
 
@@ -73,15 +81,17 @@ export const useUSDCTransactions = (
 ) => {
   const { audiusSdk } = useAudiusQueryContext()
   const { data: currentUserId } = useCurrentUserId()
+  const queryClient = useQueryClient()
+  const queryKey = getUSDCTransactionsQueryKey(currentUserId, {
+    pageSize,
+    sortMethod,
+    sortDirection,
+    type,
+    method
+  })
 
-  return useInfiniteQuery({
-    queryKey: getUSDCTransactionsQueryKey(currentUserId, {
-      pageSize,
-      sortMethod,
-      sortDirection,
-      type,
-      method
-    }),
+  const queryData = useInfiniteQuery({
+    queryKey,
     initialPageParam: 0,
     getNextPageParam: (lastPage: USDCTransactionDetails[], allPages) => {
       if (lastPage.length < pageSize) return undefined
@@ -106,4 +116,22 @@ export const useUSDCTransactions = (
     ...options,
     enabled: options?.enabled !== false && !!currentUserId
   })
+  const reset = useCallback(() => {
+    queryClient.resetQueries({
+      queryKey
+    })
+  }, [queryClient, queryKey])
+
+  // @ts-ignore
+  queryData.reset = reset
+  const loadNextPageCallback = useCallback(
+    () => loadNextPage(queryData),
+    [queryData]
+  )
+  // @ts-ignore
+  queryData.loadNextPage = loadNextPageCallback
+  return queryData as UseInfiniteQueryResult<USDCTransactionDetails[]> & {
+    reset: typeof reset
+    loadNextPage: typeof loadNextPageCallback
+  }
 }

packages/common/src/api/tan-query/users/account/useCurrentAccount.ts

@@ -21,19 +21,26 @@ export const getCurrentAccountQueryKey = (
     currentUserId
   ] as unknown as QueryKey<AccountUserMetadata>
 
+export enum CurrentUserWalletType {
+  currentUser = 'currentUser',
+  web3User = 'web3User'
+}
+
 /**
  * Hook to get the currently logged in user's account
  */
 export const useCurrentAccount = <
   TResult = AccountUserMetadata | null | undefined
 >(
+  walletType: CurrentUserWalletType = CurrentUserWalletType.currentUser,
   options?: SelectableQueryOptions<
     AccountUserMetadata | null | undefined,
     TResult
   >
 ) => {
   const { audiusSdk } = useAudiusQueryContext()
-  const { currentUser } = useSelector(getWalletAddresses)
+  const walletAddresses = useSelector(getWalletAddresses)
+  const currentUserWallet = walletAddresses[walletType]
   const { data: currentUserId } = useCurrentUserId()
   const { localStorage } = useAppContext()
 
@@ -58,7 +65,7 @@ export const useCurrentAccount = <
         return account
       }
       const { data } = await sdk.full.users.getUserAccount({
-        wallet: currentUser!
+        wallet: currentUserWallet!
       })
 
       if (!data) {
@@ -71,6 +78,6 @@ export const useCurrentAccount = <
     },
     staleTime: options?.staleTime ?? Infinity,
     gcTime: Infinity,
-    enabled: options?.enabled !== false && !!currentUser
+    enabled: options?.enabled !== false && !!currentUserWallet
   })
 }