@ledgerhq/live-common 34.51.0 → 34.52.0-nightly.0

package/src/dada-client/hooks/useDrawerConfiguration.ts

@@ -0,0 +1,65 @@
+import { useCallback } from "react";
+import useFeature from "../../featureFlags/useFeature";
+
+interface DrawerConfiguration {
+  assets?: Record<string, unknown>;
+  networks?: Record<string, unknown>;
+}
+
+interface UseCaseConfig {
+  assets?: Record<string, unknown>;
+  networks?: Record<string, unknown>;
+}
+
+type UseCaseConfigs = Record<string, UseCaseConfig>;
+
+/**
+ * Hook that provides drawer configuration functionality with feature flag integration.
+ *
+ * @returns An object containing the createDrawerConfiguration function
+ */
+export function useDrawerConfiguration() {
+  const earnDrawerConfigurationFlag = useFeature("ptxEarnDrawerConfiguration");
+
+  const createDrawerConfiguration = useCallback(
+    (
+      drawerConfiguration: unknown,
+      useCase: string | undefined,
+      customUseCaseConfigs?: UseCaseConfigs,
+    ): DrawerConfiguration => {
+      const config: DrawerConfiguration | undefined = drawerConfiguration!;
+
+      // Default use case configs with earn configuration from feature flag
+      const earnAppDrawerConfig: UseCaseConfig =
+        earnDrawerConfigurationFlag?.enabled && earnDrawerConfigurationFlag.params
+          ? earnDrawerConfigurationFlag.params
+          : {};
+
+      const defaultUseCaseConfigs: UseCaseConfigs = {
+        earn: earnAppDrawerConfig,
+      };
+
+      // Merge with any custom use case configs provided
+      const useCaseConfigs = {
+        ...defaultUseCaseConfigs,
+        ...customUseCaseConfigs,
+      };
+
+      const useCaseConfig = useCase ? useCaseConfigs[useCase] : undefined;
+
+      return {
+        assets: {
+          ...useCaseConfig?.assets,
+          ...config?.assets,
+        },
+        networks: {
+          ...useCaseConfig?.networks,
+          ...config?.networks,
+        },
+      };
+    },
+    [earnDrawerConfigurationFlag],
+  );
+
+  return { createDrawerConfiguration };
+}

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/deposit/useGroupedCurrenciesByProvider.hook.ts

@@ -3,7 +3,7 @@ import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { useEffect, useMemo, useState } from "react";
 import { isCurrencySupported, listSupportedCurrencies, listTokens } from "../currencies";
 import { loadCurrenciesByProvider } from "./helper";
-import { useCurrenciesUnderFeatureFlag } from "../modularDrawer/hooks/useCurrenciesUnderFeatureFlag";
+import { useAcceptedCurrency } from "../modularDrawer/hooks/useAcceptedCurrency";
 
 // FIXME(LIVE-10505): bad performane & shared utility to move to coin-framework
 const listSupportedTokens = () => listTokens().filter(t => isCurrencySupported(t.parentCurrency));
@@ -17,16 +17,15 @@ export const useGroupedCurrenciesByProvider = (
   withLoading?: boolean,
 ): GroupedCurrencies | LoadingBasedGroupedCurrencies => {
   const [result, setResult] = useState(initialResult);
-  // the import is from MAD but as this hook will be removed, it's fine to keep it here
-  const { deactivatedCurrencyIds } = useCurrenciesUnderFeatureFlag();
+  const isAcceptedCurrency = useAcceptedCurrency();
 
   const [loadingStatus, setLoadingStatus] = useState<LoadingStatus>(LoadingStatus.Idle);
   const coinsAndTokensSupported = useMemo(
     () =>
       (listSupportedCurrencies() as CryptoOrTokenCurrency[])
         .concat(listSupportedTokens())
-        .filter(c => !deactivatedCurrencyIds.has(c.id)),
-    [deactivatedCurrencyIds],
+        .filter(isAcceptedCurrency),
+    [isAcceptedCurrency],
   );
 
   // Get mapped assets filtered by supported & sorted currencies, grouped by provider id

package/src/e2e/data/deviceLabelsData.ts

@@ -19,6 +19,14 @@ type LabelConfig = {
     [key: string]: string;
     default: string;
   };
+  sendVerify: {
+    [key: string]: string;
+    default: string;
+  };
+  sendConfirm: {
+    [key: string]: string;
+    default: string;
+  };
 };
 
 type DeviceLabelsConfig = {
@@ -57,6 +65,47 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.TEZOS.name]: DeviceLabels.ACCEPT_RISK,
       default: DeviceLabels.CAPS_APPROVE,
     },
+    sendVerify: {
+      default: DeviceLabels.REVIEW_OPERATION,
+    },
+    sendConfirm: {
+      [AppInfos.SOLANA.name]: DeviceLabels.SIGN_TRANSACTION,
+      [AppInfos.TRON.name]: DeviceLabels.SIGN,
+      [AppInfos.STELLAR.name]: DeviceLabels.SIGN,
+      [AppInfos.RIPPLE.name]: DeviceLabels.SIGN,
+      [AppInfos.APTOS.name]: DeviceLabels.APPROVE,
+      [AppInfos.SUI.name]: DeviceLabels.ACCEPT,
+      [AppInfos.BITCOIN.name]: DeviceLabels.CONTINUE,
+      default: DeviceLabels.CAPS_APPROVE,
+    },
+  },
+  [DeviceModelId.stax]: {
+    receiveVerify: {
+      [AppInfos.BNB_CHAIN.name]: DeviceLabels.VERIFY_BSC,
+      [AppInfos.COSMOS.name]: DeviceLabels.PLEASE_REVIEW,
+      [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,
+      default: DeviceLabels.ADDRESS,
+    },
+    receiveConfirm: {
+      default: DeviceLabels.CONFIRM,
+    },
+    delegateVerify: {
+      [AppInfos.NEAR.name]: DeviceLabels.VIEW_HEADER,
+      default: DeviceLabels.REVIEW_OPERATION,
+    },
+    delegateConfirm: {
+      [AppInfos.NEAR.name]: DeviceLabels.CONTINUE_TO_ACTION,
+      default: DeviceLabels.HOLD_TO_SIGN,
+    },
+    sendVerify: {
+      default: DeviceLabels.REVIEW_OPERATION,
+    },
+    sendConfirm: {
+      default: DeviceLabels.HOLD_TO_SIGN,
+    },
   },
   default: {
     receiveVerify: {
@@ -96,5 +145,22 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.OSMOSIS.name]: DeviceLabels.CAPS_APPROVE,
       default: DeviceLabels.APPROVE,
     },
+    sendVerify: {
+      [AppInfos.SOLANA.name]: DeviceLabels.TRANSFER,
+      [AppInfos.RIPPLE.name]: DeviceLabels.TRANSACTION_TYPE,
+      default: DeviceLabels.REVIEW_OPERATION,
+    },
+    sendConfirm: {
+      [AppInfos.SOLANA.name]: DeviceLabels.APPROVE,
+      [AppInfos.TRON.name]: DeviceLabels.SIGN,
+      [AppInfos.STELLAR.name]: DeviceLabels.SIGN,
+      [AppInfos.RIPPLE.name]: DeviceLabels.SIGN,
+      [AppInfos.APTOS.name]: DeviceLabels.APPROVE,
+      [AppInfos.SUI.name]: DeviceLabels.ACCEPT,
+      [AppInfos.BITCOIN.name]: DeviceLabels.SIGN_TRANSACTION,
+      [AppInfos.KASPA.name]: DeviceLabels.APPROVE,
+      [AppInfos.DOGECOIN.name]: DeviceLabels.ACCEPT,
+      default: DeviceLabels.CAPS_APPROVE,
+    },
   },
 };

package/src/e2e/deviceInteraction/ButtonDeviceSimulator.ts

@@ -0,0 +1,23 @@
+import { getEnv } from "@ledgerhq/live-env";
+import { getSpeculosAddress, retryAxiosRequest } from "../speculos";
+import axios from "axios";
+
+export async function pressBoth() {
+  const speculosApiPort = getEnv("SPECULOS_API_PORT");
+  const speculosAddress = getSpeculosAddress();
+  await retryAxiosRequest(() =>
+    axios.post(`${speculosAddress}:${speculosApiPort}/button/both`, {
+      action: "press-and-release",
+    }),
+  );
+}
+
+export async function pressRightButton(): Promise<void> {
+  const speculosApiPort = getEnv("SPECULOS_API_PORT");
+  const speculosAddress = getSpeculosAddress();
+  await retryAxiosRequest(() =>
+    axios.post(`${speculosAddress}:${speculosApiPort}/button/right`, {
+      action: "press-and-release",
+    }),
+  );
+}

package/src/e2e/deviceInteraction/TouchDeviceSimulator.ts

@@ -0,0 +1,52 @@
+import { retryAxiosRequest, getSpeculosAddress, getDeviceLabelCoordinates } from "../speculos";
+import axios from "axios";
+import { getEnv } from "@ledgerhq/live-env";
+
+function getSpeculosInfo(): {
+  speculosApiPort: number;
+  speculosAddress: string;
+} {
+  const speculosApiPort = getEnv("SPECULOS_API_PORT");
+  const speculosAddress = getSpeculosAddress();
+  return { speculosApiPort, speculosAddress };
+}
+export async function pressAndRelease(deviceLabel: string, x?: number, y?: number) {
+  const { speculosApiPort, speculosAddress } = getSpeculosInfo();
+  const { x: coordX, y: coordY } = await getDeviceLabelCoordinates(deviceLabel, speculosApiPort);
+  x = x === undefined ? coordX : x;
+  y = y === undefined ? coordY : y;
+  await retryAxiosRequest(() =>
+    axios.post(`${speculosAddress}:${speculosApiPort}/finger`, {
+      action: "press-and-release",
+      x: x,
+      y: y,
+    }),
+  );
+}
+
+export async function longPressAndRelease(deviceLabel: string, delay: number) {
+  const { speculosApiPort, speculosAddress } = getSpeculosInfo();
+  const deviceLabelCoordinates = await getDeviceLabelCoordinates(deviceLabel, speculosApiPort);
+  await retryAxiosRequest(() =>
+    axios.post(`${speculosAddress}:${speculosApiPort}/finger`, {
+      action: "press-and-release",
+      x: deviceLabelCoordinates.x,
+      y: deviceLabelCoordinates.y,
+      delay: delay,
+    }),
+  );
+}
+
+export async function swipeRight() {
+  const { speculosApiPort, speculosAddress } = getSpeculosInfo();
+  await retryAxiosRequest(() =>
+    axios.post(`${speculosAddress}:${speculosApiPort}/finger`, {
+      action: "press-and-release",
+      x: 100,
+      y: 100,
+      x2: 50,
+      y2: 100,
+      delay: 0.5,
+    }),
+  );
+}

package/src/e2e/enum/Account.ts

@@ -1,6 +1,5 @@
 import { Currency } from "./Currency";
 import { TokenType } from "./TokenType";
-import { Nft } from "./Nft";
 
 export class Account {
   constructor(
@@ -11,7 +10,6 @@ export class Account {
     public readonly tokenType?: TokenType,
     public readonly ensName?: string,
     public readonly derivationMode?: string,
-    public readonly nft?: Nft[],
     public readonly parentAccount?: Account,
   ) {}
 
@@ -246,7 +244,6 @@ export class Account {
     undefined,
     undefined,
     undefined,
-    [Nft.ANTITUS, Nft.PODIUM, Nft.NY_LA_MUSE],
   );
   // don't use this account as a recipient, it's balance
   // should stay close to null to allow for error message testing
@@ -361,7 +358,6 @@ export class Account {
     undefined,
     undefined,
     undefined,
-    [Nft.ANIME_SHIPS_494, Nft.BISHOP_OF_STORMS, Nft.COMMON_TOWER_MAP],
   );
   static readonly POL_2 = new Account(
     Currency.POL,
@@ -552,19 +548,8 @@ export class TokenAccount extends Account {
     parentAccount: Account,
     ensName?: string,
     derivationMode?: string,
-    nft?: Nft[],
   ) {
-    super(
-      currency,
-      accountName,
-      address,
-      index,
-      tokenType,
-      ensName,
-      derivationMode,
-      nft,
-      parentAccount,
-    );
+    super(currency, accountName, address, index, tokenType, ensName, derivationMode, parentAccount);
   }
 
   static readonly ETH_LIDO = new TokenAccount(

package/src/e2e/enum/Device.ts

@@ -1,7 +1,11 @@
 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);
+  static readonly STAX = new Device("stax", 857735172);
 }

package/src/e2e/enum/DeviceLabels.ts

@@ -12,6 +12,8 @@ export enum DeviceLabels {
   CONFIRM = "Confirm",
   CONNECT = "Connect",
   CONNECT_TO = "Connect to",
+  CONNECT_WITH = "Connect with",
+  CONNECT_WITH_LEDGER_SYNC = "Connect with Ledger Sync",
   CONTINUE = "Continue",
   CONTINUE_TO_ACTION = "Continue to actions",
   CONTRACT_DATA = "Contract data",
@@ -35,20 +37,22 @@ export enum DeviceLabels {
   REMOVE = "Remove",
   REMOVE_FROM_LEDGER_SYNC = "Remove from",
   REVIEW_OPERATION = "Review",
+  REMOVE_PHONE_OR_COMPUTER = "Remove phone or computer",
   REVIEW_TRANSACTION = "Review transaction",
   SEND = "Send",
   SEND_TO_ADDRESS = "Send to address",
   SEND_TO_ADDRESS_2 = "Send to address (2/2)",
   SETTINGS = "Settings",
+  SETTINGS_TOGGLE_1 = "Settings toggle 1",
   SIGN = "Sign",
   SIGN_TRANSACTION = "Sign transaction",
   STAKE_KEY = "Stake key",
   TO = "To",
   TRANSACTION_FEE = "Transaction fee",
   TRANSACTION_SIGNED = "Transaction Signed",
+  TRANSACTION_TYPE = "Transaction Type",
   TRANSFER = "Transfer",
   TURN_ON_SYNC = "Turn on sync",
-  TURN_ON_SYNC2 = "Turn On sync",
   TYPE_DELEGATE = "Type Delegate",
   VALUE = "Value",
   VERIFY_ADDRESS = "Verify address",
@@ -58,4 +62,8 @@ export enum DeviceLabels {
   VERIFY_SOLANA_ADDRESS = "Verify Solana address",
   VIEW_ACTION = "View action",
   VIEW_HEADER = "View Header",
+  HOLD_TO_SIGN = "Hold to sign",
+  CONFIRM_HEADER = "Confirm header",
+  CONFIRM_CHANGE = "Confirm change",
+  TAP_TO_CONTINUE = "Tap to continue",
 }

package/src/e2e/families/algorand.ts

@@ -1,14 +1,20 @@
 import expect from "expect";
 import { Transaction } from "../models/Transaction";
-import { pressBoth, pressUntilTextFound, containsSubstringInEvent } from "../speculos";
+import { containsSubstringInEvent, getSendEvents } from "../speculos";
+import { isTouchDevice } from "../speculosAppVersion";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
+import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
 
 export async function sendAlgorand(tx: Transaction) {
-  const events = await pressUntilTextFound(DeviceLabels.CAPS_APPROVE);
+  const events = await getSendEvents(tx);
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
   const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
   expect(isAddressCorrect).toBeTruthy();
-
-  await pressBoth();
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
 }

package/src/e2e/families/aptos.ts

@@ -1,11 +1,19 @@
 import expect from "expect";
-import { pressBoth, pressUntilTextFound, waitFor, containsSubstringInEvent } from "../speculos";
+import { Transaction } from "../models/Transaction";
+import { waitFor, pressUntilTextFound, containsSubstringInEvent, getSendEvents } from "../speculos";
+import { isTouchDevice } from "../speculosAppVersion";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Delegate } from "../models/Delegate";
+import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
 
-export async function sendAptos() {
-  await pressUntilTextFound(DeviceLabels.APPROVE);
-  await pressBoth();
+export async function sendAptos(tx: Transaction) {
+  await getSendEvents(tx);
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
 }
 
 export async function delegateAptos(delegatingAccount: Delegate) {

package/src/e2e/families/bitcoin.ts

@@ -1,46 +1,48 @@
 import expect from "expect";
 import { Transaction } from "../models/Transaction";
-import {
-  pressBoth,
-  pressUntilTextFound,
-  waitFor,
-  containsSubstringInEvent,
-  getSpeculosModel,
-} from "../speculos";
+import { waitFor, containsSubstringInEvent, pressUntilTextFound, getSendEvents } from "../speculos";
+import { getSpeculosModel, isTouchDevice } from "../speculosAppVersion";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
-import { Device } from "../enum/Device";
 import invariant from "invariant";
+import { DeviceModelId } from "@ledgerhq/types-devices";
+import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
 
 export async function sendBTCBasedCoin(tx: Transaction) {
-  const events = await pressUntilTextFound(DeviceLabels.ACCEPT);
+  const events = await getSendEvents(tx);
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
   const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
   expect(isAddressCorrect).toBeTruthy();
-  await pressBoth();
-  await waitFor(DeviceLabels.CONFIRM);
-  await pressUntilTextFound(DeviceLabels.ACCEPT);
-  await pressBoth();
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+    await waitFor(DeviceLabels.CONFIRM);
+    await pressUntilTextFound(DeviceLabels.ACCEPT);
+    await pressBoth();
+  }
 }
 
 export async function sendBTC(tx: Transaction) {
   const speculosDevice = getSpeculosModel();
   try {
-    const events =
-      speculosDevice === Device.LNS
-        ? await pressUntilTextFound(DeviceLabels.CONTINUE)
-        : await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
+    const events = await getSendEvents(tx);
     const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
     expect(isAmountCorrect).toBeTruthy();
     const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
     expect(isAddressCorrect).toBeTruthy();
-    await pressBoth();
-    if (speculosDevice === Device.LNS) {
-      await pressUntilTextFound(DeviceLabels.SIGN);
-      await pressBoth();
-      await waitFor(DeviceLabels.BITCOIN_IS_READY);
+    if (speculosDevice === DeviceModelId.stax) {
+      await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
     } else {
-      await waitFor(DeviceLabels.TRANSACTION_SIGNED);
+      await pressBoth();
+      if (speculosDevice === DeviceModelId.nanoS) {
+        await pressUntilTextFound(DeviceLabels.SIGN);
+        await pressBoth();
+        await waitFor(DeviceLabels.BITCOIN_IS_READY);
+      } else {
+        await waitFor(DeviceLabels.TRANSACTION_SIGNED);
+      }
     }
   } catch (e) {
     invariant(false, `Error while sending BTC transaction: ${e}`);