@ledgerhq/live-common 34.51.0-nightly.3 → 34.51.0-nightly.4

package/src/bridge/crypto-assets/index.test.ts

@@ -1,6 +1,6 @@
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import { getCryptoAssetsStore, setCryptoAssetsStore } from ".";
-import * as legacy from "@ledgerhq/cryptoassets/tokens";
+import { legacyCryptoAssetsStore } from "@ledgerhq/cryptoassets/tokens";
 import type { CryptoAssetsStore } from "@ledgerhq/types-live";
 
 describe("Testing CryptoAssetStore", () => {
@@ -13,11 +13,10 @@ describe("Testing CryptoAssetStore", () => {
     });
 
     const store = getCryptoAssetsStore();
-    expect(store).toEqual({
-      getTokenById: legacy.getTokenById,
-      findTokenById: legacy.findTokenById,
-      findTokenByAddressInCurrency: legacy.findTokenByAddressInCurrency,
-    });
+    expect(store.findTokenById).toBe(legacyCryptoAssetsStore.findTokenById);
+    expect(store.findTokenByAddressInCurrency).toBe(
+      legacyCryptoAssetsStore.findTokenByAddressInCurrency,
+    );
   });
 
   it("should return the default methods from cryptoassets libs when feature flag is disabled", () => {
@@ -29,11 +28,10 @@ describe("Testing CryptoAssetStore", () => {
     });
 
     const store = getCryptoAssetsStore();
-    expect(store).toEqual({
-      getTokenById: legacy.getTokenById,
-      findTokenById: legacy.findTokenById,
-      findTokenByAddressInCurrency: legacy.findTokenByAddressInCurrency,
-    });
+    expect(store.findTokenById).toBe(legacyCryptoAssetsStore.findTokenById);
+    expect(store.findTokenByAddressInCurrency).toBe(
+      legacyCryptoAssetsStore.findTokenByAddressInCurrency,
+    );
   });
 
   it("should throw an error when no store is set and feature flag is enabled", () => {

package/src/bridge/crypto-assets/index.ts

@@ -1,13 +1,7 @@
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
-import * as legacy from "@ledgerhq/cryptoassets/tokens";
+import { legacyCryptoAssetsStore } from "@ledgerhq/cryptoassets/tokens";
 import type { CryptoAssetsStore } from "@ledgerhq/types-live";
 
-const legacyStore: CryptoAssetsStore = {
-  getTokenById: legacy.getTokenById,
-  findTokenById: legacy.findTokenById,
-  findTokenByAddressInCurrency: legacy.findTokenByAddressInCurrency,
-};
-
 let cryptoAssetsStore: CryptoAssetsStore | undefined = undefined;
 
 export function setCryptoAssetsStore(store: CryptoAssetsStore) {
@@ -18,7 +12,7 @@ export function getCryptoAssetsStore(): CryptoAssetsStore {
   const featureEnabled =
     LiveConfig.isConfigSet() && LiveConfig.getValueByKey("feature_cal_lazy_loading");
   if (!featureEnabled) {
-    return legacyStore;
+    return legacyCryptoAssetsStore;
   }
 
   if (!cryptoAssetsStore) {

package/src/bridge/generic-alpaca/getTransactionStatus.ts

@@ -36,14 +36,16 @@ export function genericGetTransactionStatus(
       }
     }
 
-    const { errors, warnings, estimatedFees, amount, totalSpent } = await alpacaApi.validateIntent(
-      transactionToIntent(account, draftTransaction, alpacaApi.computeIntentType),
-      { value: transaction.fees ? BigInt(transaction.fees.toString()) : 0n },
-    );
+    const { errors, warnings, estimatedFees, amount, totalSpent, totalFees } =
+      await alpacaApi.validateIntent(
+        transactionToIntent(account, draftTransaction, alpacaApi.computeIntentType),
+        { value: transaction.fees ? BigInt(transaction.fees.toString()) : 0n },
+      );
 
     return {
       errors,
       warnings,
+      totalFees: typeof totalFees === "bigint" ? new BigNumber(totalFees.toString()) : undefined,
       estimatedFees:
         !transaction.fees || transaction.fees.isZero()
           ? new BigNumber(estimatedFees.toString())

package/src/bridge/generic-alpaca/utils.ts

@@ -141,8 +141,7 @@ export function transactionToIntent(
     amount,
     asset: { type: "native", name: account.currency.name, unit: account.currency.units[0] },
     useAllAmount,
-    feesStrategy:
-      transaction.feesStrategy === "custom" ? undefined : transaction.feesStrategy ?? undefined,
+    feesStrategy: transaction.feesStrategy ?? undefined,
     data: Buffer.isBuffer(transaction.data)
       ? { type: "buffer", value: transaction.data }
       : { type: "none" },

package/src/currencies/cryptoIcons.test.ts

@@ -1,6 +1,6 @@
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { inferCryptoCurrencyIcon } from "./cryptoIcons";
-import { getTokenById } from "@ledgerhq/cryptoassets/tokens";
+import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
 
 describe("inferCryptoCurrencyIcon", () => {
   const registryMock = {
@@ -23,8 +23,8 @@ describe("inferCryptoCurrencyIcon", () => {
   });
 
   test("USDT is inferred properly", () => {
-    expect(
-      inferCryptoCurrencyIcon(registryMock, getTokenById("ethereum/erc20/usd_tether__erc20_")),
-    ).toBe(4);
+    const usdt = findTokenById("ethereum/erc20/usd_tether__erc20_");
+    if (!usdt) throw new Error("USDT token not found");
+    expect(inferCryptoCurrencyIcon(registryMock, usdt)).toBe(4);
   });
 });

package/src/currencies/index.ts

@@ -16,9 +16,7 @@ export {
   listTokenTypesForCryptoCurrency,
   findTokenById,
   findTokenByAddressInCurrency,
-  hasTokenId,
   getAbandonSeedAddress,
-  getTokenById,
   addTokens,
 } from "@ledgerhq/cryptoassets";
 export {

package/src/deposit/deposit.test.ts

@@ -9,12 +9,12 @@ import { MOCK_TOKENS_ONLY, MOCK_WITH_TOKEN_AND_CURRENCY_ASSET, MOCK_IDS, MOCK_PO
 import { MappedAsset } from "./type";
 import {
   getCryptoCurrencyById,
-  getTokenById,
+  findTokenById,
   setSupportedCurrencies,
   sortCurrenciesByIds,
 } from "../currencies/index";
 import { isCurrencySupported, listSupportedCurrencies, listTokens } from "../currencies";
-import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { CryptoOrTokenCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 
 const TOKEN_ONLY_ASSETS = MOCK_TOKENS_ONLY as MappedAsset[];
 
@@ -107,7 +107,9 @@ describe("Deposit logic", () => {
 
   describe("groupCurrenciesByProvider", () => {
     test("should group currencies by provider", () => {
-      const currencies = TOKEN_ONLY_ASSETS.map(asset => getTokenById(asset.ledgerId));
+      const currencies = TOKEN_ONLY_ASSETS.map(asset => findTokenById(asset.ledgerId)).filter(
+        (t): t is TokenCurrency => t !== undefined,
+      );
       const { currenciesByProvider } = groupCurrenciesByProvider(TOKEN_ONLY_ASSETS, currencies);
       expect(currenciesByProvider).toEqual([
         {
@@ -120,9 +122,9 @@ describe("Deposit logic", () => {
     test("should handle POL assets correctly", () => {
       const currenciesPol = MOCK_POL.map(asset =>
         asset.$type === "Token"
-          ? getTokenById(asset.ledgerId)
+          ? findTokenById(asset.ledgerId)
           : getCryptoCurrencyById(asset.ledgerId),
-      );
+      ).filter((c): c is CryptoOrTokenCurrency => c !== undefined);
       const { currenciesByProvider: currenciesByProviderBis, sortedCryptoCurrencies } =
         groupCurrenciesByProvider(MOCK_POL as MappedAsset[], currenciesPol);
       expect(currenciesByProviderBis).toEqual([
@@ -136,7 +138,9 @@ describe("Deposit logic", () => {
     });
 
     test("should handle empty assets array", () => {
-      const currencies = TOKEN_ONLY_ASSETS.map(asset => getTokenById(asset.ledgerId));
+      const currencies = TOKEN_ONLY_ASSETS.map(asset => findTokenById(asset.ledgerId)).filter(
+        (t): t is TokenCurrency => t !== undefined,
+      );
       const { currenciesByProvider, sortedCryptoCurrencies } = groupCurrenciesByProvider(
         [],
         currencies,
@@ -172,7 +176,8 @@ describe("Deposit logic", () => {
 
       setSupportedCurrencies(["ethereum"]);
       const ethCurrency = getCryptoCurrencyById("ethereum");
-      const tokenCurrency = getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      const tokenCurrency = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!tokenCurrency) throw new Error("Token not found");
 
       const { sortedCryptoCurrencies } = groupCurrenciesByProvider(mockAssets, [
         tokenCurrency,
@@ -188,7 +193,9 @@ describe("Deposit logic", () => {
         { ...TOKEN_ONLY_ASSETS[0], ledgerId: "different-id" },
       ] as MappedAsset[];
 
-      const currencies = [getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId)];
+      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!token) throw new Error("Token not found");
+      const currencies = [token];
       const { currenciesByProvider } = groupCurrenciesByProvider(duplicateAssets, currencies);
 
       expect(currenciesByProvider).toHaveLength(1);
@@ -319,7 +326,7 @@ describe("Deposit logic", () => {
         MOCK_TOKENS_ONLY as MappedAsset[],
         currencies,
       );
-      expect(sortedCryptoCurrencies).toEqual([getTokenById("polygon/erc20/(pos)_tether_usd")]);
+      expect(sortedCryptoCurrencies).toEqual([findTokenById("polygon/erc20/(pos)_tether_usd")]);
     });
 
     it("should return only BSC token while its currency is supported in the list", () => {
@@ -333,7 +340,7 @@ describe("Deposit logic", () => {
         MOCK_TOKENS_ONLY as MappedAsset[],
         currencies,
       );
-      expect(sortedCryptoCurrencies).toEqual([getTokenById("bsc/bep20/binance-peg_bsc-usd")]);
+      expect(sortedCryptoCurrencies).toEqual([findTokenById("bsc/bep20/binance-peg_bsc-usd")]);
     });
 
     it("should return tokens that are actually supported based on mock data", () => {
@@ -596,7 +603,9 @@ describe("Deposit logic", () => {
         { ...TOKEN_ONLY_ASSETS[0], providerId: null as any },
       ] as MappedAsset[];
 
-      const currencies = [getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId)];
+      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!token) throw new Error("Token not found");
+      const currencies = [token];
 
       expect(() => {
         groupCurrenciesByProvider(malformedAssets, currencies);
@@ -608,7 +617,9 @@ describe("Deposit logic", () => {
         { ...TOKEN_ONLY_ASSETS[0], providerId: "" },
       ] as MappedAsset[];
 
-      const currencies = [getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId)];
+      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!token) throw new Error("Token not found");
+      const currencies = [token];
 
       expect(() => {
         groupCurrenciesByProvider(partiallyMalformedAssets, currencies);
@@ -624,7 +635,9 @@ describe("Deposit logic", () => {
           providerId: `provider_${index % 10}`,
         })) as MappedAsset[];
 
-      const currencies = [getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId)];
+      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!token) throw new Error("Token not found");
+      const currencies = [token];
 
       const startTime = Date.now();
       const result = groupCurrenciesByProvider(largeAssetList, currencies);
@@ -640,7 +653,9 @@ describe("Deposit logic", () => {
         { ...TOKEN_ONLY_ASSETS[0], ledgerId: TOKEN_ONLY_ASSETS[0].ledgerId.toUpperCase() },
       ] as MappedAsset[];
 
-      const currencies = [getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId)];
+      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!token) throw new Error("Token not found");
+      const currencies = [token];
       const { currenciesByProvider } = groupCurrenciesByProvider(mixedCaseAssets, currencies);
 
       expect(currenciesByProvider).toHaveLength(1);

package/src/deposit/helper.ts

@@ -3,7 +3,7 @@ import { MappedAsset, CurrenciesByProviderId, GroupedCurrencies } from "./type";
 import {
   currenciesByMarketcap,
   getCryptoCurrencyById,
-  getTokenById,
+  findTokenById,
   hasCryptoCurrencyId,
 } from "../currencies";
 import { getMappedAssets } from "./api";
@@ -75,5 +75,9 @@ export const getTokenOrCryptoCurrencyById = (id: string): CryptoOrTokenCurrency
   if (hasCryptoCurrencyId(id)) {
     return getCryptoCurrencyById(id);
   }
-  return getTokenById(id);
+  const token = findTokenById(id);
+  if (!token) {
+    throw new Error(`token with id "${id}" not found`);
+  }
+  return token;
 };

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

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 import "../../../__tests__/test-helpers/dom-polyfill";
-import { getCryptoCurrencyById, getTokenById } from "@ledgerhq/cryptoassets";
+import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
 import { Account } from "@ledgerhq/types-live";
 import { renderHook, act } from "@testing-library/react";
 import BigNumber from "bignumber.js";
@@ -14,7 +14,9 @@ import { useFromState } from "./useFromState";
 
 const BTC = getCryptoCurrencyById("bitcoin");
 const ETH = getCryptoCurrencyById("ethereum");
-const USDT = getTokenById("ethereum/erc20/usd_tether__erc20_");
+const usdtToken = findTokenById("ethereum/erc20/usd_tether__erc20_");
+if (!usdtToken) throw new Error("USDT token not found");
+const USDT = usdtToken;
 
 jest.useFakeTimers();
 

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

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 import "../../../__tests__/test-helpers/dom-polyfill";
-import { getCryptoCurrencyById, getTokenById } from "@ledgerhq/cryptoassets";
+import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
 import type { Account } from "@ledgerhq/types-live";
 import { renderHook, act } from "@testing-library/react";
 import { genTokenAccount } from "@ledgerhq/coin-framework/mocks/account";
@@ -11,7 +11,9 @@ import { useReverseAccounts } from "./useReverseAccounts";
 
 const BTC = getCryptoCurrencyById("bitcoin");
 const ETH = getCryptoCurrencyById("ethereum");
-const USDT = getTokenById("ethereum/erc20/usd_tether__erc20_");
+const usdtToken = findTokenById("ethereum/erc20/usd_tether__erc20_");
+if (!usdtToken) throw new Error("USDT token not found");
+const USDT = usdtToken;
 
 const fromParentAccount = genAccount("mocked-account-2", {
   currency: ETH,

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, getTokenById } from "@ledgerhq/cryptoassets";
+import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
 import { selectorStateDefaultValues, useToState } from ".";
 import { genTokenAccount } from "@ledgerhq/coin-framework/mocks/account";
 import { genAccount } from "../../../mock/account";
@@ -12,7 +12,9 @@ import type { Account } from "@ledgerhq/types-live";
 
 const BTC = getCryptoCurrencyById("bitcoin");
 const ETH = getCryptoCurrencyById("ethereum");
-const USDT = getTokenById("ethereum/erc20/usd_tether__erc20_");
+const usdtToken = findTokenById("ethereum/erc20/usd_tether__erc20_");
+if (!usdtToken) throw new Error("USDT token not found");
+const USDT = usdtToken;
 
 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, getTokenById } from "@ledgerhq/cryptoassets";
+import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
 import { act, renderHook } from "@testing-library/react";
 import BigNumber from "bignumber.js";
 import { checkAccountSupported } from "../../../account/index";
@@ -19,7 +19,9 @@ jest.mock("../../../families/evm/bridge/mock");
 const mockedEstimateMaxSpendable = jest.mocked(ethBridge.accountBridge.estimateMaxSpendable);
 
 const ETH = getCryptoCurrencyById("ethereum");
-const USDT = getTokenById("ethereum/erc20/usd_tether__erc20_");
+const usdtToken = findTokenById("ethereum/erc20/usd_tether__erc20_");
+if (!usdtToken) throw new Error("USDT token not found");
+const USDT = usdtToken;
 
 const parentAccount = genAccount("parent-account", {
   currency: ETH,

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

@@ -1,4 +1,4 @@
-import { getTokenById } from "@ledgerhq/cryptoassets";
+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,7 +87,9 @@ describe("swap/utils/getAccountTuplesForCurrency", () => {
   });
 
   describe("TokenCurrency", () => {
-    const aaveToken = Object.freeze(getTokenById("ethereum/erc20/aave"));
+    const token = findTokenById("ethereum/erc20/aave");
+    if (!token) throw new Error("AAVE token not found");
+    const aaveToken = Object.freeze(token);
 
     test("returns correct parent accounts including a new subAccount when a TokenCurrency is provided", () => {
       const ethAccounts = [

package/src/notifications/ServiceStatusProvider/index.tsx

@@ -58,7 +58,7 @@ function sanitizeName(name: string): string {
  */
 
 export function filterServiceStatusIncidents(
-  incidents: Incident[],
+  incidents: Incident[] = [],
   tickers: string[] = [],
   entryPoint?: EntryPoint,
 ): Incident[] {

package/src/utils/__tests__/getAccountTuplesForCurrency.test.ts

@@ -1,4 +1,4 @@
-import { getCryptoCurrencyById, getTokenById } from "@ledgerhq/cryptoassets";
+import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
 import { genAccount } from "../../mock/account";
 import type { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import type { Account, TokenAccount } from "@ledgerhq/types-live";
@@ -66,7 +66,9 @@ describe("getAccountTuplesForCurrency", () => {
   });
 
   describe("TokenCurrency", () => {
-    const aaveToken = getTokenById("ethereum/erc20/aave");
+    const token = findTokenById("ethereum/erc20/aave");
+    if (!token) throw new Error("AAVE token not found");
+    const aaveToken = token;
 
     test("returns correct parent accounts including a new subAccount when a TokenCurrency is provided", () => {
       const ethAccounts = [