Migrate portfolio decomposition request to ZPI (#853)

Author: zerts

src/modules/zerion-api/hooks/useWalletPortfolio.ts

@@ -1,9 +1,24 @@
 import { useQuery } from '@tanstack/react-query';
 import { persistentQuery } from 'src/ui/shared/requests/queryClientPersistence';
+import { queryClient } from 'src/ui/shared/requests/queryClient';
 import { ZerionAPI } from '../zerion-api.client';
 import type { Params } from '../requests/wallet-get-portfolio';
 import type { BackendSourceParams } from '../shared';
 
+const STALE_TIME = 20000;
+const QUERY_KEY = 'walletGetPortfolio';
+
+export function queryWalletPortfolio(
+  params: Params,
+  clientParams: BackendSourceParams
+) {
+  return queryClient.fetchQuery({
+    queryKey: persistentQuery([QUERY_KEY, params, clientParams]),
+    queryFn: () => ZerionAPI.walletGetPortfolio(params, clientParams),
+    staleTime: STALE_TIME,
+  });
+}
+
 export function useWalletPortfolio(
   params: Params,
   { source }: BackendSourceParams,
@@ -22,13 +37,13 @@ export function useWalletPortfolio(
   } = {}
 ) {
   return useQuery({
-    queryKey: persistentQuery(['walletGetPortfolio', params, source]),
+    queryKey: persistentQuery([QUERY_KEY, params, source]),
     queryFn: () => ZerionAPI.walletGetPortfolio(params, { source }),
     retry: 0, // if not 0, there are too many rerenders if the queryFn throws synchronously
     suspense,
     enabled,
     keepPreviousData,
-    staleTime: 20000,
+    staleTime: STALE_TIME,
     refetchInterval,
     refetchOnWindowFocus,
   });

src/shared/analytics/shared/getTotalWalletsBalance.ts

@@ -1,4 +1,3 @@
-import type { PortfolioDecomposition } from 'defi-sdk';
 import type { Account } from 'src/background/account/Account';
 import { getAddressActivity } from 'src/ui/shared/requests/useAddressActivity';
 import { INTERNAL_SYMBOL_CONTEXT } from 'src/background/Wallet/Wallet';
@@ -13,7 +12,10 @@ import type {
   WalletMeta,
 } from 'src/modules/zerion-api/requests/wallet-get-meta';
 import { PREMIUM_PRIORITY } from 'src/modules/zerion-api/requests/wallet-get-meta';
-import { getAddressesPortfolio } from './getTotalWalletsBalance';
+import type {
+  Params,
+  WalletPortfolio,
+} from 'src/modules/zerion-api/requests/wallet-get-portfolio';
 import {
   getProviderForMixpanel,
   getProviderNameFromGroup,
@@ -45,9 +47,17 @@ function getFundedStatsByEcosystem(
   };
 }
 
+async function queryWalletPortfolio(params: Params) {
+  return backgroundQueryClient.fetchQuery({
+    queryKey: ['walletGetPortfolio', params],
+    queryFn: () => ZerionAPI.walletGetPortfolio(params),
+    staleTime: 20000,
+  });
+}
+
 async function getPortfolioStats(addresses: string[]) {
   return Promise.allSettled([
-    getAddressesPortfolio(addresses),
+    queryWalletPortfolio({ addresses, currency: 'usd' }),
     getAddressActivity({ addresses }, { cachePolicy: 'cache-first' }),
   ]).then(([result1, result2]) => {
     return {
@@ -111,12 +121,12 @@ async function fetchWalletsMeta({ addresses }: { addresses: string[] }) {
   });
 }
 
-function getChainBreakdown(portfolio: PortfolioDecomposition | null) {
+function getChainBreakdown(portfolio: WalletPortfolio | null) {
   const chainBreakdown: Record<string, number> = {};
   if (portfolio) {
-    for (const internalId in portfolio.positions_chains_distribution) {
+    for (const internalId in portfolio.positionsChainsDistribution) {
       const key = `${internalId}_balance`;
-      chainBreakdown[key] = portfolio.positions_chains_distribution[internalId];
+      chainBreakdown[key] = portfolio.positionsChainsDistribution[internalId];
     }
   }
   return chainBreakdown;
@@ -209,8 +219,8 @@ export async function getUserProperties(account: Account) {
     num_funded_evm_wallets: fundedStatsByEcosystem.evmFundedCount,
     num_watchlist_solana_wallets: readonlySolanaAddressesCount ?? 0,
     num_watchlist_evm_wallets: readonlyEvmAddressesCount ?? 0,
-    total_balance: portfolioStats?.portfolio?.total_value ?? 0,
-    ...getChainBreakdown(portfolioStats?.portfolio ?? null),
+    total_balance: portfolioStats?.portfolio?.data.totalValue ?? 0,
+    ...getChainBreakdown(portfolioStats?.portfolio?.data ?? null),
     currency: 'usd',
     language: 'en',
     zerion_premium_holder: zerionStats?.zerion_premium_holder ?? false,

src/shared/analytics/shared/getUserProperties.ts

@@ -1,5 +1,6 @@
 import { lookupAddressName } from 'src/modules/name-service';
-import { getAddressPortfolio } from 'src/ui/shared/requests/PortfolioValue/getAddressPortfolio';
+import { getHttpClientSource } from 'src/modules/zerion-api/getHttpClientSource';
+import { queryWalletPortfolio } from 'src/modules/zerion-api/hooks/useWalletPortfolio';
 
 export interface WalletInfo {
   portfolio: number;
@@ -10,7 +11,12 @@ export async function getWalletInfo(
   address: string,
   currency: string
 ): Promise<WalletInfo> {
-  const name = await lookupAddressName(address);
-  const portfolio = await getAddressPortfolio({ address, currency });
-  return { portfolio: portfolio.total_value, name };
+  const [name, portfolioData] = await Promise.all([
+    lookupAddressName(address),
+    queryWalletPortfolio(
+      { addresses: [address], currency },
+      { source: await getHttpClientSource() }
+    ),
+  ]);
+  return { portfolio: portfolioData.data.totalValue, name };
 }