@ledgerhq/live-common 34.51.0-nightly.5 → 34.51.0-nightly.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.51.0-nightly.5",
+  "version": "34.51.0-nightly.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -108,9 +108,9 @@
     "@dfinity/principal": "^0.15.6",
     "@ledgerhq/device-management-kit": "0.9.1",
     "@ledgerhq/live-app-sdk": "^0.8.1",
-    "@ledgerhq/wallet-api-client": "^1.12.1",
-    "@ledgerhq/wallet-api-core": "^1.24.1",
-    "@ledgerhq/wallet-api-server": "^1.13.1",
+    "@ledgerhq/wallet-api-client": "^1.12.2",
+    "@ledgerhq/wallet-api-core": "^1.24.2",
+    "@ledgerhq/wallet-api-server": "^1.13.2",
     "@noble/curves": "^1.9.7",
     "@noble/hashes": "1.8.0",
     "@reduxjs/toolkit": "2.8.2",
@@ -166,79 +166,79 @@
     "xstate": "^5.19.2",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.11.0-nightly.3",
-    "@ledgerhq/coin-aptos": "^3.4.0-nightly.3",
-    "@ledgerhq/coin-bitcoin": "^0.23.0-nightly.3",
-    "@ledgerhq/coin-canton": "^0.8.0-nightly.3",
-    "@ledgerhq/coin-cardano": "^0.13.0-nightly.3",
-    "@ledgerhq/coin-casper": "^2.2.0-nightly.3",
-    "@ledgerhq/coin-celo": "^1.6.0-nightly.3",
-    "@ledgerhq/coin-cosmos": "^0.18.0-nightly.3",
-    "@ledgerhq/coin-evm": "^2.33.0-nightly.3",
-    "@ledgerhq/coin-filecoin": "^1.13.0-nightly.3",
-    "@ledgerhq/coin-framework": "^6.7.0-nightly.3",
-    "@ledgerhq/coin-hedera": "^1.12.0-nightly.3",
-    "@ledgerhq/coin-icon": "^0.13.0-nightly.3",
-    "@ledgerhq/coin-internet_computer": "^1.9.0-nightly.3",
-    "@ledgerhq/coin-kaspa": "^1.3.0-nightly.3",
-    "@ledgerhq/coin-mina": "^1.3.0-nightly.3",
-    "@ledgerhq/coin-multiversx": "^0.6.0-nightly.3",
-    "@ledgerhq/coin-near": "^0.14.0-nightly.3",
-    "@ledgerhq/coin-polkadot": "^6.11.0-nightly.3",
-    "@ledgerhq/coin-solana": "^0.35.0-nightly.3",
-    "@ledgerhq/coin-stacks": "^0.10.0-nightly.3",
-    "@ledgerhq/coin-stellar": "^6.5.0-nightly.3",
-    "@ledgerhq/coin-sui": "^0.16.0-nightly.4",
-    "@ledgerhq/coin-ton": "^0.15.0-nightly.3",
-    "@ledgerhq/coin-tron": "^5.5.0-nightly.3",
-    "@ledgerhq/coin-vechain": "^2.11.0-nightly.3",
-    "@ledgerhq/coin-xrp": "^7.6.0-nightly.3",
+    "@ledgerhq/coin-algorand": "^0.11.0-nightly.5",
+    "@ledgerhq/coin-aptos": "^3.4.0-nightly.5",
+    "@ledgerhq/coin-bitcoin": "^0.23.0-nightly.5",
+    "@ledgerhq/coin-canton": "^0.8.0-nightly.5",
+    "@ledgerhq/coin-cardano": "^0.13.0-nightly.5",
+    "@ledgerhq/coin-casper": "^2.2.0-nightly.5",
+    "@ledgerhq/coin-celo": "^1.6.0-nightly.5",
+    "@ledgerhq/coin-cosmos": "^0.18.0-nightly.5",
+    "@ledgerhq/coin-evm": "^2.33.0-nightly.5",
+    "@ledgerhq/coin-filecoin": "^1.13.0-nightly.5",
+    "@ledgerhq/coin-framework": "^6.7.0-nightly.5",
+    "@ledgerhq/coin-hedera": "^1.12.0-nightly.5",
+    "@ledgerhq/coin-icon": "^0.13.0-nightly.5",
+    "@ledgerhq/coin-internet_computer": "^1.9.0-nightly.5",
+    "@ledgerhq/coin-kaspa": "^1.3.0-nightly.5",
+    "@ledgerhq/coin-mina": "^1.3.0-nightly.5",
+    "@ledgerhq/coin-multiversx": "^0.6.0-nightly.5",
+    "@ledgerhq/coin-near": "^0.14.0-nightly.5",
+    "@ledgerhq/coin-polkadot": "^6.11.0-nightly.5",
+    "@ledgerhq/coin-solana": "^0.35.0-nightly.5",
+    "@ledgerhq/coin-stacks": "^0.10.0-nightly.5",
+    "@ledgerhq/coin-stellar": "^6.5.0-nightly.5",
+    "@ledgerhq/coin-tezos": "^6.7.0-nightly.5",
+    "@ledgerhq/coin-ton": "^0.15.0-nightly.5",
+    "@ledgerhq/coin-tron": "^5.5.0-nightly.5",
+    "@ledgerhq/coin-vechain": "^2.11.0-nightly.5",
+    "@ledgerhq/coin-sui": "^0.16.0-nightly.6",
+    "@ledgerhq/coin-xrp": "^7.6.0-nightly.5",
     "@ledgerhq/crypto-icons-ui": "^1.21.0-nightly.1",
-    "@ledgerhq/cryptoassets": "^13.31.0-nightly.3",
-    "@ledgerhq/device-core": "^0.6.6-nightly.2",
-    "@ledgerhq/devices": "8.6.1",
-    "@ledgerhq/errors": "^6.26.0",
-    "@ledgerhq/hw-app-algorand": "^6.31.8",
-    "@ledgerhq/hw-app-aptos": "^6.34.8",
-    "@ledgerhq/hw-app-btc": "^10.11.2",
-    "@ledgerhq/hw-app-celo": "^6.35.1-nightly.2",
-    "@ledgerhq/hw-app-cosmos": "^6.32.8",
-    "@ledgerhq/hw-app-eth": "^6.46.1-nightly.2",
-    "@ledgerhq/hw-app-exchange": "^0.15.1-nightly.0",
-    "@ledgerhq/hw-app-hedera": "^1.2.8",
-    "@ledgerhq/hw-app-icon": "^1.3.8",
-    "@ledgerhq/hw-app-multiversx": "^6.25.3",
-    "@ledgerhq/hw-app-near": "^6.31.8",
-    "@ledgerhq/hw-app-str": "^7.2.8",
+    "@ledgerhq/cryptoassets": "^13.31.0-nightly.5",
+    "@ledgerhq/device-core": "^0.6.6-nightly.4",
+    "@ledgerhq/devices": "8.6.2-nightly.0",
+    "@ledgerhq/errors": "^6.27.0-nightly.0",
+    "@ledgerhq/hw-app-algorand": "^6.31.9-nightly.0",
+    "@ledgerhq/hw-app-aptos": "^6.34.9-nightly.0",
+    "@ledgerhq/hw-app-btc": "^10.11.3-nightly.0",
+    "@ledgerhq/hw-app-celo": "^6.35.1-nightly.4",
+    "@ledgerhq/hw-app-cosmos": "^6.32.9-nightly.0",
+    "@ledgerhq/hw-app-hedera": "^1.2.9-nightly.0",
+    "@ledgerhq/hw-app-eth": "^6.46.1-nightly.4",
+    "@ledgerhq/hw-app-icon": "^1.3.9-nightly.0",
+    "@ledgerhq/hw-app-exchange": "^0.15.1-nightly.1",
+    "@ledgerhq/hw-app-kaspa": "^1.3.2-nightly.0",
+    "@ledgerhq/hw-app-multiversx": "^6.25.4-nightly.0",
+    "@ledgerhq/hw-app-polkadot": "^6.34.9-nightly.0",
+    "@ledgerhq/hw-app-near": "^6.31.9-nightly.0",
+    "@ledgerhq/hw-app-str": "^7.2.9-nightly.0",
+    "@ledgerhq/hw-app-tezos": "^6.31.9-nightly.0",
     "@ledgerhq/hw-app-sui": "^1.4.0",
-    "@ledgerhq/coin-tezos": "^6.7.0-nightly.3",
-    "@ledgerhq/hw-app-kaspa": "^1.3.1",
-    "@ledgerhq/hw-app-polkadot": "^6.34.8",
-    "@ledgerhq/hw-app-tezos": "^6.31.8",
-    "@ledgerhq/hw-app-trx": "^6.31.8",
-    "@ledgerhq/hw-app-vet": "^0.7.0-nightly.3",
-    "@ledgerhq/hw-app-xrp": "^6.32.6",
-    "@ledgerhq/hw-transport": "6.31.12",
-    "@ledgerhq/hw-transport-mocker": "^6.29.12",
-    "@ledgerhq/ledger-cal-service": "^1.7.0-nightly.0",
-    "@ledgerhq/ledger-trust-service": "^0.3.15-nightly.0",
+    "@ledgerhq/hw-app-trx": "^6.31.9-nightly.0",
+    "@ledgerhq/hw-app-vet": "^0.7.0-nightly.4",
+    "@ledgerhq/hw-app-xrp": "^6.32.7-nightly.0",
+    "@ledgerhq/hw-bolos": "^6.32.9-nightly.0",
+    "@ledgerhq/hw-transport-mocker": "^6.29.13-nightly.0",
+    "@ledgerhq/ledger-cal-service": "^1.7.0-nightly.2",
+    "@ledgerhq/ledger-trust-service": "^0.3.15-nightly.2",
     "@ledgerhq/live-config": "^3.2.0",
-    "@ledgerhq/live-countervalues": "^0.8.0-nightly.3",
-    "@ledgerhq/live-countervalues-react": "^0.7.0-nightly.3",
-    "@ledgerhq/live-dmk-shared": "^0.14.0-nightly.1",
-    "@ledgerhq/live-env": "^2.19.0-nightly.0",
+    "@ledgerhq/live-countervalues": "^0.8.0-nightly.5",
+    "@ledgerhq/live-countervalues-react": "^0.7.0-nightly.5",
+    "@ledgerhq/live-dmk-shared": "^0.14.0-nightly.2",
+    "@ledgerhq/live-env": "^2.19.0-nightly.1",
     "@ledgerhq/live-hooks": "0.2.0-nightly.0",
-    "@ledgerhq/live-network": "^2.0.20-nightly.0",
+    "@ledgerhq/live-network": "^2.0.20-nightly.2",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-evm": "^0.8.2-nightly.3",
-    "@ledgerhq/hw-bolos": "^6.32.8",
-    "@ledgerhq/live-signer-solana": "^0.6.0-nightly.3",
-    "@ledgerhq/live-wallet": "^0.14.3-nightly.3",
+    "@ledgerhq/live-signer-canton": "^0.4.2-nightly.5",
+    "@ledgerhq/live-signer-evm": "^0.8.2-nightly.5",
+    "@ledgerhq/live-signer-solana": "^0.6.0-nightly.5",
+    "@ledgerhq/live-wallet": "^0.14.3-nightly.5",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/speculos-transport": "^0.2.13-nightly.0",
-    "@ledgerhq/wallet-api-acre-module": "^0.8.0-nightly.1",
-    "@ledgerhq/wallet-api-exchange-module": "^0.17.0-nightly.1",
-    "@ledgerhq/live-signer-canton": "^0.4.2-nightly.3"
+    "@ledgerhq/speculos-transport": "^0.2.13-nightly.2",
+    "@ledgerhq/wallet-api-acre-module": "^0.8.0-nightly.2",
+    "@ledgerhq/wallet-api-exchange-module": "^0.17.0-nightly.2",
+    "@ledgerhq/hw-transport": "6.31.13-nightly.0"
   },
   "devDependencies": {
     "@solana/web3.js": "1.95.4",
@@ -286,10 +286,10 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "7",
-    "@ledgerhq/device-react": "^0.3.0-nightly.2",
+    "@ledgerhq/device-react": "^0.3.0-nightly.4",
     "@ledgerhq/types-cryptoassets": "^7.29.0-nightly.0",
     "@ledgerhq/types-devices": "^6.27.0",
-    "@ledgerhq/types-live": "^6.87.0-nightly.2"
+    "@ledgerhq/types-live": "^6.87.0-nightly.3"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",

package/src/dada-client/state-manager/api.ts

@@ -41,18 +41,20 @@ export const assetsDataApi = createApi({
           ...(pageParam?.cursor && { cursor: pageParam.cursor }),
           ...(queryArg?.useCase && { transaction: queryArg.useCase }),
           ...(queryArg?.currencyIds &&
-            queryArg?.currencyIds.length > 0 &&
-            !queryArg?.useCase && { currencyIds: queryArg.currencyIds }),
+            queryArg?.currencyIds.length > 0 && { currencyIds: queryArg.currencyIds }),
           ...(queryArg?.search && { search: queryArg.search }),
           product: queryArg.product,
           minVersion: queryArg.version,
-          additionalData: [AssetsAdditionalData.Apy, AssetsAdditionalData.MarketTrend],
+          additionalData: queryArg.additionalData || [
+            AssetsAdditionalData.Apy,
+            AssetsAdditionalData.MarketTrend,
+          ],
         };
 
         const baseUrl = queryArg.isStaging ? getEnv("DADA_API_STAGING") : getEnv("DADA_API_PROD");
 
         return {
-          url: `${baseUrl}assets`,
+          url: `${baseUrl}/assets`,
           params,
         };
       },
@@ -81,7 +83,10 @@ export const assetsDataApi = createApi({
             queryArg?.currencyIds.length > 0 && { currencyIds: queryArg.currencyIds }),
           product: queryArg.product,
           minVersion: queryArg.version,
-          additionalData: [AssetsAdditionalData.Apy, AssetsAdditionalData.MarketTrend],
+          additionalData: queryArg.additionalData || [
+            AssetsAdditionalData.Apy,
+            AssetsAdditionalData.MarketTrend,
+          ],
         };
 
         const baseUrl = queryArg.isStaging ? getEnv("DADA_API_STAGING") : getEnv("DADA_API_PROD");

package/src/dada-client/state-manager/types.ts

@@ -16,6 +16,7 @@ export interface GetAssetsDataParams {
   product: "llm" | "lld";
   version: string;
   isStaging?: boolean;
+  additionalData?: AssetsAdditionalData[];
 }
 
 export interface PageParam {

package/src/e2e/data/deviceLabelsData.ts

@@ -65,7 +65,7 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.ETHEREUM.name]: DeviceLabels.VERIFY_ETHEREUM,
       [AppInfos.POLKADOT.name]: DeviceLabels.PLEASE_REVIEW,
       [AppInfos.POLYGON.name]: DeviceLabels.VERIFY_POLYGON,
-      [AppInfos.SOLANA.name]: DeviceLabels.VERIFY_SOLANA_ADDRESS,
+      [AppInfos.SOLANA.name]: DeviceLabels.PUBKEY,
       default: DeviceLabels.ADDRESS,
     },
     receiveConfirm: {
@@ -75,14 +75,13 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.ETHEREUM.name]: DeviceLabels.CONFIRM,
       [AppInfos.POLKADOT.name]: DeviceLabels.CAPS_APPROVE,
       [AppInfos.POLYGON.name]: DeviceLabels.CONFIRM,
-      [AppInfos.SOLANA.name]: DeviceLabels.CONFIRM,
       default: DeviceLabels.APPROVE,
     },
     delegateVerify: {
       [AppInfos.COSMOS.name]: DeviceLabels.PLEASE_REVIEW,
       [AppInfos.MULTIVERS_X.name]: DeviceLabels.RECEIVER,
       [AppInfos.NEAR.name]: DeviceLabels.VIEW_HEADER,
-      [AppInfos.SOLANA.name]: DeviceLabels.REVIEW_TRANSACTION,
+      [AppInfos.SOLANA.name]: DeviceLabels.DELEGATE_FROM,
       default: DeviceLabels.REVIEW_OPERATION,
     },
     delegateConfirm: {
@@ -92,7 +91,6 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.INJECTIVE.name]: DeviceLabels.CAPS_APPROVE,
       [AppInfos.MULTIVERS_X.name]: DeviceLabels.SIGN,
       [AppInfos.NEAR.name]: DeviceLabels.CONTINUE_TO_ACTION,
-      [AppInfos.SOLANA.name]: DeviceLabels.SIGN_TRANSACTION,
       [AppInfos.OSMOSIS.name]: DeviceLabels.CAPS_APPROVE,
       default: DeviceLabels.APPROVE,
     },

package/src/e2e/enum/Device.ts

@@ -1,7 +1,10 @@
 export class Device {
-  constructor(public readonly name: string) {}
+  constructor(
+    public readonly name: string,
+    public readonly targetId: number,
+  ) {}
 
-  static readonly LNS = "nanoS";
-  static readonly LNX = "nanoX";
-  static readonly LNSP = "nanoSP";
+  static readonly LNS = new Device("nanoS", 823132164);
+  static readonly LNX = new Device("nanoX", 855638020);
+  static readonly LNSP = new Device("nanoSP", 856686596);
 }

package/src/e2e/families/bitcoin.ts

@@ -1,12 +1,7 @@
 import expect from "expect";
 import { Transaction } from "../models/Transaction";
-import {
-  pressBoth,
-  pressUntilTextFound,
-  waitFor,
-  containsSubstringInEvent,
-  getSpeculosModel,
-} from "../speculos";
+import { pressBoth, pressUntilTextFound, waitFor, containsSubstringInEvent } from "../speculos";
+import { getSpeculosModel } from "../speculosAppVersion";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import invariant from "invariant";
@@ -27,7 +22,7 @@ export async function sendBTC(tx: Transaction) {
   const speculosDevice = getSpeculosModel();
   try {
     const events =
-      speculosDevice === Device.LNS
+      speculosDevice === Device.LNS.name
         ? await pressUntilTextFound(DeviceLabels.CONTINUE)
         : await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
     const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
@@ -35,7 +30,7 @@ export async function sendBTC(tx: Transaction) {
     const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
     expect(isAddressCorrect).toBeTruthy();
     await pressBoth();
-    if (speculosDevice === Device.LNS) {
+    if (speculosDevice === Device.LNS.name) {
       await pressUntilTextFound(DeviceLabels.SIGN);
       await pressBoth();
       await waitFor(DeviceLabels.BITCOIN_IS_READY);

package/src/e2e/families/cardano.ts

@@ -11,7 +11,7 @@ import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 
 export async function sendCardano(tx: Transaction) {
-  const isNanoS = process.env.SPECULOS_DEVICE === Device.LNS;
+  const isNanoS = process.env.SPECULOS_DEVICE === Device.LNS.name;
   await waitFor(DeviceLabels.NEW_ORDINARY);
   await (isNanoS ? pressRightButton() : pressBoth());
   if (isNanoS) {
@@ -66,7 +66,7 @@ export async function delegateCardano() {
     [DeviceLabels.CONFIRM, "right"],
   ] as const;
 
-  const steps = process.env.SPECULOS_DEVICE === Device.LNS ? LNSSpecificSteps : commonSteps;
+  const steps = process.env.SPECULOS_DEVICE === Device.LNS.name ? LNSSpecificSteps : commonSteps;
 
   for (const [label, action] of steps) {
     try {

package/src/e2e/families/evm.ts

@@ -1,12 +1,7 @@
 import expect from "expect";
 import { NFTTransaction, Transaction } from "../models/Transaction";
-import {
-  pressBoth,
-  pressUntilTextFound,
-  containsSubstringInEvent,
-  waitFor,
-  getSpeculosModel,
-} from "../speculos";
+import { pressBoth, pressUntilTextFound, containsSubstringInEvent, waitFor } from "../speculos";
+import { getSpeculosModel } from "../speculosAppVersion";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import { DeviceModelId } from "@ledgerhq/types-devices";
@@ -18,7 +13,7 @@ export async function sendEVM(tx: Transaction) {
       : await pressUntilTextFound(DeviceLabels.ACCEPT);
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
-  if (tx.accountToCredit.ensName && process.env.SPECULOS_DEVICE !== Device.LNS) {
+  if (tx.accountToCredit.ensName && process.env.SPECULOS_DEVICE !== Device.LNS.name) {
     const isENSNameCorrect = containsSubstringInEvent(tx.accountToCredit.ensName, events);
     expect(isENSNameCorrect).toBeTruthy();
   } else {

package/src/e2e/families/solana.ts

@@ -4,13 +4,11 @@ import {
   pressUntilTextFound,
   containsSubstringInEvent,
   getDelegateEvents,
-  getSpeculosModel,
 } from "../speculos";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import { Transaction } from "../models/Transaction";
 import { Delegate } from "../models/Delegate";
-import { DeviceModelId } from "@ledgerhq/types-devices";
 
 export async function delegateSolana(delegatingAccount: Delegate) {
   await getDelegateEvents(delegatingAccount);
@@ -18,13 +16,10 @@ export async function delegateSolana(delegatingAccount: Delegate) {
 }
 
 export async function sendSolana(tx: Transaction) {
-  const events =
-    getSpeculosModel() !== DeviceModelId.nanoS
-      ? await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION)
-      : await pressUntilTextFound(DeviceLabels.APPROVE);
+  const events = await pressUntilTextFound(DeviceLabels.APPROVE);
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
-  if (process.env.SPECULOS_DEVICE !== Device.LNS) {
+  if (process.env.SPECULOS_DEVICE !== Device.LNS.name) {
     const isAddressCorrect = containsSubstringInEvent(
       tx.accountToCredit.parentAccount?.address ?? tx.accountToCredit.address,
       events,

package/src/e2e/families/tezos.ts

@@ -1,10 +1,5 @@
-import {
-  getDelegateEvents,
-  getDeviceLabels,
-  getSpeculosModel,
-  pressBoth,
-  pressUntilTextFound,
-} from "../speculos";
+import { getDelegateEvents, getDeviceLabels, pressBoth, pressUntilTextFound } from "../speculos";
+import { getSpeculosModel } from "../speculosAppVersion";
 import { Delegate } from "../models/Delegate";
 import { DeviceModelId } from "@ledgerhq/types-devices";
 import { DeviceLabels } from "../enum/DeviceLabels";

package/src/e2e/speculos.ts

@@ -16,7 +16,6 @@ import { getEnv } from "@ledgerhq/live-env";
 import { getCryptoCurrencyById } from "../currencies";
 import { DeviceLabels } from "./enum/DeviceLabels";
 import { Account } from "./enum/Account";
-import { Device as CryptoWallet } from "./enum/Device";
 import { Currency } from "./enum/Currency";
 import expect from "expect";
 import { sendBTC, sendBTCBasedCoin } from "./families/bitcoin";
@@ -43,6 +42,7 @@ import { delegateOsmosis } from "./families/osmosis";
 import { AppInfos } from "./enum/AppInfos";
 import { DEVICE_LABELS_CONFIG } from "./data/deviceLabelsData";
 import { sendSui } from "./families/sui";
+import { getAppVersionFromCatalog, getSpeculosModel } from "./speculosAppVersion";
 
 const isSpeculosRemote = process.env.REMOTE_SPECULOS === "true";
 
@@ -51,6 +51,7 @@ export type Spec = {
   appQuery: {
     model: DeviceModelId;
     appName: string;
+    appVersion?: string;
   };
   /** @deprecated */
   dependency?: string;
@@ -74,19 +75,6 @@ export function setExchangeDependencies(dependencies: Dependency[]) {
   specs["Exchange"].dependencies = Array.from(map.values());
 }
 
-export function getSpeculosModel() {
-  const speculosDevice = process.env.SPECULOS_DEVICE;
-  switch (speculosDevice) {
-    case CryptoWallet.LNS:
-      return DeviceModelId.nanoS;
-    case CryptoWallet.LNX:
-      return DeviceModelId.nanoX;
-    case CryptoWallet.LNSP:
-    default:
-      return DeviceModelId.nanoSP;
-  }
-}
-
 type Specs = {
   [key: string]: Spec;
 };
@@ -312,7 +300,6 @@ export const specs: Specs = {
     },
     dependency: "",
   },
-
   Celo: {
     currency: getCryptoCurrencyById("celo"),
     appQuery: {
@@ -367,13 +354,21 @@ export async function startSpeculos(
   invariant(seed, "SEED is not set");
   const coinapps = COINAPPS;
   invariant(coinapps, "COINAPPS is not set");
-  let appCandidates;
+  const appCandidates = await listAppCandidates(coinapps);
 
-  if (!appCandidates) {
-    appCandidates = await listAppCandidates(coinapps);
-  }
+  const nanoAppCatalogPath = getEnv("E2E_NANO_APP_VERSION_PATH");
 
   const { appQuery, dependency, onSpeculosDeviceCreated } = spec;
+  try {
+    const displayName = spec.currency?.managerAppName || appQuery.appName;
+    const catalogVersion = await getAppVersionFromCatalog(displayName, nanoAppCatalogPath);
+    if (catalogVersion) {
+      appQuery.appVersion = catalogVersion;
+    }
+  } catch (e) {
+    console.warn("[speculos] Unable to fetch app version from catalog", e);
+  }
+
   const appCandidate = findLatestAppCandidate(appCandidates, appQuery);
   const { model } = appQuery;
   const { dependencies } = spec;
@@ -806,10 +801,7 @@ export async function getDelegateEvents(delegatingAccount: Delegate): Promise<st
 
 export async function verifyAmountsAndAcceptSwap(swap: Swap, amount: string) {
   await waitFor(DeviceLabels.REVIEW_TRANSACTION);
-  const events =
-    getSpeculosModel() === DeviceModelId.nanoS
-      ? await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND)
-      : await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
+  const events = await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND);
   verifySwapData(swap, events, amount);
   await pressBoth();
 }
@@ -829,11 +821,14 @@ export async function verifyAmountsAndRejectSwap(swap: Swap, amount: string) {
 }
 
 function verifySwapData(swap: Swap, events: string[], amount: string) {
-  const swapPair = `swap ${swap.getAccountToDebit.currency.ticker} to ${swap.getAccountToCredit.currency.ticker}`;
+  // Uncoment when new exchange nanoApp is in prod
+
+  // const swapPair = `swap ${swap.getAccountToDebit.currency.ticker} to ${swap.getAccountToCredit.currency.ticker}`;
+
+  // if (getSpeculosModel() !== DeviceModelId.nanoS) {
+  //   expectDeviceScreenContains(swapPair, events, "Swap pair not found on the device screen");
+  // }
 
-  if (getSpeculosModel() !== DeviceModelId.nanoS) {
-    expectDeviceScreenContains(swapPair, events, "Swap pair not found on the device screen");
-  }
   expectDeviceScreenContains(amount, events, `Amount ${amount} not found on the device screen`);
 }
 

package/src/e2e/speculosAppVersion.ts

@@ -0,0 +1,86 @@
+import { HttpManagerApiRepository, ApplicationV2Entity } from "@ledgerhq/device-core";
+import { version } from "@ledgerhq/device-core/package.json";
+import { getEnv } from "@ledgerhq/live-env";
+import { DeviceModelId } from "@ledgerhq/devices";
+import { Device as CryptoWallet } from "./enum/Device";
+import * as fs from "fs";
+import * as path from "path";
+
+export function getSpeculosModel(): DeviceModelId {
+  const speculosDevice = process.env.SPECULOS_DEVICE;
+  switch (speculosDevice) {
+    case CryptoWallet.LNS.name:
+      return DeviceModelId.nanoS;
+    case CryptoWallet.LNX.name:
+      return DeviceModelId.nanoX;
+    case CryptoWallet.LNSP.name:
+    default:
+      return DeviceModelId.nanoSP;
+  }
+}
+
+function getDeviceTargetId(device: DeviceModelId): number {
+  const modelToTargetIdMap = {
+    [DeviceModelId.nanoS]: CryptoWallet.LNS.targetId,
+    [DeviceModelId.nanoX]: CryptoWallet.LNX.targetId,
+    [DeviceModelId.nanoSP]: CryptoWallet.LNSP.targetId,
+  };
+  return modelToTargetIdMap[device];
+}
+
+export async function getNanoAppCatalog(
+  device: DeviceModelId,
+  deviceFirmware: string,
+): Promise<ApplicationV2Entity[]> {
+  const repository = new HttpManagerApiRepository(getEnv("MANAGER_API_BASE"), version);
+  const targetId = getDeviceTargetId(device);
+  return await repository.catalogForDevice({
+    provider: 1,
+    targetId: targetId,
+    firmwareVersion: deviceFirmware,
+  });
+}
+
+function getDeviceFirmwareVersion(): string {
+  const firmwareVersion = process.env.SPECULOS_FIRMWARE_VERSION;
+  if (!firmwareVersion) {
+    throw new Error("SPECULOS_FIRMWARE_VERSION environment variable is not set");
+  }
+  return firmwareVersion;
+}
+
+export async function createNanoAppJsonFile(nanoAppFilePath: string): Promise<void> {
+  try {
+    const device = getSpeculosModel();
+    const firmware = getDeviceFirmwareVersion();
+    const appCatalog = await getNanoAppCatalog(device, firmware);
+    const jsonFilePath = path.join(process.cwd(), nanoAppFilePath);
+    const dirPath = path.dirname(jsonFilePath);
+    if (!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath, { recursive: true });
+    }
+    fs.writeFileSync(jsonFilePath, JSON.stringify(appCatalog, null, 2), "utf8");
+  } catch (error) {
+    console.error("Unable to create app version file:", error);
+  }
+}
+
+export async function getAppVersionFromCatalog(
+  currency: string,
+  nanoAppFilePath: string,
+): Promise<string | undefined> {
+  try {
+    await createNanoAppJsonFile(nanoAppFilePath);
+    const rootDir = process.cwd();
+    const jsonFilePath = path.join(rootDir, nanoAppFilePath);
+    type CatalogApp = { versionDisplayName: string; version: string };
+    const raw = fs.readFileSync(jsonFilePath, "utf8");
+    const catalog: CatalogApp[] = JSON.parse(raw);
+
+    const app = catalog.find(entry => entry.versionDisplayName === currency);
+
+    return app?.version ?? "";
+  } catch (error) {
+    console.error(`Unable to get app version for ${currency} from catalog:`, error);
+  }
+}

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

@@ -1,7 +1,7 @@
 import { useEffect } from "react";
 import { AccountLike } from "@ledgerhq/types-live";
 import { useCurrenciesByMarketcap } from "../../../currencies/hooks";
-import { listCryptoCurrencies, listTokens } from "../../../currencies";
+import { listCryptoCurrencies } from "../../../currencies";
 import { getAvailableAccountsById } from "../utils";
 
 // Pick a default source account if none are selected.
@@ -10,7 +10,7 @@ export const usePickDefaultAccount = (
   fromAccount: AccountLike | null | undefined,
   setFromAccount: (account: AccountLike) => void,
 ): void => {
-  const list = [...listCryptoCurrencies(), ...listTokens()];
+  const list = listCryptoCurrencies();
   const allCurrencies = useCurrenciesByMarketcap(list);
 
   useEffect(() => {