@ledgerhq/live-common 34.51.0-nightly.11 → 34.51.0-nightly.12

package/src/exchange/swap/hooks/useSelectableCurrencies.ts

@@ -1,5 +1,6 @@
-import { useMemo } from "react";
-import { findCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
+import { useEffect, useState } from "react";
+import { findCryptoCurrencyById } from "@ledgerhq/cryptoassets";
+import { getCryptoAssetsStore } from "../../../bridge/crypto-assets/index";
 import type { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 
 export const useSelectableCurrencies = ({
@@ -7,10 +8,26 @@ export const useSelectableCurrencies = ({
 }: {
   allCurrencies: string[];
 }): (TokenCurrency | CryptoCurrency)[] => {
-  const currencies = useMemo(() => {
-    const tokens = allCurrencies.map(findTokenById).filter(Boolean);
-    const cryptoCurrencies = allCurrencies.map(findCryptoCurrencyById).filter(Boolean);
-    return [...tokens, ...cryptoCurrencies] as (TokenCurrency | CryptoCurrency)[];
+  const [currencies, setCurrencies] = useState<(TokenCurrency | CryptoCurrency)[]>([]);
+
+  useEffect(() => {
+    const loadCurrencies = async () => {
+      const results = await Promise.all(
+        allCurrencies.map(async id => {
+          // Try token first, then crypto currency
+          const token = await getCryptoAssetsStore().findTokenById(id);
+          if (token) return token;
+
+          const crypto = findCryptoCurrencyById(id);
+          return crypto;
+        }),
+      );
+
+      const validCurrencies = results.filter(Boolean) as (TokenCurrency | CryptoCurrency)[];
+      setCurrencies(validCurrencies);
+    };
+
+    loadCurrencies();
   }, [allCurrencies]);
 
   return currencies;

package/src/exchange/swap/hooks/useToState.test.ts

@@ -3,7 +3,7 @@
  */
 import "../../../__tests__/test-helpers/dom-polyfill";
 import { renderHook, act } from "@testing-library/react";
-import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
+import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
 import { selectorStateDefaultValues, useToState } from ".";
 import { genTokenAccount } from "@ledgerhq/coin-framework/mocks/account";
 import { genAccount } from "../../../mock/account";
@@ -12,9 +12,16 @@ import type { Account } from "@ledgerhq/types-live";
 
 const BTC = getCryptoCurrencyById("bitcoin");
 const ETH = getCryptoCurrencyById("ethereum");
-const usdtToken = findTokenById("ethereum/erc20/usd_tether__erc20_");
-if (!usdtToken) throw new Error("USDT token not found");
-const USDT = usdtToken;
+const USDT = {
+  type: "TokenCurrency" as const,
+  id: "ethereum/erc20/usd_tether__erc20_",
+  name: "Tether USD (ERC-20)",
+  ticker: "USDT",
+  units: [{ name: "Tether USD", code: "USDT", magnitude: 6 }],
+  contractAddress: "0xdac17f958d2ee523a2206206994597c13d831ec7",
+  parentCurrency: ETH,
+  tokenType: "erc20" as const,
+};
 
 const selectedAccount = genAccount("mocked-account-selected", { currency: ETH });
 

package/src/exchange/swap/hooks/useUpdateMaxAmount.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 import "../../../__tests__/test-helpers/dom-polyfill";
-import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
+import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
 import { act, renderHook } from "@testing-library/react";
 import BigNumber from "bignumber.js";
 import { checkAccountSupported } from "../../../account/index";
@@ -19,9 +19,16 @@ jest.mock("../../../families/evm/bridge/mock");
 const mockedEstimateMaxSpendable = jest.mocked(ethBridge.accountBridge.estimateMaxSpendable);
 
 const ETH = getCryptoCurrencyById("ethereum");
-const usdtToken = findTokenById("ethereum/erc20/usd_tether__erc20_");
-if (!usdtToken) throw new Error("USDT token not found");
-const USDT = usdtToken;
+const USDT = {
+  type: "TokenCurrency" as const,
+  id: "ethereum/erc20/usd_tether__erc20_",
+  name: "Tether USD (ERC-20)",
+  ticker: "USDT",
+  units: [{ name: "Tether USD", code: "USDT", magnitude: 6 }],
+  contractAddress: "0xdac17f958d2ee523a2206206994597c13d831ec7",
+  parentCurrency: ETH,
+  tokenType: "erc20" as const,
+};
 
 const parentAccount = genAccount("parent-account", {
   currency: ETH,

package/src/exchange/swap/utils/index.test.ts

@@ -1,4 +1,3 @@
-import { findTokenById } from "@ledgerhq/cryptoassets";
 import type { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import type { Account, TokenAccount } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
@@ -87,9 +86,16 @@ describe("swap/utils/getAccountTuplesForCurrency", () => {
   });
 
   describe("TokenCurrency", () => {
-    const token = findTokenById("ethereum/erc20/aave");
-    if (!token) throw new Error("AAVE token not found");
-    const aaveToken = Object.freeze(token);
+    const aaveToken = Object.freeze({
+      type: "TokenCurrency" as const,
+      id: "ethereum/erc20/aave",
+      name: "Aave Token",
+      ticker: "AAVE",
+      units: [{ name: "Aave Token", code: "AAVE", magnitude: 18 }],
+      contractAddress: "0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9",
+      parentCurrency: getCryptoCurrencyById("ethereum"),
+      tokenType: "erc20" as const,
+    });
 
     test("returns correct parent accounts including a new subAccount when a TokenCurrency is provided", () => {
       const ethAccounts = [

package/src/market/hooks/useLargeMoverChartData.ts

@@ -2,7 +2,6 @@ import { useQueries } from "@tanstack/react-query";
 import { fetchCurrencyChartData } from "../api";
 import { QUERY_KEY } from "../utils/queryKeys";
 import { REFETCH_TIME_ONE_MINUTE, BASIC_REFETCH } from "../utils/timers";
-import { MarketCoinDataChart } from "../utils/types";
 
 type UseLargeMoverChartDataParams = {
   ids: string[];
@@ -29,7 +28,7 @@ export const useLargeMoverChartData = ({
 
   const chartDataArray = ids.map((id, index) => ({
     idChartData: id,
-    chartData: chartQueries[index]?.data as MarketCoinDataChart | undefined,
+    chartData: chartQueries[index]?.data,
     isLoading: chartQueries[index]?.isLoading || false,
     isError: chartQueries[index]?.isError || false,
   }));

package/src/market/hooks/useLargeMoverCurrencies.ts

@@ -2,11 +2,8 @@ import { useQueries } from "@tanstack/react-query";
 import { fetchCurrency } from "../api";
 import { QUERY_KEY } from "../utils/queryKeys";
 import { REFETCH_TIME_ONE_MINUTE, BASIC_REFETCH } from "../utils/timers";
-import { MarketItemResponse, CurrencyData } from "../utils/types";
+import { MarketItemResponse } from "../utils/types";
 import { format } from "../utils/currencyFormatter";
-import { listCryptoCurrencies } from "@ledgerhq/cryptoassets/currencies";
-
-const cryptoCurrenciesList = [...listCryptoCurrencies()];
 
 type UseLargeMoverCurrenciesParams = {
   ids: string[];
@@ -23,13 +20,13 @@ export const useLargeMoverCurrencies = ({
       queryFn: () => fetchCurrency({ id, counterCurrency }),
       refetchInterval: REFETCH_TIME_ONE_MINUTE * BASIC_REFETCH,
       staleTime: REFETCH_TIME_ONE_MINUTE * BASIC_REFETCH,
-      select: (data: MarketItemResponse) => format(data, cryptoCurrenciesList),
+      select: (data: MarketItemResponse) => format(data),
     })),
   });
 
   return ids.map((id, index) => ({
     id,
-    data: currencyQueries[index]?.data as CurrencyData | undefined,
+    data: currencyQueries[index]?.data,
     isLoading: currencyQueries[index]?.isLoading || false,
     isError: currencyQueries[index]?.isError || false,
   }));

package/src/market/utils/currencyFormatter.ts

@@ -54,11 +54,11 @@ export function currencyFormatter(
 
 export const format = (
   currency: MarketItemResponse,
-  cryptoCurrenciesList: (CryptoCurrency | TokenCurrency)[],
+  cryptoCurrenciesList?: (CryptoCurrency | TokenCurrency)[],
 ): CurrencyData => {
   const ledgerIdsSet = new Set(currency.ledgerIds.map(id => id.toLowerCase()));
 
-  const internalCurrency = cryptoCurrenciesList.find(({ id }) =>
+  const internalCurrency = cryptoCurrenciesList?.find(({ id }) =>
     ledgerIdsSet.has(id.toLowerCase()),
   );