@ledgerhq/live-common 34.41.0 → 34.42.0-nightly.1

package/src/e2e/families/aptos.ts

@@ -1,7 +1,17 @@
-import { pressBoth, pressUntilTextFound } from "../speculos";
+import expect from "expect";
+import { pressBoth, pressUntilTextFound, waitFor, containsSubstringInEvent } from "../speculos";
 import { DeviceLabels } from "../enum/DeviceLabels";
+import { Delegate } from "../models/Delegate";
 
 export async function sendAptos() {
   await pressUntilTextFound(DeviceLabels.APPROVE);
   await pressBoth();
 }
+
+export async function delegateAptos(delegatingAccount: Delegate) {
+  await waitFor(DeviceLabels.REVIEW_OPERATION);
+  const events = await pressUntilTextFound(DeviceLabels.APPROVE);
+  const isAmountCorrect = containsSubstringInEvent(delegatingAccount.amount, events);
+  expect(isAmountCorrect).toBeTruthy();
+  await pressBoth();
+}

package/src/e2e/families/cardano.ts

@@ -29,7 +29,7 @@ export async function sendCardano(tx: Transaction) {
   await pressBoth();
   await waitFor(DeviceLabels.TRANSACTION_FEE);
   await pressBoth();
-  await waitFor(DeviceLabels.CONFIRM_TRANSACTION);
+  await waitFor(DeviceLabels.CONFIRM);
   if (isNanoS) {
     await pressRightButton();
   } else {
@@ -41,38 +41,40 @@ export async function sendCardano(tx: Transaction) {
 
 export async function delegateCardano() {
   const commonSteps = [
-    { label: DeviceLabels.NEW_ORDINARY, action: "both" },
-    { label: DeviceLabels.TRANSACTION_FEE, action: "both" },
-    { label: DeviceLabels.REGISTER, action: "both" },
-    { label: DeviceLabels.STAKE_KEY, action: "both" },
-    { label: DeviceLabels.CONFIRM, action: "both" },
-    { label: DeviceLabels.DELEGATE_STAKE, action: "both" },
-    { label: DeviceLabels.STAKE_KEY, action: "both" },
-    { label: DeviceLabels.CONFIRM, action: "both" },
-    { label: DeviceLabels.CONFIRM, action: "both" },
-  ];
+    [DeviceLabels.NEW_ORDINARY, "both"],
+    [DeviceLabels.TRANSACTION_FEE, "both"],
+    [DeviceLabels.REGISTER, "both"],
+    [DeviceLabels.STAKE_KEY, "both"],
+    [DeviceLabels.DEPOSIT, "both"],
+    [DeviceLabels.CONFIRM, "both"],
+    [DeviceLabels.DELEGATE_STAKE, "both"],
+    [DeviceLabels.STAKE_KEY, "both"],
+    [DeviceLabels.CONFIRM, "both"],
+    [DeviceLabels.CONFIRM, "both"],
+  ] as const;
 
   const LNSSpecificSteps = [
-    { label: DeviceLabels.NEW_ORDINARY, action: "right" },
-    { label: DeviceLabels.TRANSACTION_FEE, action: "both" },
-    { label: DeviceLabels.REGISTER, action: "both" },
-    { label: DeviceLabels.STAKE_KEY, action: "both" },
-    { label: DeviceLabels.CONFIRM, action: "right" },
-    { label: DeviceLabels.DELEGATE_STAKE, action: "both" },
-    { label: DeviceLabels.STAKE_KEY, action: "both" },
-    { label: DeviceLabels.CONFIRM, action: "right" },
-    { label: DeviceLabels.CONFIRM, action: "right" },
-  ];
+    [DeviceLabels.NEW_ORDINARY, "right"],
+    [DeviceLabels.TRANSACTION_FEE, "both"],
+    [DeviceLabels.REGISTER, "both"],
+    [DeviceLabels.STAKE_KEY, "both"],
+    [DeviceLabels.CONFIRM, "right"],
+    [DeviceLabels.DELEGATE_STAKE, "both"],
+    [DeviceLabels.STAKE_KEY, "both"],
+    [DeviceLabels.CONFIRM, "right"],
+    [DeviceLabels.CONFIRM, "right"],
+  ] as const;
 
-  const stepsToExecute =
-    process.env.SPECULOS_DEVICE === Device.LNS ? LNSSpecificSteps : commonSteps;
+  const steps = process.env.SPECULOS_DEVICE === Device.LNS ? LNSSpecificSteps : commonSteps;
 
-  for (const step of stepsToExecute) {
-    await waitFor(step.label);
-    if (step.action === "both") {
-      await pressBoth();
-    } else if (step.action === "right") {
-      await pressRightButton();
+  for (const [label, action] of steps) {
+    try {
+      await waitFor(label);
+      action === "both" ? await pressBoth() : await pressRightButton();
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(`Error while waiting for "${label}":`, message);
+      break;
     }
   }
 }

package/src/e2e/families/celo.ts

@@ -4,7 +4,7 @@ import { Delegate } from "../models/Delegate";
 import expect from "expect";
 
 export async function delegateCelo(tx: Delegate) {
-  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
+  await waitFor(DeviceLabels.REVIEW_OPERATION);
   const events = await pressUntilTextFound(DeviceLabels.ACCEPT);
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();

package/src/e2e/families/evm.ts

@@ -20,7 +20,7 @@ export async function sendEVM(tx: Transaction) {
 }
 
 export async function sendEvmNFT(tx: NFTTransaction) {
-  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
+  await waitFor(DeviceLabels.REVIEW_OPERATION);
   const events = await pressUntilTextFound(DeviceLabels.ACCEPT);
   const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
   expect(isAddressCorrect).toBeTruthy();

package/src/e2e/speculos.ts

@@ -33,6 +33,7 @@ import { delegateCosmos, sendCosmos } from "./families/cosmos";
 import { delegateSolana, sendSolana } from "./families/solana";
 import { delegateTezos } from "./families/tezos";
 import { delegateCelo } from "./families/celo";
+import { delegateAptos } from "./families/aptos";
 import { delegateMultiversX } from "./families/multiversX";
 import { NFTTransaction, Transaction } from "./models/Transaction";
 import { Delegate } from "./models/Delegate";
@@ -413,26 +414,23 @@ interface ResponseData {
   events: Event[];
 }
 
-export async function waitFor(text: string, maxAttempts: number = 10): Promise<string[]> {
-  const speculosApiPort = getEnv("SPECULOS_API_PORT");
-  const speculosAddress = process.env.SPECULOS_ADDRESS || "http://127.0.0.1";
-  let attempts = 0;
-  let textFound: boolean = false;
-  while (attempts < maxAttempts && !textFound) {
-    const response = await axios.get<ResponseData>(
-      `${speculosAddress}:${speculosApiPort}/events?stream=false&currentscreenonly=true`,
-    );
-    const responseData = response.data;
-    const texts = responseData.events.map(event => event.text);
-
-    if (texts?.[0]?.includes(text)) {
-      textFound = true;
+export async function waitFor(text: string, maxAttempts = 10): Promise<string[]> {
+  const port = getEnv("SPECULOS_API_PORT");
+  const address = process.env.SPECULOS_ADDRESS || "http://127.0.0.1";
+  const url = `${address}:${port}/events?stream=false&currentscreenonly=true`;
+
+  for (let attempt = 0; attempt < maxAttempts; attempt++) {
+    const { data } = await axios.get<ResponseData>(url);
+    const texts = data.events.map(event => event.text);
+
+    if (texts?.some(t => t?.toLowerCase().includes(text.toLowerCase()))) {
       return texts;
     }
-    attempts++;
+
     await waitForTimeOut(500);
   }
-  return [];
+
+  throw new Error(`Text "${text}" not found on device screen after ${maxAttempts} attempts.`);
 }
 
 export async function pressBoth() {
@@ -558,6 +556,11 @@ export async function activateContractData() {
   await pressBoth();
 }
 
+export async function goToSettings() {
+  await pressUntilTextFound(DeviceLabels.SETTINGS);
+  await pressBoth();
+}
+
 export async function expectValidAddressDevice(account: Account, addressDisplayed: string) {
   let deviceLabels: string[];
 
@@ -567,7 +570,11 @@ export async function expectValidAddressDevice(account: Account, addressDisplaye
       break;
     case Currency.DOT:
     case Currency.ATOM:
-      deviceLabels = [DeviceLabels.ADDRESS, DeviceLabels.CAPS_APPROVE, DeviceLabels.CAPS_REJECT];
+      deviceLabels = [
+        DeviceLabels.PLEASE_REVIEW,
+        DeviceLabels.CAPS_APPROVE,
+        DeviceLabels.CAPS_REJECT,
+      ];
       break;
     case Currency.BTC:
       deviceLabels = [DeviceLabels.ADDRESS, DeviceLabels.CONFIRM, DeviceLabels.CANCEL];
@@ -631,12 +638,10 @@ export async function signSendTransaction(tx: Transaction) {
 
 export async function signSendNFTTransaction(tx: NFTTransaction) {
   const currencyName = tx.accountToDebit.currency;
-  switch (currencyName) {
-    case Currency.ETH:
-      await sendEvmNFT(tx);
-      break;
-    default:
-      throw new Error(`Unsupported currency: ${currencyName.ticker}`);
+  if (currencyName === Currency.ETH) {
+    await sendEvmNFT(tx);
+  } else {
+    throw new Error(`Unsupported currency: ${currencyName.ticker}`);
   }
 }
 
@@ -666,18 +671,23 @@ export async function signDelegationTransaction(delegatingAccount: Delegate) {
     case Account.CELO_1.currency.name:
       await delegateCelo(delegatingAccount);
       break;
+    case Account.APTOS_1.currency.name:
+      await delegateAptos(delegatingAccount);
+      break;
     default:
       throw new Error(`Unsupported currency: ${currencyName}`);
   }
 }
 
 export async function verifyAmountsAndAcceptSwap(swap: Swap, amount: string) {
+  await waitFor(DeviceLabels.REVIEW_OPERATION);
   const events = await pressUntilTextFound(DeviceLabels.ACCEPT);
   await verifySwapData(swap, events, amount);
   await pressBoth();
 }
 
 export async function verifyAmountsAndRejectSwap(swap: Swap, amount: string) {
+  await waitFor(DeviceLabels.REVIEW_OPERATION);
   const events = await pressUntilTextFound(DeviceLabels.REJECT);
   await verifySwapData(swap, events, amount);
   await pressBoth();

package/src/families/aptos/__snapshots__/bridge.integration.test.ts.snap

@@ -3,6 +3,12 @@
 exports[`aptos currency bridge scanAccounts aptos seed 1 1`] = `
 [
   {
+    "aptosResources": {
+      "activeBalance": "0",
+      "inactiveBalance": "0",
+      "pendingInactiveBalance": "0",
+      "stakingPositions": [],
+    },
     "balance": "19949100",
     "currencyId": "aptos",
     "derivationMode": "aptos",
@@ -21,17 +27,23 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 1`] = `
     "xpub": "d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956",
   },
   {
-    "balance": "20020000",
+    "aptosResources": {
+      "activeBalance": "0",
+      "inactiveBalance": "0",
+      "pendingInactiveBalance": "0",
+      "stakingPositions": [],
+    },
+    "balance": "20050000",
     "currencyId": "aptos",
     "derivationMode": "aptos",
     "freshAddress": "0xd20fa44192f94ba086ab16bfdf57e43ff118ada69b4c66fa9b9a9223cbc068c1",
     "freshAddressPath": "44'/637'/1'/0'/0'",
     "id": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos",
     "index": 1,
-    "operationsCount": 2,
+    "operationsCount": 5,
     "pendingOperations": [],
     "seedIdentifier": "d6816f4f22f867b56cf9304b776f452a16d107835d73ee8a33c4ced210300583",
-    "spendableBalance": "20020000",
+    "spendableBalance": "20050000",
     "subAccounts": [],
     "swapHistory": [],
     "syncHash": undefined,
@@ -39,6 +51,12 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 1`] = `
     "xpub": "6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e",
   },
   {
+    "aptosResources": {
+      "activeBalance": "0",
+      "inactiveBalance": "0",
+      "pendingInactiveBalance": "0",
+      "stakingPositions": [],
+    },
     "balance": "0",
     "currencyId": "aptos",
     "derivationMode": "aptos",
@@ -211,6 +229,27 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
     },
   ],
   [
+    {
+      "accountId": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos",
+      "blockHash": "0xb71a59a5f43dc73c945da97ef88043721dab81f658df7a4a4207f95ce7cad0ee",
+      "blockHeight": 366009981,
+      "extra": {
+        "version": "2901622402",
+      },
+      "fee": "1100",
+      "hasFailed": false,
+      "hash": "0x1acd500f32be88a62692698502a296dcb977e5629bbbf12e448bc69737c18c40",
+      "id": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos-0x1acd500f32be88a62692698502a296dcb977e5629bbbf12e448bc69737c18c40-IN",
+      "recipients": [
+        "0xd20fa44192f94ba086ab16bfdf57e43ff118ada69b4c66fa9b9a9223cbc068c1",
+      ],
+      "senders": [
+        "0xb69a68cc64f7aa193705193f4dd598320a0a74baf7e4b50c9980c5bd60a82390",
+      ],
+      "transactionSequenceNumber": 179,
+      "type": "IN",
+      "value": "10000",
+    },
     {
       "accountId": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos",
       "blockHash": "0x27db591a136924b48d10e6e152a3e856a5c38b332654767da252851adbb454b2",
@@ -232,6 +271,48 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "type": "IN",
       "value": "20000000",
     },
+    {
+      "accountId": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos",
+      "blockHash": "0xadfce17fba19584616fec77888c41c1bacd18ef8702dfe07ccfbfeafd8edfd17",
+      "blockHeight": 366013582,
+      "extra": {
+        "version": "2901672541",
+      },
+      "fee": "1100",
+      "hasFailed": false,
+      "hash": "0x494582adf8f3e2748a30453a687106524f18296bf5924e3c1ead8a2503894970",
+      "id": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos-0x494582adf8f3e2748a30453a687106524f18296bf5924e3c1ead8a2503894970-IN",
+      "recipients": [
+        "0xd20fa44192f94ba086ab16bfdf57e43ff118ada69b4c66fa9b9a9223cbc068c1",
+      ],
+      "senders": [
+        "0xb69a68cc64f7aa193705193f4dd598320a0a74baf7e4b50c9980c5bd60a82390",
+      ],
+      "transactionSequenceNumber": 182,
+      "type": "IN",
+      "value": "10000",
+    },
+    {
+      "accountId": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos",
+      "blockHash": "0x1647b469fb104624e4e0a9b7f0b0368facec96a232cde5f83be1235c1068b038",
+      "blockHeight": 366012016,
+      "extra": {
+        "version": "2901651004",
+      },
+      "fee": "1100",
+      "hasFailed": false,
+      "hash": "0x4f42472b8c92d3d6083d05a3a357f38ed97491f5e0750058da49cc04cef82794",
+      "id": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos-0x4f42472b8c92d3d6083d05a3a357f38ed97491f5e0750058da49cc04cef82794-IN",
+      "recipients": [
+        "0xd20fa44192f94ba086ab16bfdf57e43ff118ada69b4c66fa9b9a9223cbc068c1",
+      ],
+      "senders": [
+        "0xb69a68cc64f7aa193705193f4dd598320a0a74baf7e4b50c9980c5bd60a82390",
+      ],
+      "transactionSequenceNumber": 181,
+      "type": "IN",
+      "value": "10000",
+    },
     {
       "accountId": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos",
       "blockHash": "0xf37ce698cf2e6d9e4a0048cd6d09fb3f19f417ab8251a3cc1f19b8d0e503538f",

package/src/families/aptos/config.ts

@@ -0,0 +1,12 @@
+import { CurrencyLiveConfigDefinition } from "../../config";
+
+const aptosConfig: CurrencyLiveConfigDefinition = {
+  config_currency_aptos: {
+    type: "object",
+    default: {
+      status: { type: "active" },
+    },
+  },
+};
+
+export { aptosConfig };

package/src/families/aptos/constants.ts

@@ -0,0 +1,2 @@
+// Encapsulate for LLD and LLM
+export * from "@ledgerhq/coin-aptos/constants";

package/src/families/aptos/logic.ts

@@ -0,0 +1,2 @@
+// Encapsulate for LLD and LLM
+export * from "@ledgerhq/coin-aptos/bridge/logic";

package/src/families/aptos/react.ts

@@ -0,0 +1,89 @@
+import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
+import { useMemo } from "react";
+import { getCurrentAptosPreloadData, getAptosPreloadData } from "@ledgerhq/coin-aptos/preload-data";
+import type {
+  AptosAccount,
+  AptosMappedStakingPosition,
+  AptosPreloadData,
+  AptosValidator,
+  Transaction,
+} from "./types";
+import { useObservable } from "../../observable";
+import { getAccountCurrency } from "../../account";
+import { mapStakingPositions } from "./staking";
+
+export function useAptosPreloadData(currency: CryptoCurrency): AptosPreloadData | undefined | null {
+  return useObservable(getAptosPreloadData(currency), getCurrentAptosPreloadData(currency));
+}
+
+export function useAptosValidators(currency: CryptoCurrency, search?: string): AptosValidator[] {
+  const data = useAptosPreloadData(currency);
+
+  return useMemo(() => {
+    const validators = data?.validators ?? [];
+
+    if (validators.length === 0 || !search || search === "") {
+      return validators;
+    }
+
+    const lowercaseSearch = search.toLowerCase();
+
+    const filtered = validators.filter(
+      validator =>
+        validator.name?.toLowerCase().includes(lowercaseSearch) ||
+        validator.address.toLowerCase().includes(lowercaseSearch),
+    );
+
+    const flags = [];
+    const output: AptosValidator[] = [];
+    for (let i = 0; i < filtered.length; i++) {
+      if (flags[filtered[i].address]) continue;
+      flags[filtered[i].address] = true;
+      output.push(filtered[i]);
+    }
+    return output;
+  }, [data, search]);
+}
+
+export function useAptosMappedStakingPositions(
+  account: AptosAccount,
+): AptosMappedStakingPosition[] {
+  const validators = useAptosValidators(account.currency, "");
+  const stakingPositions = account.aptosResources?.stakingPositions;
+
+  const unit = getAccountCurrency(account).units[0];
+
+  return useMemo(() => {
+    const mappedStakingPositions = mapStakingPositions(stakingPositions || [], validators, unit);
+    return mappedStakingPositions;
+  }, [stakingPositions, validators, unit]);
+}
+
+export function useAptosStakingPositionsQuerySelector(
+  account: AptosAccount,
+  transaction: Transaction,
+): {
+  options: AptosMappedStakingPosition[];
+  value: AptosMappedStakingPosition | undefined;
+} {
+  const stakingPositions = useAptosMappedStakingPositions(account);
+  const options = useMemo<AptosMappedStakingPosition[]>(
+    () =>
+      stakingPositions.filter(sp =>
+        transaction.mode === "unstake" ? sp.active.gt(0) : sp.inactive.gt(0),
+      ),
+    [stakingPositions, transaction],
+  );
+
+  const selectedValidatorAddress = transaction.recipient;
+
+  const value = useMemo(
+    () => stakingPositions.find(({ validatorId }) => validatorId === selectedValidatorAddress),
+    [stakingPositions, selectedValidatorAddress],
+  );
+
+  return {
+    options,
+    value,
+  };
+}

package/src/families/aptos/setup.ts

@@ -1,11 +1,6 @@
 // Goal of this file is to inject all necessary device/signer dependency to coin-modules
-
-import {
-  AptosAccount,
-  TransactionStatus,
-  createBridges,
-  type Transaction,
-} from "@ledgerhq/coin-aptos";
+import { createBridges } from "@ledgerhq/coin-aptos";
+import { AptosAccount, TransactionStatus, type Transaction } from "@ledgerhq/coin-aptos/types";
 import Transport from "@ledgerhq/hw-transport";
 import Aptos from "@ledgerhq/hw-app-aptos";
 import type { Bridge } from "@ledgerhq/types-live";

package/src/families/aptos/staking.ts

@@ -0,0 +1,2 @@
+// Encapsulate for LLD et LLM
+export * from "@ledgerhq/coin-aptos/logic/staking";

package/src/families/aptos/types.ts

@@ -0,0 +1,2 @@
+// Encapsulate for LLD and LLM
+export * from "@ledgerhq/coin-aptos/types";

package/src/families/aptos/utils.ts

@@ -0,0 +1,2 @@
+// Encapsulate for LLD and LLM
+export * from "@ledgerhq/coin-aptos/utils";

package/src/families/evm/walletApiAdapter.ts

@@ -48,7 +48,7 @@ const convertToLiveTransaction: ConvertToLiveTransaction<
 
   /**
    * We explicitly set unrelated type specific fields to undefined to avoid transaction
-   * type assertion errors during the `prepareTransaction` logic (libs/coin-evm/src/prepareTransaction.ts)
+   * type assertion errors during the `prepareTransaction` logic (libs/coin-modules/coin-evm/src/bridge/prepareTransaction.ts)
    * when performing an `updateTransaction` with a newly created tx
    * Which is what happen in this case (in apps/ledger-live-desktop/src/renderer/modals/SignTransaction/Body.tsx):
       // `createTransaction` will create a type 2 tx by default with `maxFeePerGas` and `maxPriorityFeePerGas` set to 0

package/src/featureFlags/defaultFeatures.ts

@@ -667,6 +667,7 @@ export const DEFAULT_FEATURES: Features = {
       vitalsUpdateFrequency: "AVERAGE",
     },
   },
+  llmSentry: { enabled: true },
 };
 
 // Firebase SDK treat JSON values as strings

package/src/generated/deviceTransactionConfig.ts

@@ -47,7 +47,6 @@ export default {
   xrp,
   mina,
 };
-import { ExtraDeviceTransactionField as ExtraDeviceTransactionField_aptos } from "@ledgerhq/coin-aptos/bridge/deviceTransactionConfig";
 import { ExtraDeviceTransactionField as ExtraDeviceTransactionField_casper } from "@ledgerhq/coin-casper/bridge/deviceTransactionConfig";
 import { ExtraDeviceTransactionField as ExtraDeviceTransactionField_filecoin } from "@ledgerhq/coin-filecoin/bridge/deviceTransactionConfig";
 import { ExtraDeviceTransactionField as ExtraDeviceTransactionField_stacks } from "@ledgerhq/coin-stacks/bridge/deviceTransactionConfig";
@@ -55,7 +54,6 @@ import { ExtraDeviceTransactionField as ExtraDeviceTransactionField_polkadot } f
 import { ExtraDeviceTransactionField as ExtraDeviceTransactionField_tron } from "@ledgerhq/coin-tron/bridge/deviceTransactionConfig";
 
 export type ExtraDeviceTransactionField =
-  | ExtraDeviceTransactionField_aptos
   | ExtraDeviceTransactionField_casper
   | ExtraDeviceTransactionField_filecoin
   | ExtraDeviceTransactionField_stacks

package/src/modularDrawer/utils/index.test.ts

@@ -0,0 +1,74 @@
+import { isCorrespondingCurrency, getEffectiveCurrency } from "./index";
+
+import { createFixtureCryptoCurrency } from "../../mock/fixtures/cryptoCurrencies";
+import { cryptocurrenciesById } from "@ledgerhq/cryptoassets";
+import type { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
+import type { CurrenciesByProviderId } from "../../deposit/type";
+
+describe("isCorrespondingCurrency", () => {
+  const evmCurrency = createFixtureCryptoCurrency("evm");
+  const usdcToken: CryptoOrTokenCurrency = {
+    type: "TokenCurrency",
+    id: "ethereum/erc20/usdc",
+    contractAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+    parentCurrency: evmCurrency,
+    tokenType: "erc20",
+    name: "USD Coin",
+    ticker: "USDC",
+    units: [{ name: "USD Coin", code: "USDC", magnitude: 6 }],
+  };
+  const evmCrypto: CryptoOrTokenCurrency = evmCurrency;
+
+  it("returns true for a token whose parentCurrency.id matches the reference crypto", () => {
+    expect(isCorrespondingCurrency(usdcToken, evmCurrency)).toBe(true);
+  });
+
+  it("returns true for a token whose id matches the reference crypto", () => {
+    expect(isCorrespondingCurrency(usdcToken, usdcToken)).toBe(true);
+  });
+
+  it("returns true for a crypto whose id matches the reference crypto", () => {
+    expect(isCorrespondingCurrency(evmCrypto, evmCurrency)).toBe(true);
+  });
+
+  it("returns false for a token whose parentCurrency is different", () => {
+    const bitcoinCurrency = cryptocurrenciesById["bitcoin"];
+    const tokenWithOtherParent = { ...usdcToken, parentCurrency: bitcoinCurrency };
+    expect(isCorrespondingCurrency(tokenWithOtherParent, evmCurrency)).toBe(false);
+  });
+
+  it("returns false for a crypto whose id is different", () => {
+    const bitcoinCurrency = cryptocurrenciesById["bitcoin"];
+    expect(isCorrespondingCurrency(bitcoinCurrency, evmCurrency)).toBe(false);
+  });
+});
+
+describe("getEffectiveCurrency", () => {
+  const parent = createFixtureCryptoCurrency("evm");
+  const token: CryptoOrTokenCurrency = {
+    type: "TokenCurrency",
+    id: "ethereum/erc20/usdc",
+    contractAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+    parentCurrency: parent,
+    tokenType: "erc20",
+    name: "USD Coin",
+    ticker: "USDC",
+    units: [{ name: "USD Coin", code: "USDC", magnitude: 6 }],
+  };
+  const provider: CurrenciesByProviderId = {
+    providerId: "provider1",
+    currenciesByNetwork: [parent, token],
+  };
+
+  it("returns currency if id is in currencyIds", () => {
+    expect(getEffectiveCurrency(token, provider, [token.id])).toBe(token);
+  });
+
+  it("returns first matching currency from provider if id not in currencyIds", () => {
+    expect(getEffectiveCurrency(token, provider, [parent.id])).toBe(parent);
+  });
+
+  it("returns currency if no match in provider", () => {
+    expect(getEffectiveCurrency(token, provider, ["notfound"])).toBe(token);
+  });
+});

package/src/modularDrawer/utils/index.ts

@@ -0,0 +1,29 @@
+import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { CurrenciesByProviderId } from "../../deposit/type";
+
+function isCorrespondingCurrency(
+  elem: CryptoOrTokenCurrency,
+  network: CryptoOrTokenCurrency,
+): boolean {
+  if (elem.type === "TokenCurrency") {
+    return elem.parentCurrency?.id === network.id || elem.id === network.id;
+  }
+  if (elem.type === "CryptoCurrency") {
+    return elem.id === network.id;
+  }
+  return false;
+}
+
+const getEffectiveCurrency = (
+  currency: CryptoOrTokenCurrency,
+  provider: CurrenciesByProviderId,
+  currencyIds: string[],
+) => {
+  const isCurrencyFiltered = currencyIds.includes(currency.id);
+
+  if (isCurrencyFiltered) return currency;
+
+  return provider.currenciesByNetwork.find(elem => currencyIds.includes(elem.id)) ?? currency;
+};
+
+export { isCorrespondingCurrency, getEffectiveCurrency };

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

@@ -423,8 +423,6 @@ export const handlers = ({
 
       // Step 1: Open the drawer and open exchange app
       const startExchange = async () => {
-        console.log("LLD   custom.exchange.swap uiExchangeStart", exchangeStartParams);
-
         return new Promise<{ transactionId: string; device?: ExchangeStartResult["device"] }>(
           (resolve, reject) => {
             uiExchangeStart({

package/lib/families/aptos/consts.d.ts

@@ -1,4 +0,0 @@
-export declare const APTOS_NON_HARDENED_DERIVATION_PATH_REGEX: RegExp;
-export declare const APTOS_NON_HARDENED_DERIVATION_PATH = "44'/637'/0'/0/0";
-export declare const APTOS_HARDENED_DERIVATION_PATH = "44'/637'/0'/0'/0'";
-//# sourceMappingURL=consts.d.ts.map

package/lib/families/aptos/consts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../../src/families/aptos/consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,wCAAwC,QAAyC,CAAC;AAC/F,eAAO,MAAM,kCAAkC,oBAAoB,CAAC;AACpE,eAAO,MAAM,8BAA8B,sBAAsB,CAAC"}