@ledgerhq/live-common 34.54.0-nightly.20251127130943 → 34.54.0-nightly.20251128145758

package/src/bridge/generic-alpaca/postSync.test.ts

@@ -0,0 +1,97 @@
+import type { Account } from "@ledgerhq/types-live";
+import { postSync } from "./postSync";
+import BigNumber from "bignumber.js";
+
+describe("postSync", () => {
+  it("removes confirmed and outdated native operations from the pending pool", () => {
+    const initialAccount = {
+      operations: [{ hash: "hash0", transactionSequenceNumber: new BigNumber(4), type: "OUT" }],
+      pendingOperations: [
+        { hash: "outdated", transactionSequenceNumber: new BigNumber(3), type: "IN" },
+        { hash: "hash1", transactionSequenceNumber: new BigNumber(5), type: "OUT" },
+        { hash: "hash2", transactionSequenceNumber: new BigNumber(6), type: "IN" },
+      ],
+    } as Account;
+    const synced = {
+      operations: [
+        { hash: "hash1", transactionSequenceNumber: new BigNumber(5), type: "OUT" },
+        { hash: "hash0", transactionSequenceNumber: new BigNumber(4), type: "OUT" },
+      ],
+      pendingOperations: [
+        { hash: "outdated", transactionSequenceNumber: new BigNumber(3), type: "IN" },
+        { hash: "hash1", transactionSequenceNumber: new BigNumber(5), type: "OUT" },
+        { hash: "hash2", transactionSequenceNumber: new BigNumber(6), type: "IN" },
+      ],
+    } as Account;
+
+    expect(postSync(initialAccount, synced)).toMatchObject({
+      operations: [
+        { hash: "hash1", transactionSequenceNumber: new BigNumber(5), type: "OUT" },
+        { hash: "hash0", transactionSequenceNumber: new BigNumber(4), type: "OUT" },
+      ],
+      pendingOperations: [
+        { hash: "hash2", transactionSequenceNumber: new BigNumber(6), type: "IN" },
+      ],
+    });
+  });
+
+  it("removes confirmed and outdated token operations from the pending pool", () => {
+    const initialAccount = {
+      operations: [{ hash: "hash0", transactionSequenceNumber: new BigNumber(4), type: "OUT" }],
+      pendingOperations: [
+        { hash: "outdated", transactionSequenceNumber: new BigNumber(3), type: "NONE" },
+        { hash: "hash1", transactionSequenceNumber: new BigNumber(5), type: "FEES" },
+        { hash: "hash2", transactionSequenceNumber: new BigNumber(6), type: "IN" },
+      ],
+      subAccounts: [
+        {
+          pendingOperations: [
+            { hash: "outdated", transactionSequenceNumber: new BigNumber(3), type: "IN" },
+            { hash: "hash1", transactionSequenceNumber: new BigNumber(5), type: "FEES" },
+          ],
+        },
+      ],
+    } as Account;
+    const synced = {
+      operations: [
+        { hash: "hash1", transactionSequenceNumber: new BigNumber(5), type: "FEES" },
+        { hash: "hash0", transactionSequenceNumber: new BigNumber(4), type: "OUT" },
+      ],
+      pendingOperations: [
+        { hash: "outdated", transactionSequenceNumber: new BigNumber(3), type: "NONE" },
+        { hash: "hash1", transactionSequenceNumber: new BigNumber(5), type: "FEES" },
+        { hash: "hash2", transactionSequenceNumber: new BigNumber(6), type: "IN" },
+      ],
+      subAccounts: [
+        {
+          operations: [{ hash: "hash1", transactionSequenceNumber: new BigNumber(5), type: "OUT" }],
+          pendingOperations: [
+            { hash: "outdated", transactionSequenceNumber: new BigNumber(3), type: "IN" },
+          ],
+        },
+      ],
+    } as Account;
+
+    expect(postSync(initialAccount, synced)).toMatchObject({
+      operations: [
+        { hash: "hash1", transactionSequenceNumber: new BigNumber(5), type: "FEES" },
+        { hash: "hash0", transactionSequenceNumber: new BigNumber(4), type: "OUT" },
+      ],
+      pendingOperations: [
+        { hash: "hash2", transactionSequenceNumber: new BigNumber(6), type: "IN" },
+      ],
+      subAccounts: [
+        {
+          operations: [
+            {
+              hash: "hash1",
+              transactionSequenceNumber: new BigNumber(5),
+              type: "OUT",
+            },
+          ],
+          pendingOperations: [],
+        },
+      ],
+    });
+  });
+});

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

@@ -0,0 +1,42 @@
+import type { Account, AccountLike, Operation } from "@ledgerhq/types-live";
+import BigNumber from "bignumber.js";
+
+/**
+ * After each sync or scan, remove operations from the pending pools if necessary
+ * Operations stay pending if and only if
+ *  - they are confirmed, i.e. their hash appear in the operation list
+ *  - they are not outdated, i.e. their sequence number is at least greater than the
+ *    sequence number of the latest transaction
+ * NOTE Compared to the default behaviour
+ *  - pending operations of token accounts are cleaned up, so we don't see both pending and completed
+ *    sub operations in the operation details drawer
+ *  - pending operations are cleaned if their hash already belong to the completed operations, preventing
+ *    undesired replacement (ex: optimistic operation for self token sending on EVM is incomplete, since
+ *    it only contains the OUT sub operation)
+ */
+export function postSync(initial: Account, synced: Account): Account {
+  const lastOperation = synced.operations.find(op => ["OUT", "FEES"].includes(op.type));
+  const latestSequence = lastOperation?.transactionSequenceNumber || new BigNumber(-1);
+
+  function isPending(account: AccountLike, op: Operation): boolean {
+    return (
+      // Operation is not confirmed
+      !account.operations.some(o => o.hash === op.hash) &&
+      // Operation is not outdated
+      op.transactionSequenceNumber !== undefined &&
+      op.transactionSequenceNumber.gt(latestSequence)
+    );
+  }
+
+  const pendingOperations = initial.pendingOperations.length
+    ? initial.pendingOperations.filter(op => isPending(synced, op))
+    : [];
+  const subAccounts = synced.subAccounts?.length
+    ? synced.subAccounts.map(subAccount => ({
+        ...subAccount,
+        pendingOperations: subAccount.pendingOperations.filter(op => isPending(subAccount, op)),
+      }))
+    : [];
+
+  return { ...synced, pendingOperations, subAccounts };
+}

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

@@ -166,10 +166,12 @@ describe("Alpaca utils", () => {
           },
           ...params,
         } as GenericTransaction,
+        3n,
       );
 
       expect(operation).toMatchObject({
         id: `parent-account-id--${expected.parentType}`,
+        transactionSequenceNumber: new BigNumber(3),
         type: expected.parentType,
         value: expected.parentValue,
         accountId: "parent-account-id",
@@ -194,6 +196,7 @@ describe("Alpaca utils", () => {
               subOperations: [
                 {
                   id: `sub-account-id--${expected.subType}`,
+                  transactionSequenceNumber: new BigNumber(3),
                   accountId: "sub-account-id",
                   type: expected.subType,
                   senders: ["account-address"],

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

@@ -412,6 +412,7 @@ export const buildOptimisticOperation = (
         blockHeight: null,
         senders: [account.freshAddress],
         recipients: [transaction.recipient],
+        transactionSequenceNumber: new BigNumber(sequenceNumber?.toString() ?? 0),
         accountId: subAccountId,
         date: new Date(),
         transactionRaw: toGenericTransactionRaw({

package/src/e2e/data/deviceLabelsData.ts

@@ -112,6 +112,7 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
   },
   [DeviceModelId.stax]: TOUCHSCREEN_DEVICE_CONFIG,
   [DeviceModelId.europa]: TOUCHSCREEN_DEVICE_CONFIG,
+  [DeviceModelId.apex]: TOUCHSCREEN_DEVICE_CONFIG,
   default: {
     receiveVerify: {
       [AppInfos.BNB_CHAIN.name]: DeviceLabels.VERIFY_BSC,

package/src/e2e/data/regexes.ts

@@ -0,0 +1 @@
+export const floatNumberRegex = /^\d+\.?\d+$/;

package/src/e2e/enum/Device.ts

@@ -9,4 +9,5 @@ export class Device {
   static readonly LNSP = new Device("nanoSP", 856686596);
   static readonly STAX = new Device("stax", 857735172);
   static readonly FLEX = new Device("flex", 858783748);
+  static readonly NANO_GEN_5 = new Device("nanoGen5", 859832324);
 }

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

@@ -8,6 +8,7 @@ import {
 import reduce from "lodash/reduce";
 import { BUY_SELL_UI_APP_ID } from "../wallet-api/constants";
 import { formatToFirebaseFeatureId } from "./firebaseFeatureFlags";
+import { DeviceModelId } from "@ledgerhq/types-devices";
 
 /**
  * Default disabled feature.
@@ -215,6 +216,18 @@ export const DEFAULT_FEATURES: Features = {
       protectId: "protect-simu",
     },
   },
+  recoverUpsellPostOnboarding: {
+    ...DEFAULT_FEATURE,
+    params: {
+      deviceIds: [
+        DeviceModelId.nanoSP,
+        DeviceModelId.nanoX,
+        DeviceModelId.stax,
+        DeviceModelId.europa,
+        DeviceModelId.apex,
+      ],
+    },
+  },
 
   storyly: {
     enabled: false,

package/src/featureFlags/stakePrograms/index.ts

@@ -44,7 +44,7 @@ export const getBitcoinYieldSetting = (stakePrograms: Feature_StakePrograms | nu
 };
 
 export const getEthDepositScreenSetting = (stakePrograms: Feature_StakePrograms | null): string => {
-  /** Check if Ethereum has "earn" provider configured in redirects with cohort. */
+  /** Check if Ethereum has "earn" provider configured in redirects with ethDepositCohort. */
   const ethereumRedirect = stakePrograms?.enabled
     ? stakePrograms?.params?.redirects?.["ethereum"]
     : undefined;
@@ -55,8 +55,8 @@ export const getEthDepositScreenSetting = (stakePrograms: Feature_StakePrograms
     return "standard";
   }
 
-  // Extract cohort from queryParams
-  const cohort = ethereumRedirect.queryParams?.cohort;
+  // Extract ethDepositCohort from queryParams
+  const ethDepositCohort = ethereumRedirect.queryParams?.ethDepositCohort;
 
-  return cohort ?? "missing_cohort_value";
+  return ethDepositCohort ?? "missing_cohort_value";
 };

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,