@ledgerhq/live-common 34.54.0-nightly.20251127103328 → 34.54.0-nightly.20251128023740

package/src/e2e/families/cardano.ts

@@ -22,7 +22,7 @@ function validateTransactionData(tx: Transaction, events: string[]) {
 
 async function sendCardanoTouchDevices(tx: Transaction) {
   await waitFor(DeviceLabels.REVIEW_TRANSACTION);
-  const events = await pressUntilTextFound(DeviceLabels.TO);
+  const events = await pressUntilTextFound(DeviceLabels.AMOUNT);
   validateTransactionData(tx, events);
   await pressAndRelease(DeviceLabels.TAP_TO_CONTINUE);
   await waitFor(DeviceLabels.FEES);
@@ -77,18 +77,22 @@ export async function sendCardano(tx: Transaction) {
   return sendCardanoButtonDevice(tx);
 }
 
+const TOUCH_DELEGATE_STEPS = [
+  [DeviceLabels.REVIEW_TRANSACTION, "swipe"],
+  [DeviceLabels.TAP_TO_CONTINUE, "tap"],
+  [DeviceLabels.REGISTER, "swipe"],
+  [DeviceLabels.TAP_TO_CONTINUE, "tap"],
+  [DeviceLabels.CONFIRM, "confirm"],
+  [DeviceLabels.DELEGATE_STAKE, "swipe"],
+  [DeviceLabels.TAP_TO_CONTINUE, "tap"],
+  [DeviceLabels.CONFIRM, "confirm"],
+  [DeviceLabels.HOLD_TO_SIGN, "hold"],
+] as const;
+
 const DELEGATE_STEPS_CONFIG = {
-  [DeviceModelId.stax || DeviceModelId.europa]: [
-    [DeviceLabels.REVIEW_TRANSACTION, "swipe"],
-    [DeviceLabels.TAP_TO_CONTINUE, "tap"],
-    [DeviceLabels.REGISTER, "swipe"],
-    [DeviceLabels.TAP_TO_CONTINUE, "tap"],
-    [DeviceLabels.CONFIRM, "confirm"],
-    [DeviceLabels.DELEGATE_STAKE, "swipe"],
-    [DeviceLabels.TAP_TO_CONTINUE, "tap"],
-    [DeviceLabels.CONFIRM, "confirm"],
-    [DeviceLabels.HOLD_TO_SIGN, "hold"],
-  ] as const,
+  [DeviceModelId.stax]: TOUCH_DELEGATE_STEPS,
+  [DeviceModelId.europa]: TOUCH_DELEGATE_STEPS,
+  [DeviceModelId.apex]: TOUCH_DELEGATE_STEPS,
   [DeviceModelId.nanoS]: [
     [DeviceLabels.NEW_ORDINARY, "right"],
     [DeviceLabels.TRANSACTION_FEE, "both"],
@@ -115,8 +119,22 @@ const DELEGATE_STEPS_CONFIG = {
   ] as const,
 };
 
+function getConfirmButtonCoords(): { x: number; y: number } {
+  const speculosModel = getSpeculosModel();
+
+  switch (speculosModel) {
+    case DeviceModelId.stax:
+      return { x: 152, y: 532 };
+    case DeviceModelId.apex:
+      return { x: 114, y: 305 };
+    case DeviceModelId.europa:
+    default:
+      return { x: 186, y: 446 };
+  }
+}
+
 async function delegateTouchDevicesAction(label: DeviceLabels) {
-  const CONFIRM_BUTTON_COORDS = { x: 139, y: 532 };
+  const CONFIRM_BUTTON_COORDS = getConfirmButtonCoords();
   await waitFor(label);
   switch (label) {
     case DeviceLabels.TAP_TO_CONTINUE:
@@ -164,7 +182,7 @@ async function executeDelegateStep(label: DeviceLabels, action: ActionType) {
 export async function delegateCardano() {
   const speculosModel = getSpeculosModel();
   const steps =
-    speculosModel === DeviceModelId.stax || speculosModel === DeviceModelId.europa
+    isTouchDevice() && DELEGATE_STEPS_CONFIG[speculosModel]
       ? DELEGATE_STEPS_CONFIG[speculosModel]
       : speculosModel === DeviceModelId.nanoS
         ? DELEGATE_STEPS_CONFIG[DeviceModelId.nanoS]

package/src/e2e/index.ts

@@ -1,6 +1,7 @@
 import { EnvName } from "@ledgerhq/live-env";
 import { Feature, FeatureId } from "@ledgerhq/types-live";
 import { getFeature, DEFAULT_FEATURES } from "../featureFlags";
+import axios, { AxiosError } from "axios";
 
 export const getAllFeatureFlags = (
   appLanguage?: string,
@@ -53,3 +54,22 @@ export const formatEnvData = (data: { [key in EnvName]: unknown }) => {
   }
   return allureData;
 };
+
+export const sanitizeError = (error: unknown): Error => {
+  if (!axios.isAxiosError(error)) {
+    return error instanceof Error ? error : new Error(String(error ?? "Unknown error"));
+  }
+
+  const err = error as AxiosError;
+  const sanitized = new Error(err.message || "Axios request failed");
+
+  Object.assign(sanitized, {
+    name: err.name,
+    code: err.code,
+    url: err.config?.url,
+    method: err.config?.method,
+    status: err.response?.status,
+  });
+
+  return sanitized;
+};

package/src/e2e/speculos.ts

@@ -49,6 +49,7 @@ import {
   swipeRight,
 } from "./deviceInteraction/TouchDeviceSimulator";
 import { withDeviceController } from "./deviceInteraction/DeviceController";
+import { sanitizeError } from ".";
 
 const isSpeculosRemote = process.env.REMOTE_SPECULOS === "true";
 
@@ -428,7 +429,7 @@ export async function startSpeculos(
           };
         });
   } catch (e: unknown) {
-    console.error(e);
+    console.error(sanitizeError(e));
     log("engine", `test ${testName} failed with ${String(e)}`);
   }
 }
@@ -610,7 +611,7 @@ export async function takeScreenshot(port?: number): Promise<Buffer | undefined>
     );
     return response.data;
   } catch (error) {
-    console.error("Error downloading speculos screenshot:", error);
+    console.error("Error downloading speculos screenshot:", sanitizeError(error));
   }
 }
 
@@ -668,12 +669,42 @@ export const activateLedgerSync = withDeviceController(({ getButtonsController }
   }
 });
 
+const getSettingsToggle1Coordinates = () => {
+  const deviceModel = getSpeculosModel();
+
+  switch (deviceModel) {
+    case DeviceModelId.stax:
+      return { x: 345, y: 136 };
+    case DeviceModelId.europa:
+      return { x: 420, y: 140 };
+    case DeviceModelId.apex:
+      return { x: 263, y: 100 };
+    default:
+      return { x: 420, y: 140 };
+  }
+};
+
+const getSettingsCogwheelCoordinates = () => {
+  const deviceModel = getSpeculosModel();
+
+  switch (deviceModel) {
+    case DeviceModelId.stax:
+      return { x: 362, y: 43 };
+    case DeviceModelId.europa:
+      return { x: 400, y: 80 };
+    case DeviceModelId.apex:
+      return { x: 253, y: 58 };
+    default:
+      return { x: 400, y: 80 };
+  }
+};
+
 export const activateExpertMode = withDeviceController(({ getButtonsController }) => async () => {
   const buttons = getButtonsController();
 
   if (isTouchDevice()) {
     await goToSettings();
-    const SettingsToggle1Coordinates = { x: 344, y: 136 };
+    const SettingsToggle1Coordinates = getSettingsToggle1Coordinates();
     await pressAndRelease(
       DeviceLabels.SETTINGS_TOGGLE_1,
       SettingsToggle1Coordinates.x,
@@ -698,7 +729,7 @@ export const goToSettings = withDeviceController(({ getButtonsController }) => a
   const buttons = getButtonsController();
 
   if (isTouchDevice()) {
-    const SettingsCogwheelCoordinates = { x: 400, y: 75 };
+    const SettingsCogwheelCoordinates = getSettingsCogwheelCoordinates();
     await pressAndRelease(
       DeviceLabels.SETTINGS,
       SettingsCogwheelCoordinates.x,

package/src/e2e/speculosAppVersion.ts

@@ -3,6 +3,7 @@ import { version } from "../../package.json";
 import { getEnv } from "@ledgerhq/live-env";
 import { DeviceModelId } from "@ledgerhq/devices";
 import { Device as CryptoWallet } from "./enum/Device";
+import { sanitizeError } from "./index";
 import * as fs from "fs";
 import * as path from "path";
 
@@ -18,6 +19,8 @@ export function getSpeculosModel(): DeviceModelId {
     case CryptoWallet.FLEX.name:
     case DeviceModelId.europa:
       return DeviceModelId.europa;
+    case CryptoWallet.NANO_GEN_5.name:
+      return DeviceModelId.apex;
     case CryptoWallet.LNSP.name:
     default:
       return DeviceModelId.nanoSP;
@@ -26,7 +29,9 @@ export function getSpeculosModel(): DeviceModelId {
 
 export function isTouchDevice(): boolean {
   const model = getSpeculosModel();
-  return model === DeviceModelId.stax || model === DeviceModelId.europa;
+  return (
+    model === DeviceModelId.stax || model === DeviceModelId.europa || model === DeviceModelId.apex
+  );
 }
 
 function getDeviceTargetId(device: DeviceModelId): number {
@@ -36,6 +41,7 @@ function getDeviceTargetId(device: DeviceModelId): number {
     [DeviceModelId.nanoSP]: CryptoWallet.LNSP.targetId,
     [DeviceModelId.stax]: CryptoWallet.STAX.targetId,
     [DeviceModelId.europa]: CryptoWallet.FLEX.targetId,
+    [DeviceModelId.apex]: CryptoWallet.NANO_GEN_5.targetId,
   };
   return modelToTargetIdMap[device];
 }
@@ -73,7 +79,7 @@ export async function createNanoAppJsonFile(nanoAppFilePath: string): Promise<vo
     }
     fs.writeFileSync(jsonFilePath, JSON.stringify(appCatalog, null, 2), "utf8");
   } catch (error) {
-    console.error("Unable to create app version file:", error);
+    console.error("Unable to create app version file:", sanitizeError(error));
   }
 }
 

package/src/e2e/swap.ts

@@ -1,11 +1,12 @@
 import { Account } from "./enum/Account";
+import { sanitizeError } from "./index";
 import axios from "axios";
 
 export async function getMinimumSwapAmount(AccountFrom: Account, AccountTo: Account) {
   try {
     const requestConfig = {
       method: "GET",
-      url: `https://swap-stg.ledger-test.com/v5/quote`,
+      url: "https://swap-stg.ledger-test.com/v5/quote",
       params: {
         from: AccountFrom.currency.id,
         to: AccountTo.currency.id,
@@ -21,9 +22,7 @@ export async function getMinimumSwapAmount(AccountFrom: Account, AccountTo: Acco
         tradeType: "INPUT",
         uniswapOrderType: "uniswapxv1",
       },
-      headers: {
-        accept: "application/json",
-      },
+      headers: { accept: "application/json" },
     };
 
     const { data } = await axios(requestConfig);
@@ -38,8 +37,10 @@ export async function getMinimumSwapAmount(AccountFrom: Account, AccountTo: Acco
     }
 
     return Math.max(...minimumAmounts);
-  } catch (error) {
-    console.error("Error fetching swap minimum amount:", error);
-    throw error;
+  } catch (error: any) {
+    const sanitizedError = sanitizeError(error);
+    console.error("Error fetching swap minimum amount:", sanitizedError);
+    // throw the sanitized error, not the original circular Axios error
+    throw sanitizedError;
   }
 }

package/src/featureFlags/defaultFeatures.ts

@@ -703,7 +703,12 @@ export const DEFAULT_FEATURES: Features = {
   supportDeviceApex: DEFAULT_FEATURE,
   llmSyncOnboardingIncr1: DEFAULT_FEATURE,
   lldSyncOnboardingIncr1: DEFAULT_FEATURE,
-  noah: DEFAULT_FEATURE,
+  noah: {
+    ...DEFAULT_FEATURE,
+    params: {
+      activeCurrencyIds: [],
+    },
+  },
   newSendFlow: DEFAULT_FEATURE,
   cantonSkipPreapprovalStep: DEFAULT_FEATURE,
   lldSessionReplay: {

package/src/load/speculos.ts

@@ -28,6 +28,7 @@ export { closeAllSpeculosDevices, releaseSpeculosDevice, createSpeculosDevice };
 export type { SpeculosTransport };
 
 const modelMapPriority: Record<string, number> = {
+  apex_p: 7,
   flex: 6,
   stax: 5,
   nanos: 4,

package/lib/families/evm/shouldUseReceiveOptions.d.ts

@@ -1,3 +0,0 @@
-declare const shouldUseReceiveOptions: (currencyId: string | undefined) => boolean;
-export default shouldUseReceiveOptions;
-//# sourceMappingURL=shouldUseReceiveOptions.d.ts.map

package/lib/families/evm/shouldUseReceiveOptions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shouldUseReceiveOptions.d.ts","sourceRoot":"","sources":["../../../src/families/evm/shouldUseReceiveOptions.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,uBAAuB,eAAgB,MAAM,GAAG,SAAS,YACkB,CAAC;AAElF,eAAe,uBAAuB,CAAC"}

package/lib/families/evm/shouldUseReceiveOptions.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const shouldUseReceiveOptions = (currencyId) => !!(currencyId && ["ethereum/erc20/usd__coin", "ethereum"].includes(currencyId));
-exports.default = shouldUseReceiveOptions;
-//# sourceMappingURL=shouldUseReceiveOptions.js.map

package/lib/families/evm/shouldUseReceiveOptions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"shouldUseReceiveOptions.js","sourceRoot":"","sources":["../../../src/families/evm/shouldUseReceiveOptions.ts"],"names":[],"mappings":";;AAAA,MAAM,uBAAuB,GAAG,CAAC,UAA8B,EAAE,EAAE,CACjE,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,0BAA0B,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;AAElF,kBAAe,uBAAuB,CAAC"}

package/lib-es/families/evm/shouldUseReceiveOptions.d.ts

@@ -1,3 +0,0 @@
-declare const shouldUseReceiveOptions: (currencyId: string | undefined) => boolean;
-export default shouldUseReceiveOptions;
-//# sourceMappingURL=shouldUseReceiveOptions.d.ts.map

package/lib-es/families/evm/shouldUseReceiveOptions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shouldUseReceiveOptions.d.ts","sourceRoot":"","sources":["../../../src/families/evm/shouldUseReceiveOptions.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,uBAAuB,eAAgB,MAAM,GAAG,SAAS,YACkB,CAAC;AAElF,eAAe,uBAAuB,CAAC"}

package/lib-es/families/evm/shouldUseReceiveOptions.js

@@ -1,3 +0,0 @@
-const shouldUseReceiveOptions = (currencyId) => !!(currencyId && ["ethereum/erc20/usd__coin", "ethereum"].includes(currencyId));
-export default shouldUseReceiveOptions;
-//# sourceMappingURL=shouldUseReceiveOptions.js.map

package/lib-es/families/evm/shouldUseReceiveOptions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"shouldUseReceiveOptions.js","sourceRoot":"","sources":["../../../src/families/evm/shouldUseReceiveOptions.ts"],"names":[],"mappings":"AAAA,MAAM,uBAAuB,GAAG,CAAC,UAA8B,EAAE,EAAE,CACjE,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,0BAA0B,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;AAElF,eAAe,uBAAuB,CAAC"}

package/src/families/evm/shouldUseReceiveOptions.test.ts

@@ -1,25 +0,0 @@
-import shouldUseReceiveOptions from "./shouldUseReceiveOptions";
-
-describe("shouldUseReceiveOptions", () => {
-  it("returns true for 'ethereum/erc20/usd__coin'", () => {
-    expect(shouldUseReceiveOptions("ethereum/erc20/usd__coin")).toBe(true);
-  });
-
-  it("returns true for 'ethereum'", () => {
-    expect(shouldUseReceiveOptions("ethereum")).toBe(true);
-  });
-
-  it("returns false for undefined", () => {
-    expect(shouldUseReceiveOptions(undefined)).toBe(false);
-  });
-
-  it("returns false for empty string", () => {
-    expect(shouldUseReceiveOptions("")).toBe(false);
-  });
-
-  it("returns false for other currency ids", () => {
-    expect(shouldUseReceiveOptions("bitcoin")).toBe(false);
-    expect(shouldUseReceiveOptions("ethereum/erc20/other_token")).toBe(false);
-    expect(shouldUseReceiveOptions("usd__coin")).toBe(false);
-  });
-});

package/src/families/evm/shouldUseReceiveOptions.ts

@@ -1,4 +0,0 @@
-const shouldUseReceiveOptions = (currencyId: string | undefined) =>
-  !!(currencyId && ["ethereum/erc20/usd__coin", "ethereum"].includes(currencyId));
-
-export default shouldUseReceiveOptions;