@ledgerhq/live-common 34.47.0-nightly.8 → 34.47.0

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

@@ -2,22 +2,8 @@ import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import { getCryptoAssetsStore, setCryptoAssetsStore } from ".";
 import * as legacy from "@ledgerhq/cryptoassets/tokens";
 import type { CryptoAssetsStore } from "@ledgerhq/types-live";
-import * as calIntegration from "./cal-integration";
 
 describe("Testing CryptoAssetStore", () => {
-  let isCALIntegrationEnabledSpy: jest.SpyInstance;
-  let getCALStoreSpy: jest.SpyInstance;
-
-  beforeEach(() => {
-    isCALIntegrationEnabledSpy = jest
-      .spyOn(calIntegration, "isCALIntegrationEnabled")
-      .mockReturnValue(false);
-    getCALStoreSpy = jest.spyOn(calIntegration, "getCALStore");
-  });
-
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
   it("should return the default methods from cryptoassets libs when feature flag does not exists", () => {
     LiveConfig.setConfig({
       some_other_feature: {
@@ -82,37 +68,4 @@ describe("Testing CryptoAssetStore", () => {
     const store = getCryptoAssetsStore();
     expect(store).toBe(newStore);
   });
-
-  it("should return CAL store when CAL integration is enabled", () => {
-    isCALIntegrationEnabledSpy.mockReturnValue(true);
-
-    const mockCALStore = {} as unknown as CryptoAssetsStore;
-    getCALStoreSpy.mockReturnValue(mockCALStore);
-
-    const store = getCryptoAssetsStore();
-
-    expect(isCALIntegrationEnabledSpy).toHaveBeenCalled();
-    expect(getCALStoreSpy).toHaveBeenCalled();
-    expect(store).toBe(mockCALStore);
-  });
-
-  it("should prioritize CAL integration over feature flags", () => {
-    isCALIntegrationEnabledSpy.mockReturnValue(true);
-
-    LiveConfig.setConfig({
-      feature_cal_lazy_loading: {
-        type: "boolean",
-        default: true,
-      },
-    });
-
-    const mockCALStore = {} as unknown as CryptoAssetsStore;
-    getCALStoreSpy.mockReturnValue(mockCALStore);
-
-    const store = getCryptoAssetsStore();
-
-    expect(store).toBe(mockCALStore);
-    expect(isCALIntegrationEnabledSpy).toHaveBeenCalled();
-    expect(getCALStoreSpy).toHaveBeenCalled();
-  });
 });

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

@@ -1,7 +1,6 @@
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import * as legacy from "@ledgerhq/cryptoassets/tokens";
 import type { CryptoAssetsStore } from "@ledgerhq/types-live";
-import { isCALIntegrationEnabled, getCALStore } from "./cal-integration";
 
 const legacyStore: CryptoAssetsStore = {
   findTokenByAddress: legacy.findTokenByAddress,
@@ -18,10 +17,6 @@ export function setCryptoAssetsStore(store: CryptoAssetsStore) {
 }
 
 export function getCryptoAssetsStore(): CryptoAssetsStore {
-  if (isCALIntegrationEnabled()) {
-    return getCALStore();
-  }
-
   const featureEnabled =
     LiveConfig.isConfigSet() && LiveConfig.getValueByKey("feature_cal_lazy_loading");
   if (!featureEnabled) {

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

@@ -1,19 +1,16 @@
 import { createApi as createXrpApi } from "@ledgerhq/coin-xrp/api/index";
 import { createApi as createStellarApi } from "@ledgerhq/coin-stellar/api/index";
-import { createApi as createCantonApi } from "@ledgerhq/coin-canton/api/index";
-import { createApi as createTronApi } from "@ledgerhq/coin-tron/api/index";
 import { getCurrencyConfiguration } from "../../../config";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { getNetworkAlpacaApi } from "./network/network-alpaca";
 import { Api } from "@ledgerhq/coin-framework/api/types";
 import { XrpCoinConfig } from "@ledgerhq/coin-xrp/config";
 import { StellarCoinConfig } from "@ledgerhq/coin-stellar/config";
-import { CantonCoinConfig } from "@ledgerhq/coin-canton/config";
-import { TronCoinConfig } from "@ledgerhq/coin-tron/config";
 
 export function getAlpacaApi(network, kind): Api<any> {
   if (kind === "local") {
     switch (network) {
+      case "ripple":
       case "xrp":
         return createXrpApi(
           getCurrencyConfiguration<XrpCoinConfig>(getCryptoCurrencyById("ripple")),
@@ -22,16 +19,6 @@ export function getAlpacaApi(network, kind): Api<any> {
         return createStellarApi(
           getCurrencyConfiguration<StellarCoinConfig>(getCryptoCurrencyById("stellar")),
         ) as Api<any>;
-      case "canton":
-        return createCantonApi(
-          getCurrencyConfiguration<CantonCoinConfig>(
-            getCryptoCurrencyById("canton_network_devnet"),
-          ),
-        ) as Api<any>;
-      case "tron":
-        return createTronApi(
-          getCurrencyConfiguration<TronCoinConfig>(getCryptoCurrencyById("tron")),
-        ) as Api<any>;
     }
   }
   return getNetworkAlpacaApi(network) satisfies Partial<Api<any>> as Api<any>;

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

@@ -134,7 +134,7 @@ const buildGetSequence = (networkFamily: string) =>
 const buildListOperations = networkFamily =>
   async function listOperations(
     address: string,
-    pagination: Pagination = { minHeight: 0, order: "asc" },
+    pagination: Pagination = { minHeight: 0 },
   ): Promise<[Operation<any>[], string]> {
     const { data } = await network<{ operations: Operation<any>[] }, unknown>({
       method: "GET",

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

@@ -1,10 +1,11 @@
 import BigNumber from "bignumber.js";
-import { emptyHistoryCache, encodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
+import { emptyHistoryCache } from "@ledgerhq/coin-framework/account/index";
 import type { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import type { Operation, SyncConfig, TokenAccount } from "@ledgerhq/types-live";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
 import { listTokensForCryptoCurrency } from "@ledgerhq/cryptoassets";
 import { AssetInfo, Balance } from "@ledgerhq/coin-framework/api/types";
+import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
 
 export interface OperationCommon extends Operation {
   extra: Record<string, any>;
@@ -12,6 +13,11 @@ export interface OperationCommon extends Operation {
 
 export const getAssetIdFromTokenId = (tokenId: string): string => tokenId.split("/")[2];
 
+export const getAssetIdFromAsset = (asset: AssetInfo) =>
+  asset.type !== "native" && "assetReference" in asset && "assetOwner" in asset
+    ? `${asset.assetReference}:${asset.assetOwner}`
+    : "";
+
 function buildTokenAccount({
   parentAccountId,
   assetBalance,
@@ -23,7 +29,8 @@ function buildTokenAccount({
   token: TokenCurrency;
   operations: OperationCommon[];
 }): TokenAccount {
-  const id = encodeTokenAccountId(parentAccountId, token);
+  const assetId = getAssetIdFromTokenId(token.id);
+  const id = `${parentAccountId}+${assetId}`;
   const balance = new BigNumber(assetBalance.value.toString() || "0");
 
   // TODO: recheck this logic
@@ -61,14 +68,12 @@ export function buildSubAccounts({
   assetsBalance,
   syncConfig,
   operations,
-  getTokenFromAsset,
 }: {
   currency: CryptoCurrency;
   accountId: string;
   assetsBalance: Balance[];
   syncConfig: SyncConfig;
   operations: OperationCommon[];
-  getTokenFromAsset?: (asset: AssetInfo) => TokenCurrency | undefined;
 }): TokenAccount[] | undefined {
   const { blacklistedTokenIds = [] } = syncConfig;
   const allTokens = listTokensForCryptoCurrency(currency);
@@ -80,7 +85,7 @@ export function buildSubAccounts({
   assetsBalance
     .filter(b => b.asset.type !== "native") // NOTE: this could be removed, keeping here while fixing things up
     .map(balance => {
-      const token = getTokenFromAsset && getTokenFromAsset(balance.asset);
+      const token = findToken(currency, balance);
       // NOTE: for future tokens, will need to check over currencyName/standard(erc20,trc10,trc20, etc)/id
       if (token && !blacklistedTokenIds.includes(token.id)) {
         tokenAccounts.push(
@@ -99,3 +104,7 @@ export function buildSubAccounts({
     });
   return tokenAccounts;
 }
+
+export function findToken(currency: CryptoCurrency, balance: Balance): TokenCurrency | undefined {
+  return findTokenById(`${currency.family}/asset/${getAssetIdFromAsset(balance.asset)}`);
+}

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

@@ -4,6 +4,7 @@ import BigNumber from "bignumber.js";
 import { getAlpacaApi } from "./alpaca";
 import { adaptCoreOperationToLiveOperation, extractBalance } from "./utils";
 import { inferSubOperations } from "@ledgerhq/coin-framework/serialization";
+import { findToken } from "./buildSubAccounts";
 import { buildSubAccounts, OperationCommon } from "./buildSubAccounts";
 
 export function genericGetAccountShape(network: string, kind: string): GetAccountShape {
@@ -32,7 +33,8 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
 
     const assetsBalance = balanceRes
       .filter(b => b.asset.type !== "native")
-      .filter(b => alpacaApi.getTokenFromAsset && alpacaApi.getTokenFromAsset(b.asset));
+      .filter(b => findToken(currency, b));
+
     const nativeBalance = BigInt(nativeAsset?.value ?? "0");
 
     const spendableBalance = BigInt(nativeBalance - BigInt(nativeAsset?.locked ?? "0"));
@@ -41,7 +43,7 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
     const lastPagingToken = oldOps[0]?.extra?.pagingToken || "";
 
     const blockHeight = oldOps.length ? (oldOps[0].blockHeight ?? 0) + 1 : 0;
-    const paginationParams: any = { minHeight: blockHeight, order: "asc" };
+    const paginationParams: any = { minHeight: blockHeight };
     if (lastPagingToken) {
       paginationParams.lastPagingToken = lastPagingToken;
     }
@@ -70,7 +72,6 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
         assetsBalance,
         syncConfig,
         operations: assetOperations,
-        getTokenFromAsset: alpacaApi.getTokenFromAsset,
       }) || [];
 
     const operationsWithSubs = mergedOps.map(op => {

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

@@ -3,6 +3,7 @@ import { AccountAwaitingSendPendingOperations } from "@ledgerhq/errors";
 import BigNumber from "bignumber.js";
 import { getAlpacaApi } from "./alpaca";
 import { transactionToIntent } from "./utils";
+// import { FeeEstimation } from "@ledgerhq/coin-framework/api/types";
 
 // => alpaca validateIntent
 export function genericGetTransactionStatus(

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

@@ -2,41 +2,27 @@ import { Account, AccountBridge, TransactionCommon } from "@ledgerhq/types-live"
 import { getAlpacaApi } from "./alpaca";
 import { transactionToIntent } from "./utils";
 import BigNumber from "bignumber.js";
-import { AssetInfo, FeeEstimation } from "@ledgerhq/coin-framework/api/types";
-import { decodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
-import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { FeeEstimation } from "@ledgerhq/coin-framework/api/types";
 
 function bnEq(a: BigNumber | null | undefined, b: BigNumber | null | undefined): boolean {
   return !a && !b ? true : !a || !b ? false : a.eq(b);
 }
 
-type TransactionParam = TransactionCommon & {
-  fees: BigNumber | null | undefined;
-  customFees?: FeeEstimation;
-  assetReference?: string;
-  assetOwner?: string;
-  subAccountId?: string;
-};
-
-function assetInfosFallback(transaction: TransactionParam): {
-  assetReference: string;
-  assetOwner: string;
-} {
-  return {
-    assetReference: transaction.assetReference ?? "",
-    assetOwner: transaction.assetOwner ?? "",
-  };
-}
-
 export function genericPrepareTransaction(
   network: string,
   kind,
 ): AccountBridge<TransactionCommon, Account, any, any>["prepareTransaction"] {
-  return async (account, transaction: TransactionParam) => {
-    const { getAssetFromToken } = getAlpacaApi(network, kind);
-    const { assetReference, assetOwner } = getAssetFromToken
-      ? getAssetInfos(transaction, account.freshAddress, getAssetFromToken)
-      : assetInfosFallback(transaction);
+  return async (
+    account,
+    transaction: TransactionCommon & {
+      fees: BigNumber | null | undefined;
+      customFees?: FeeEstimation;
+      assetReference?: string;
+      assetOwner?: string;
+      subAccountId?: string;
+    },
+  ) => {
+    const [assetReference, assetOwner] = getAssetInfos(transaction);
 
     let fees = transaction.customFees?.parameters?.fees || null;
     if (fees === null) {
@@ -68,24 +54,11 @@ export function genericPrepareTransaction(
 }
 
 export function getAssetInfos(
-  tr: TransactionParam,
-  owner: string,
-  getAssetFromToken: (token: TokenCurrency, owner: string) => AssetInfo,
-): {
-  assetReference: string;
-  assetOwner: string;
-} {
+  tr: TransactionCommon & { assetReference?: string; assetOwner?: string },
+): string[] {
   if (tr.subAccountId) {
-    const { token } = decodeTokenAccountId(tr.subAccountId);
-
-    if (!token) return assetInfosFallback(tr);
-
-    const asset = getAssetFromToken(token, owner);
-
-    return {
-      assetOwner: ("assetOwner" in asset && asset.assetOwner) || "",
-      assetReference: ("assetReference" in asset && asset.assetReference) || "",
-    };
+    const assetString = tr.subAccountId.split("+")[1];
+    return assetString.split(":");
   }
-  return assetInfosFallback(tr);
+  return [tr.assetReference || "", tr.assetOwner || ""];
 }

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

@@ -0,0 +1,19 @@
+import { extractBalance } from "../utils";
+
+describe("Alpaca utils", () => {
+  describe("extractBalance", () => {
+    it("extracts an existing balance", () => {
+      expect(extractBalance([{ value: 4n, asset: { type: "type1" } }], "type1")).toEqual({
+        value: 4n,
+        asset: { type: "type1" },
+      });
+    });
+
+    it("generates an empty balance for a missing type", () => {
+      expect(extractBalance([{ value: 4n, asset: { type: "type1" } }], "type2")).toEqual({
+        value: 0n,
+        asset: { type: "type2" },
+      });
+    });
+  });
+});

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

@@ -44,17 +44,15 @@ export function adaptCoreOperationToLiveOperation(accountId: string, op: CoreOpe
   if (op.details?.memo) {
     extra.memo = op.details.memo as string;
   }
-  const bnFees = new BigNumber(op.tx.fees.toString());
   const res = {
-    id: encodeOperationId(accountId, op.tx.hash, op.type),
+    id: extra.ledgerOpType
+      ? encodeOperationId(accountId, op.tx.hash, extra.ledgerOpType)
+      : encodeOperationId(accountId, op.tx.hash, op.type),
     hash: op.tx.hash,
     accountId,
     type: opType,
-    value:
-      op.asset.type === "native" && ["OUT", "FEES"].includes(opType)
-        ? new BigNumber(op.value.toString()).plus(bnFees)
-        : new BigNumber(op.value.toString()),
-    fee: bnFees,
+    value: new BigNumber(op.value.toString()),
+    fee: new BigNumber(op.tx.fees.toString()),
     blockHash: op.tx.block.hash,
     blockHeight: op.tx.block.height,
     senders: op.senders,

package/src/e2e/enum/DeviceLabels.ts

@@ -6,7 +6,6 @@ export enum DeviceLabels {
   SIGN = "Sign",
   APPROVE = "Approve",
   ACCEPT = "Accept",
-  ACCEPT_RISK = "Accept risk",
   TRANSFER = "Transfer",
   RECIPIENT = "Recipient",
   DEST = "Dest",
@@ -55,5 +54,4 @@ export enum DeviceLabels {
   VERIFY_POLYGON = "Verify Polygon",
   VERIFY_SOLANA_ADDRESS = "Verify Solana address",
   REVIEW_TRANSACTION = "Review transaction",
-  I_UNDERSTAND = "I understand",
 }

package/src/e2e/families/tezos.ts

@@ -3,8 +3,6 @@ import { DeviceLabels } from "../enum/DeviceLabels";
 
 export async function delegateTezos() {
   await waitFor(DeviceLabels.REVIEW_OPERATION);
-  await pressUntilTextFound(DeviceLabels.ACCEPT_RISK);
-  await pressBoth();
   await pressUntilTextFound(DeviceLabels.ACCEPT);
   await pressBoth();
 }

package/src/e2e/speculos.ts

@@ -460,7 +460,7 @@ async function retryAxiosRequest<T>(
   throw lastError!;
 }
 
-export async function waitFor(text: string, maxAttempts = 60): Promise<string[]> {
+export async function waitFor(text: string, maxAttempts = 15): Promise<string[]> {
   const port = getEnv("SPECULOS_API_PORT");
   const address = getSpeculosAddress();
   const url = `${address}:${port}/events?stream=false&currentscreenonly=true`;
@@ -731,22 +731,12 @@ export async function signDelegationTransaction(delegatingAccount: Delegate) {
 }
 
 export async function verifyAmountsAndAcceptSwap(swap: Swap, amount: string) {
-  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
-  const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
-  await verifySwapData(swap, events, amount);
-  await pressBoth();
-}
-
-export async function verifyAmountsAndAcceptSwapForDifferentSeed(swap: Swap, amount: string) {
-  await pressUntilTextFound(DeviceLabels.I_UNDERSTAND);
-  await pressBoth();
   const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
   await verifySwapData(swap, events, amount);
   await pressBoth();
 }
 
 export async function verifyAmountsAndRejectSwap(swap: Swap, amount: string) {
-  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
   const events = await pressUntilTextFound(DeviceLabels.REJECT);
   await verifySwapData(swap, events, amount);
   await pressBoth();

package/src/exchange/platform/transfer/completeExchange.ts

@@ -1,4 +1,4 @@
-import { secp256k1 } from "@noble/curves/secp256k1";
+import secp256k1 from "secp256k1";
 import { firstValueFrom, from, Observable } from "rxjs";
 import { TransportStatusError, WrongDeviceForAccount } from "@ledgerhq/errors";
 
@@ -187,8 +187,7 @@ function convertSignature(signature: string, exchangeType: ExchangeTypes): Buffe
     return Buffer.from(base64Signature, "base64");
   }
   if (exchangeType === ExchangeTypes.Sell) return Buffer.from(signature, "hex");
-  const sig = secp256k1.Signature.fromCompact(Buffer.from(signature, "hex"));
-  return Buffer.from(sig.toDERRawBytes());
+  return <Buffer>secp256k1.signatureExport(Buffer.from(signature, "hex"));
 }
 
 export default completeExchange;

package/src/exchange/swap/completeExchange.ts

@@ -14,7 +14,7 @@ import { getDefaultAccountName } from "@ledgerhq/live-wallet/accountName";
 import { log } from "@ledgerhq/logs";
 import BigNumber from "bignumber.js";
 import { Observable } from "rxjs";
-import { secp256k1 } from "@noble/curves/secp256k1";
+import secp256k1 from "secp256k1";
 import { getCurrencyExchangeConfig } from "../";
 import { getAccountCurrency, getMainAccount } from "../../account";
 import { getAccountBridge } from "../../bridge";
@@ -271,10 +271,7 @@ const completeExchange = (
 function convertSignature(signature: string, exchangeType: ExchangeTypes): Buffer {
   return exchangeType === ExchangeTypes.SwapNg
     ? base64UrlDecode(signature)
-    : (() => {
-        const sig = secp256k1.Signature.fromCompact(Buffer.from(signature, "hex"));
-        return Buffer.from(sig.toDERRawBytes());
-      })();
+    : <Buffer>secp256k1.signatureExport(Buffer.from(signature, "hex"));
 }
 
 function base64UrlDecode(base64Url: string): Buffer {

package/src/exchange/swap/initSwap.ts

@@ -14,7 +14,7 @@ import { log } from "@ledgerhq/logs";
 import { BigNumber } from "bignumber.js";
 import invariant from "invariant";
 import { firstValueFrom, from, Observable } from "rxjs";
-import { secp256k1 } from "@noble/curves/secp256k1";
+import secp256k1 from "secp256k1";
 import { getCurrencyExchangeConfig } from "../";
 import { getAccountCurrency, getMainAccount } from "../../account";
 import { getAccountBridge } from "../../bridge";
@@ -184,10 +184,9 @@ const initSwap = (input: InitSwapInput): Observable<SwapRequestEvent> => {
 
         await swap.processTransaction(Buffer.from(swapResult.binaryPayload, "hex"), estimatedFees);
         if (unsubscribed) return;
-        const goodSign = <Buffer>(() => {
-          const sig = secp256k1.Signature.fromCompact(Buffer.from(swapResult.signature, "hex"));
-          return Buffer.from(sig.toDERRawBytes());
-        })();
+        const goodSign = <Buffer>(
+          secp256k1.signatureExport(Buffer.from(swapResult.signature, "hex"))
+        );
         await swap.checkTransactionSignature(goodSign);
         if (unsubscribed) return;
         const mainPayoutCurrency = getAccountCurrency(payoutAccount);

package/src/families/canton/config.ts

@@ -9,7 +9,6 @@ export const cantonConfig: Record<string, ConfigInfo> = {
       },
       // TBC
       nodeUrl: "https://wallet-validator-canton.ledger.com",
-      nodeId: "figment",
       // TBC
       gatewayUrl: "https://canton-gateway.api.live.ledger.com",
       minReserve: 0,
@@ -23,12 +22,9 @@ export const cantonConfig: Record<string, ConfigInfo> = {
         type: "active",
       },
       nodeUrl: "https://wallet-validator-devnet-canton.ledger-test.com",
-      nodeId: "ledger-live-devnet-prd",
       gatewayUrl: "https://canton-gateway.api.live.ledger-test.com",
       minReserve: 0,
       useGateway: true,
-      nativeInstrumentId:
-        "6e9fc50fb94e56751b49f09ba2dc84da53a9d7cff08115ebb4f6b7a12d0c990c:Splice.Amulet:Amulet",
     },
   },
   config_currency_canton_network_localnet: {
@@ -38,7 +34,6 @@ export const cantonConfig: Record<string, ConfigInfo> = {
         type: "active",
       },
       nodeUrl: "http://localhost:2975/v2",
-      nodeId: undefined,
       gatewayUrl: undefined,
       minReserve: 0,
       useGateway: false,

package/src/families/solana/setup.ts

@@ -19,8 +19,6 @@ import { SolanaCoinConfig } from "@ledgerhq/coin-solana/config";
 import { getCryptoCurrencyById } from "../../currencies";
 import { signMessage } from "@ledgerhq/coin-solana/hw-signMessage";
 import { LegacySignerSolana } from "@ledgerhq/live-signer-solana";
-import { setShouldSkipTokenLoading } from "@ledgerhq/coin-solana/preload";
-import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import { getCryptoAssetsStore } from "../../bridge/crypto-assets";
 
 const createSigner: CreateSigner<SolanaSigner> = (transport: Transport) =>
@@ -30,13 +28,6 @@ const getCurrencyConfig = () => {
   return getCurrencyConfiguration<SolanaCoinConfig>(getCryptoCurrencyById("solana"));
 };
 
-try {
-  const isCALLazyLoadingEnabled = LiveConfig.getValueByKey("feature_cal_lazy_loading");
-  setShouldSkipTokenLoading(Boolean(isCALLazyLoadingEnabled));
-} catch (error) {
-  setShouldSkipTokenLoading(false);
-}
-
 const bridge: Bridge<Transaction, SolanaAccount, TransactionStatus> = createBridges(
   executeWithSigner(createSigner),
   getCurrencyConfig,

package/src/featureFlags/defaultFeatures.ts

@@ -108,7 +108,6 @@ export const DEFAULT_FEATURES: Features = {
   postOnboardingAssetsTransfer: DEFAULT_FEATURE,
   counterValue: DEFAULT_FEATURE,
   mockFeature: DEFAULT_FEATURE,
-  calLedgerService: DEFAULT_FEATURE,
   ptxServiceCtaExchangeDrawer: DEFAULT_FEATURE,
   ptxServiceCtaScreens: DEFAULT_FEATURE,
   ptxSwapReceiveTRC20WithoutTrx: DEFAULT_FEATURE,
@@ -625,6 +624,8 @@ export const DEFAULT_FEATURES: Features = {
       enableModularization: false,
     },
   },
+  lldModularDrawerBackendData: DEFAULT_FEATURE,
+  llmModularDrawerBackendData: DEFAULT_FEATURE,
   llmModularDrawer: {
     ...DEFAULT_FEATURE,
     params: {

package/src/modularDrawer/data/state-manager/api.ts

@@ -1,14 +1,23 @@
 import { createApi, fetchBaseQuery, FetchBaseQueryMeta } from "@reduxjs/toolkit/query/react";
 import { convertApiAssets } from "@ledgerhq/cryptoassets";
-import { RawApiResponse } from "../entities";
+import { AssetsData, RawApiResponse } from "../entities";
 import { getEnv } from "@ledgerhq/live-env";
-import {
-  AssetsAdditionalData,
-  AssetsDataTags,
-  AssetsDataWithPagination,
-  GetAssetsDataParams,
-  PageParam,
-} from "./types";
+
+export enum AssetsDataTags {
+  Assets = "Assets",
+}
+
+export interface GetAssetsDataParams {
+  cursor?: string;
+  search?: string;
+  currencyIds?: string[];
+}
+
+export interface AssetsDataWithPagination extends AssetsData {
+  pagination: {
+    nextCursor?: string;
+  };
+}
 
 function transformAssetsResponse(
   response: RawApiResponse,
@@ -34,44 +43,20 @@ export const assetsDataApi = createApi({
   }),
   tagTypes: [AssetsDataTags.Assets],
   endpoints: build => ({
-    getAssetsData: build.infiniteQuery<AssetsDataWithPagination, GetAssetsDataParams, PageParam>({
-      query: ({ pageParam, queryArg }) => {
-        const params = {
+    getAssetsData: build.query<AssetsDataWithPagination, GetAssetsDataParams>({
+      query: ({ cursor, search, currencyIds: _currencyIds }) => ({
+        url: "assets",
+        params: {
+          ...(cursor && { cursor }),
+          ...(search && { search }),
+          // ...(currencyIds && currencyIds.length > 0 && { currencyIds }),
           pageSize: 100,
-          ...(pageParam?.cursor && { cursor: pageParam.cursor }),
-          ...(queryArg?.useCase && { transaction: queryArg.useCase }),
-          ...(queryArg?.currencyIds &&
-            queryArg?.currencyIds.length > 0 &&
-            !queryArg?.useCase && { currencyIds: queryArg.currencyIds }),
-          ...(queryArg?.search && { search: queryArg.search }),
-          product: queryArg.product,
-          minVersion: queryArg.version,
-          additionalData: [AssetsAdditionalData.Apy, AssetsAdditionalData.MarketTrend],
-        };
-
-        return {
-          url: "assets",
-          params,
-        };
-      },
+        },
+      }),
       providesTags: [AssetsDataTags.Assets],
       transformResponse: transformAssetsResponse,
-      infiniteQueryOptions: {
-        initialPageParam: {
-          cursor: "",
-        },
-        getNextPageParam: lastPage => {
-          if (lastPage.pagination.nextCursor) {
-            return {
-              cursor: lastPage.pagination.nextCursor,
-            };
-          } else {
-            return undefined;
-          }
-        },
-      },
     }),
   }),
 });
 
-export const { useGetAssetsDataInfiniteQuery } = assetsDataApi;
+export const { useGetAssetsDataQuery } = assetsDataApi;