@ledgerhq/live-common 34.53.0-nightly.20251115023630 → 34.53.0-nightly.20251118023800

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

@@ -54,19 +54,6 @@ describe("getAccountTuplesForCurrency", () => {
 
       expect(results).toHaveLength(0);
     });
-
-    test("filters based on the accountId map", () => {
-      const ethCurrency = getCryptoCurrencyById("ethereum");
-      const ethAccounts = [getEthAccount(), getEthAccount(), getEthAccount(), getEthAccount()];
-
-      const results = getAccountTuplesForCurrency(
-        ethCurrency,
-        ethAccounts,
-        new Map([[ethAccounts[0].id, true]]),
-      );
-
-      expect(results).toHaveLength(1);
-    });
   });
 
   describe("TokenCurrency", () => {
@@ -130,22 +117,5 @@ describe("getAccountTuplesForCurrency", () => {
       const results = getAccountTuplesForCurrency(aaveToken, allAccounts);
       expect(results).toHaveLength(0);
     });
-
-    test("does not filter based on the accountId map", () => {
-      const aaveAccounts = [
-        { ...getEthAccount(), subAccounts: [aaveToken] },
-        { ...getEthAccount(), subAccounts: [aaveToken] },
-        { ...getEthAccount(), subAccounts: [aaveToken] },
-        { ...getEthAccount(), subAccounts: [aaveToken] },
-      ];
-
-      const results = getAccountTuplesForCurrency(
-        aaveToken,
-        aaveAccounts,
-        new Map([[aaveAccounts[0].id, true]]),
-      );
-
-      expect(results).toHaveLength(4);
-    });
   });
 });

package/src/utils/getAccountTuplesForCurrency.ts

@@ -10,17 +10,12 @@ export type AccountTuple = {
 export function getAccountTuplesForCurrency(
   currency: CryptoCurrency | TokenCurrency,
   allAccounts: Account[],
-  accountIds?: Map<string, boolean>,
 ): AccountTuple[] {
   const isToken = currency.type === "TokenCurrency";
   const targetCurrencyId = isToken ? currency.parentCurrency.id : currency.id;
 
   return allAccounts
-    .filter(
-      account =>
-        account.currency.id === targetCurrencyId &&
-        (isToken ? true : accountIds ? accountIds.has(account.id) : true),
-    )
+    .filter(account => account.currency.id === targetCurrencyId)
     .map(account => {
       const subAccount = isToken
         ? account.subAccounts?.find(

package/src/wallet-api/Exchange/server.test.ts

@@ -6,7 +6,6 @@ import {
   ExchangeStartFundParams,
 } from "@ledgerhq/wallet-api-exchange-module";
 import { WalletContext, WalletHandlers } from "@ledgerhq/wallet-api-server";
-import { of } from "rxjs";
 import { genAccount } from "../../mock/account";
 import { AppBranch, AppPlatform, Visibility } from "../types";
 import { handlers } from "./server";
@@ -193,8 +192,6 @@ function prepareSwapRequest(params: ExchangeStartSwapParams): PreparedRequest {
   };
 
   const context = {
-    currencies$: of([]),
-    accounts$: of([]),
     config: {
       userId: "userId",
       tracking: false,
@@ -222,8 +219,6 @@ function prepareSellRequest(params: ExchangeStartParams): PreparedRequest {
   };
 
   const context = {
-    currencies$: of([]),
-    accounts$: of([]),
     config: {
       userId: "userId",
       tracking: false,

package/src/wallet-api/Exchange/server.ts

@@ -4,7 +4,6 @@ import {
   getParentAccount,
   makeEmptyTokenAccount,
 } from "@ledgerhq/coin-framework/account/index";
-import { listTokensForCryptoCurrency } from "@ledgerhq/cryptoassets";
 import { getCryptoAssetsStore } from "../../bridge/crypto-assets/index";
 import { decodeSwapPayload } from "@ledgerhq/hw-app-exchange";
 import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
@@ -764,14 +763,16 @@ async function getToCurrency(
 
   // In case of an SPL Token recipient and no TokenAccount exists.
   if (
-    toAccount.type !== "TokenAccount" && // it must no be a SPL Token
+    toAccount.type !== "TokenAccount" && // it must not be a SPL Token
     toAccount.currency.id === "solana" && // the target account must be a SOL Account
     tokenAddress !== toAccount.freshAddress
   ) {
-    const splTokenCurrency = listTokensForCryptoCurrency(toAccount.currency).find(
-      tk => tk.tokenType === "spl" && tk.ticker === currencyTo,
-    )!;
-    return splTokenCurrency;
+    // tokenAddress is the SPL token mint address for Solana tokens
+    const splTokenCurrency = await getCryptoAssetsStore().findTokenByAddressInCurrency(
+      tokenAddress,
+      "solana",
+    );
+    if (splTokenCurrency && splTokenCurrency.ticker === currencyTo) return splTokenCurrency;
   }
 
   return newTokenAccount?.token ?? getCurrencyForAccount(toAccount);

package/src/wallet-api/converters.ts

@@ -22,12 +22,17 @@ export const getAccountIdFromWalletAccountId = (walletAccountId: string): string
 
 export const getWalletApiIdFromAccountId = (id: string): string => uuidv5(id, NAMESPACE);
 
+export const setWalletApiIdForAccountId = (accountId: string): void => {
+  const walletApiId = getWalletApiIdFromAccountId(accountId);
+  uuidToAccountId.set(walletApiId, accountId);
+};
+
 export function accountToWalletAPIAccount(
   walletState: WalletState,
   account: AccountLike,
   parentAccount?: Account | null,
 ): WalletAPIAccount {
-  const walletApiId = uuidv5(account.id, NAMESPACE);
+  const walletApiId = getWalletApiIdFromAccountId(account.id);
   uuidToAccountId.set(walletApiId, account.id);
 
   if (isTokenAccount(account)) {