@ledgerhq/live-common 34.49.0-nightly.6 → 34.50.0-nightly.0

package/src/modularDrawer/hooks/useRightBalanceAsset.tsx

@@ -10,15 +10,18 @@ import { buildProviderCurrenciesMap } from "../utils/buildProviderCurrenciesMap"
 import { CurrenciesByProviderId } from "../../deposit/type";
 import { calculateProviderTotals } from "../utils/calculateProviderTotal";
 import { getProviderCurrency } from "../utils/getProviderCurrency";
-import { getBalanceAndFiatValueByAssets } from "../utils/getBalanceAndFiatValueByAssets";
 import { groupAccountsByAsset } from "../utils/groupAccountsByAsset";
 
 export type AssetDeps = {
   useBalanceDeps: UseBalanceDeps;
   balanceItem: (asset: { fiatValue?: string; balance?: string }) => ReactNode;
+  assetsMap: Map<
+    string,
+    { mainCurrency: CryptoOrTokenCurrency; currencies: CryptoOrTokenCurrency[] }
+  >;
 };
 
-export function createUseRightBalanceAsset({ useBalanceDeps, balanceItem }: AssetDeps) {
+export function createUseRightBalanceAsset({ useBalanceDeps, balanceItem, assetsMap }: AssetDeps) {
   const formatProviderResult = (
     providerCurrency: CryptoOrTokenCurrency,
     totalBalance: BigNumber,
@@ -58,15 +61,26 @@ export function createUseRightBalanceAsset({ useBalanceDeps, balanceItem }: Asse
 
     return useMemo(() => {
       if (!providerMap) {
-        const allBalance = getBalanceAndFiatValueByAssets(
-          flattenedAccounts,
-          assets,
-          state,
-          counterValueCurrency,
-          discreet,
-          locale,
-        );
-        const balanceMap = new Map(allBalance.map(b => [b.id, b]));
+        const balanceMap = new Map();
+
+        for (const [, { currencies, mainCurrency }] of assetsMap) {
+          const { totalBalance, totalFiatValue } = calculateProviderTotals(currencies, grouped);
+
+          const { balance, fiatValue } = formatProviderResult(
+            mainCurrency,
+            totalBalance,
+            totalFiatValue,
+            counterValueCurrency,
+            locale,
+            discreet,
+          );
+
+          balanceMap.set(mainCurrency.id, {
+            balance: balance,
+            fiatValue: fiatValue,
+          });
+        }
+
         const assetsWithBalanceData = assets.map(asset => {
           const balanceData = balanceMap.get(asset.id) || {};
           return {
@@ -126,15 +140,6 @@ export function createUseRightBalanceAsset({ useBalanceDeps, balanceItem }: Asse
         ...asset,
         rightElement: balanceItem(balanceData),
       }));
-    }, [
-      assets,
-      providerMap,
-      flattenedAccounts,
-      state,
-      counterValueCurrency,
-      discreet,
-      locale,
-      grouped,
-    ]);
+    }, [providerMap, assets, grouped, counterValueCurrency, locale, discreet]);
   };
 }

package/src/modularDrawer/hooks/useRightBalanceNetwork.tsx

@@ -12,6 +12,7 @@ export type NetworkDeps = {
 
 type Params = {
   assets: CryptoOrTokenCurrency[];
+  networks: CryptoOrTokenCurrency[];
   selectedAssetId: string;
   currenciesByProvider: CurrenciesByProviderId[];
 };
@@ -21,6 +22,7 @@ export function createUseRightBalanceNetwork({ useBalanceDeps, balanceItem }: Ne
     assets: networks,
     selectedAssetId,
     currenciesByProvider,
+    networks: actualNetworks,
   }: Params) {
     const { flattenedAccounts, discreet, state, counterValueCurrency, locale } = useBalanceDeps();
 
@@ -77,7 +79,7 @@ export function createUseRightBalanceNetwork({ useBalanceDeps, balanceItem }: Ne
 
       const networkBalanceData = getBalanceAndFiatValueByAssets(
         flattenedAccounts,
-        networks,
+        actualNetworks,
         state,
         counterValueCurrency,
         discreet,
@@ -86,7 +88,7 @@ export function createUseRightBalanceNetwork({ useBalanceDeps, balanceItem }: Ne
 
       const balanceMap = new Map(networkBalanceData.map(b => [b.id, b]));
 
-      const networksWithBalance = networks.map(network => {
+      const networksWithBalance = actualNetworks.map(network => {
         const balanceData = balanceMap.get(network.id) || {};
         return {
           network,

package/src/modularDrawer/modules/createAssetConfiguration.ts

@@ -24,6 +24,7 @@ const getRightElement =
         return createUseRightBalanceAsset({
           useBalanceDeps: AssetConfigurationDeps.useBalanceDeps,
           balanceItem: AssetConfigurationDeps.balanceItem,
+          assetsMap: AssetConfigurationDeps.assetsMap,
         });
     }
   };

package/src/modularDrawer/utils/groupCurrenciesByProvider.ts

@@ -0,0 +1,27 @@
+import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { AssetData } from "./type";
+
+export const groupCurrenciesByProvider = (assetsSorted: AssetData[]) => {
+  const assetMap = new Map<
+    string,
+    { mainCurrency: CryptoOrTokenCurrency; currencies: CryptoOrTokenCurrency[] }
+  >();
+
+  if (assetsSorted) {
+    for (const item of assetsSorted) {
+      const {
+        asset: { id: providerId },
+        networks = [],
+      } = item;
+      if (networks.length > 0) {
+        const mainCurrency = networks.find(c => c.id === providerId) ?? networks[0];
+        assetMap.set(providerId, {
+          mainCurrency,
+          currencies: networks,
+        });
+      }
+    }
+  }
+
+  return assetMap;
+};

package/src/modularDrawer/utils/index.ts

@@ -2,6 +2,7 @@ import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { CurrenciesByProviderId } from "../../deposit/type";
 import { haveOneCommonProvider } from "./haveOneCommonProvider";
 import { getBalanceAndFiatValue } from "./getBalanceAndFiatValue";
+import { groupCurrenciesByProvider } from "./groupCurrenciesByProvider";
 
 function isCorrespondingCurrency(
   elem: CryptoOrTokenCurrency,
@@ -33,4 +34,5 @@ export {
   getEffectiveCurrency,
   haveOneCommonProvider,
   getBalanceAndFiatValue,
+  groupCurrenciesByProvider,
 };

package/src/modularDrawer/utils/type.ts

@@ -6,6 +6,8 @@ import { Observable } from "rxjs";
 import { WalletAPIAccount } from "../../wallet-api/types";
 import { CurrenciesByProviderId } from "../../deposit/type";
 import { EnhancedModularDrawerConfiguration } from "../../wallet-api/ModularDrawer/types";
+import { InterestRate } from "../data/entities";
+import { MarketItemResponse } from "../../market/utils/types";
 
 export type ApyType = "NRR" | "APY" | "APR";
 
@@ -115,8 +117,25 @@ export type AssetConfigurationDeps = {
   MarketPriceIndicator: (args: { price: string; percent: number }) => ReactNode;
   useBalanceDeps: UseBalanceDeps;
   balanceItem: (asset: { fiatValue?: string; balance?: string }) => ReactNode;
+  assetsMap: Map<
+    string,
+    { mainCurrency: CryptoOrTokenCurrency; currencies: CryptoOrTokenCurrency[] }
+  >;
 };
 
 export type CreateAssetConfigurationHook = (
   AssetConfigurationDeps: AssetConfigurationDeps,
 ) => (props: Props) => (assets: CryptoOrTokenCurrency[]) => (CryptoOrTokenCurrency & AssetType)[];
+
+export type AssetData = {
+  asset: {
+    id: string;
+    ticker: string;
+    name: string;
+    assetsIds: Record<string, string>;
+    metaCurrencyId?: string;
+  };
+  networks: CryptoOrTokenCurrency[];
+  interestRates?: InterestRate;
+  market?: Partial<MarketItemResponse>;
+};