CP-12564: Migrate watchlist proxy api to the new token aggregator api (#3360)

Author: atn4z7

packages/core-mobile/.gitignore

@@ -97,3 +97,7 @@ expo-env.d.ts
 
 # Branch
 /ios/config.xcconfig
+
+# generated api clients
+app/utils/network/generated/glacierApi.client.ts
+app/utils/network/generated/tokenAggregatorApi.client.ts

packages/core-mobile/app/consts/reactQueryKeys.ts

@@ -14,8 +14,8 @@ export enum ReactQueryKeys {
 
   NETWORKS = 'networks',
   NETWORK_CONTRACT_TOKENS = 'networkContractTokens',
-  WATCHLIST_TOKENS_AND_CHARTS = 'watchlistTokensAndCharts',
-  WATCHLIST_TRENDING_TOKENS_AND_CHARTS = 'watchlistTrendingTokensAndCharts',
+  WATCHLIST_TOP_TOKENS = 'watchlistTopTokens',
+  WATCHLIST_TRENDING_TOKENS = 'watchlistTrendingTokens',
   WATCHLIST_PRICES = 'watchlistPrices',
   WATCHLIST_TOKEN_SEARCH = 'watchlistTokenSearch',
   LAST_TRANSACTED_ERC20_NETWORKS = 'lastTransactedErc20Networks',

packages/core-mobile/app/hooks/watchlist/useGetTrendingTokens.ts

@@ -18,10 +18,7 @@ export const useGetTrendingTokens = <TData = TrendingToken[]>(
 
   return useQuery({
     enabled: isFocused,
-    queryKey: [
-      ReactQueryKeys.WATCHLIST_TRENDING_TOKENS_AND_CHARTS,
-      exchangeRate
-    ],
+    queryKey: [ReactQueryKeys.WATCHLIST_TRENDING_TOKENS, exchangeRate],
     queryFn: async () => {
       const tokens = await runAfterInteractions(async () => {
         return WatchlistService.getTrendingTokens(exchangeRate)

packages/core-mobile/app/hooks/watchlist/useGetTokensAndCharts.ts renamed to packages/core-mobile/app/hooks/watchlist/useTopTokens.ts

@@ -7,21 +7,18 @@ import { selectSelectedCurrency } from 'store/settings/currency'
 import { TokensAndCharts } from 'store/watchlist'
 import { runAfterInteractions } from 'utils/runAfterInteractions'
 
-export const useGetTokensAndCharts = (): UseQueryResult<
-  TokensAndCharts,
-  Error
-> => {
+export const useTopTokens = (): UseQueryResult<TokensAndCharts, Error> => {
   const currency = useSelector(selectSelectedCurrency)
   const isFocused = useIsFocused()
 
   return useQuery({
     enabled: isFocused,
-    queryKey: [ReactQueryKeys.WATCHLIST_TOKENS_AND_CHARTS, currency],
+    queryKey: [ReactQueryKeys.WATCHLIST_TOP_TOKENS, currency],
     queryFn: () => {
       return runAfterInteractions(async () => {
-        return WatchlistService.getTokens(currency)
+        return WatchlistService.getTopTokens(currency)
       })
     },
-    refetchInterval: 60000 // 1 minute
+    refetchInterval: 120000 // 2 minutes
   })
 }

packages/core-mobile/app/hooks/watchlist/useWatchlist.ts

@@ -16,7 +16,7 @@ import { LocalTokenWithBalance } from 'store/balance/types'
 import { getCaip2ChainIdForToken } from 'utils/caip2ChainIds'
 import { isNetworkContractToken } from 'utils/isNetworkContractToken'
 import { useGetPrices } from './useGetPrices'
-import { useGetTokensAndCharts } from './useGetTokensAndCharts'
+import { useTopTokens } from './useTopTokens'
 import { useGetTrendingTokens } from './useGetTrendingTokens'
 
 type UseWatchListReturnType = {
@@ -47,7 +47,7 @@ export const useWatchlist = (): UseWatchListReturnType => {
     isLoading: isLoadingTopTokens,
     refetch: refetchTopTokens,
     isRefetching: isRefetchingTopTokens
-  } = useGetTokensAndCharts()
+  } = useTopTokens()
   const {
     data: trendingTokensResponse,
     isLoading: isLoadingTrendingTokens,

packages/core-mobile/app/hooks/watchlist/useWatchlistListener.ts

@@ -17,7 +17,7 @@ export const useWatchlistListener = (): void => {
         effect: async () => {
           await queryClient.invalidateQueries({
             queryKey: [
-              ReactQueryKeys.WATCHLIST_TOKENS_AND_CHARTS,
+              ReactQueryKeys.WATCHLIST_TOP_TOKENS,
               ReactQueryKeys.WATCHLIST_PRICES
             ]
           })

packages/core-mobile/app/new/features/track/market/components/MarketScreen.tsx

@@ -28,7 +28,6 @@ const MarketScreen = ({
     isLoadingTopTokens,
     refetchTopTokens
   } = useWatchlist()
-
   const { data, sort, view } = useTrackSortAndView(topTokens, prices)
   const listType = view.selected as MarketView
 

packages/core-mobile/app/services/token/TokenService.test.ts

@@ -2,7 +2,6 @@ import * as sdk from '@avalabs/core-coingecko-sdk'
 import { watchListCacheClient } from 'services/watchlist/watchListCacheClient'
 import * as inMemoryCache from 'utils/InMemoryCache'
 import TokenService from './TokenService'
-import TOP_MARKETS from './__mocks__/tokens.json'
 import { coingeckoProxyClient as proxy } from './coingeckoProxyClient'
 import WATCHLIST_PRICE from './__mocks__/watchlistPrice.json'
 import MARKET_CHART from './__mocks__/marketChart.json'
@@ -21,31 +20,8 @@ jest.mock('@avalabs/core-coingecko-sdk', () => ({
 
 const MOCK_429 = { status: 429, message: 'Too many requests' }
 
-const watchlistMarketsMock = jest.spyOn(watchListCacheClient, 'tokens')
-
-// @ts-ignore
-watchlistMarketsMock.mockImplementation(async () => {
-  return TOP_MARKETS
-})
-
 const inMemoryCacheMock = jest.spyOn(inMemoryCache, 'getCache')
 
-describe('getMarketsFromWatchlistCache', () => {
-  it('should return all cached markets', async () => {
-    const result = await TokenService.getMarketsFromWatchlistCache({
-      currency: sdk.VsCurrencyType.USD
-    })
-    expect(result.length).toEqual(1758)
-  })
-  it('should not have been called watchListCacheClient.markets', async () => {
-    inMemoryCacheMock.mockImplementation(() => TOP_MARKETS)
-    TokenService.getMarketsFromWatchlistCache({
-      currency: sdk.VsCurrencyType.USD
-    })
-    expect(watchlistMarketsMock).not.toHaveBeenCalled()
-  })
-})
-
 describe('getTokenSearch', () => {
   const proxySearchCoinsMock = jest.spyOn(proxy, 'searchCoins')
   const { coinsSearch } = require('@avalabs/core-coingecko-sdk')

packages/core-mobile/app/services/token/TokenService.ts

@@ -32,8 +32,7 @@ import {
   CoinsSearchResponse,
   ContractMarketChartResponse,
   CoinsInfoResponse,
-  TrendingToken,
-  TopToken
+  TrendingToken
 } from './types'
 import {
   coingeckoRetry,
@@ -99,31 +98,6 @@ export class TokenService {
     }
   }
 
-  /**
-   * Get market data from cached watchlist
-   * @param currency the currency to be used
-   * @returns the cached markets
-   */
-  async getMarketsFromWatchlistCache({
-    currency = VsCurrencyType.USD
-  }: GetMarketsParams): Promise<TopToken[]> {
-    let data: TopToken[] | undefined
-
-    const cacheId = `getMarkets-${currency}`
-
-    data = getCache(cacheId)
-
-    if (data === undefined) {
-      data = await watchListCacheClient.tokens({
-        queries: { currency }
-      })
-
-      setCache(cacheId, data)
-    }
-
-    return data ?? []
-  }
-
   /**
    * Get token search results
    * @param query the search query