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

package/src/e2e/families/hedera.ts

@@ -1,5 +1,6 @@
-import { pressBoth, pressUntilTextFound } from "../speculos";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
+import { pressUntilTextFound } from "../speculos";
 
 export async function sendHedera() {
   await pressUntilTextFound(DeviceLabels.APPROVE);

package/src/e2e/families/kaspa.ts

@@ -1,11 +1,19 @@
 import expect from "expect";
-import { pressBoth, pressUntilTextFound, waitFor, containsSubstringInEvent } from "../speculos";
+import { waitFor, containsSubstringInEvent, pressUntilTextFound, 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";
+import { Transaction } from "../models/Transaction";
 
-export async function sendKaspa() {
-  await pressUntilTextFound(DeviceLabels.APPROVE);
-  await pressBoth();
+export async function sendKaspa(tx: Transaction) {
+  await getSendEvents(tx);
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
 }
 
 export async function delegateKaspa(delegatingAccount: Delegate) {

package/src/e2e/families/multiversX.ts

@@ -1,7 +1,16 @@
-import { getDelegateEvents, pressBoth } from "../speculos";
+import { getDelegateEvents, pressUntilTextFound } from "../speculos";
 import { Delegate } from "../models/Delegate";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
+import { DeviceLabels } from "../enum/DeviceLabels";
+import { isTouchDevice } from "../speculosAppVersion";
+import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
 
 export async function delegateMultiversX(delegatingAccount: Delegate) {
   await getDelegateEvents(delegatingAccount);
-  await pressBoth();
+  if (isTouchDevice()) {
+    await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
 }

package/src/e2e/families/near.ts

@@ -1,20 +1,29 @@
 import expect from "expect";
 import { Delegate } from "../models/Delegate";
 import {
-  pressBoth,
-  pressUntilTextFound,
   waitFor,
   containsSubstringInEvent,
   getDelegateEvents,
+  pressUntilTextFound,
 } from "../speculos";
+import { isTouchDevice } from "../speculosAppVersion";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
+import { longPressAndRelease, pressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
 
 export async function delegateNear(delegatingAccount: Delegate) {
   const events = await getDelegateEvents(delegatingAccount);
   const isProviderCorrect = containsSubstringInEvent(delegatingAccount.provider, events);
   expect(isProviderCorrect).toBeTruthy();
-  await pressBoth();
-  await waitFor(DeviceLabels.VIEW_ACTION);
-  await pressUntilTextFound(DeviceLabels.SIGN);
-  await pressBoth();
+  if (isTouchDevice()) {
+    await pressAndRelease(DeviceLabels.CONFIRM_HEADER);
+    await waitFor(DeviceLabels.VIEW_ACTION);
+    await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+    await waitFor(DeviceLabels.VIEW_ACTION);
+    await pressUntilTextFound(DeviceLabels.SIGN);
+    await pressBoth();
+  }
 }

package/src/e2e/families/osmosis.ts

@@ -1,11 +1,20 @@
 import { Delegate } from "../models/Delegate";
-import { containsSubstringInEvent, getDelegateEvents, pressBoth } from "../speculos";
+import { pressUntilTextFound, containsSubstringInEvent, getDelegateEvents } from "../speculos";
+import { isTouchDevice } from "../speculosAppVersion";
 import expect from "expect";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
+import { DeviceLabels } from "../enum/DeviceLabels";
+import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
 
 export async function delegateOsmosis(delegatingAccount: Delegate) {
   const events = await getDelegateEvents(delegatingAccount);
   const amountInUosmo = (Number(delegatingAccount.amount) * 1_000_000).toString();
   const isAmountCorrect = containsSubstringInEvent(amountInUosmo, events);
   expect(isAmountCorrect).toBeTruthy();
-  await pressBoth();
+  if (isTouchDevice()) {
+    await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
 }

package/src/e2e/families/polkadot.ts

@@ -1,14 +1,21 @@
 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 sendPolkadot(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/solana.ts

@@ -1,30 +1,27 @@
 import expect from "expect";
-import {
-  pressBoth,
-  pressUntilTextFound,
-  containsSubstringInEvent,
-  getDelegateEvents,
-  getSpeculosModel,
-} from "../speculos";
+import { containsSubstringInEvent, getDelegateEvents, getSendEvents } from "../speculos";
+import { isTouchDevice } from "../speculosAppVersion";
+import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 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);
-  await pressBoth();
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
 }
 
 export async function sendSolana(tx: Transaction) {
-  const events =
-    getSpeculosModel() !== DeviceModelId.nanoS
-      ? await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION)
-      : await pressUntilTextFound(DeviceLabels.APPROVE);
+  const events = await getSendEvents(tx);
   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,
@@ -32,5 +29,9 @@ export async function sendSolana(tx: Transaction) {
     expect(isAddressCorrect).toBeTruthy();
   }
 
-  await pressBoth();
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
 }

package/src/e2e/families/stellar.ts

@@ -1,15 +1,22 @@
 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 sendStellar(tx: Transaction) {
-  const events = await pressUntilTextFound(DeviceLabels.SIGN);
+  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/sui.ts

@@ -1,7 +1,15 @@
-import { pressBoth, pressUntilTextFound } from "../speculos";
+import { getSendEvents } from "../speculos";
+import { isTouchDevice } from "../speculosAppVersion";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
+import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
+import { Transaction } from "../models/Transaction";
 
-export async function sendSui() {
-  await pressUntilTextFound(DeviceLabels.ACCEPT);
-  await pressBoth();
+export async function sendSui(tx: Transaction) {
+  await getSendEvents(tx);
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
 }

package/src/e2e/families/tezos.ts

@@ -1,20 +1,23 @@
-import {
-  getDelegateEvents,
-  getDeviceLabels,
-  getSpeculosModel,
-  pressBoth,
-  pressUntilTextFound,
-} from "../speculos";
+import { getDelegateEvents, getDeviceLabels, pressUntilTextFound } from "../speculos";
+import { isTouchDevice } from "../speculosAppVersion";
 import { Delegate } from "../models/Delegate";
 import { DeviceModelId } from "@ledgerhq/types-devices";
 import { DeviceLabels } from "../enum/DeviceLabels";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
+import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
+import { getSpeculosModel } from "../speculosAppVersion";
 
 export async function delegateTezos(delegatingAccount: Delegate) {
   const { delegateConfirmLabel } = getDeviceLabels(delegatingAccount.account.currency.speculosApp);
 
   await getDelegateEvents(delegatingAccount);
   await pressUntilTextFound(delegateConfirmLabel);
-  await pressBoth();
+  if (isTouchDevice()) {
+    await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
 
   if (getSpeculosModel() == DeviceModelId.nanoS) {
     await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND);

package/src/e2e/families/tron.ts

@@ -1,14 +1,21 @@
 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 sendTron(tx: Transaction) {
-  const events = await pressUntilTextFound(DeviceLabels.SIGN);
+  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/xrp.ts

@@ -1,14 +1,21 @@
 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 sendXRP(tx: Transaction) {
-  const events = await pressUntilTextFound(DeviceLabels.SIGN);
+  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/models/Transaction.ts

@@ -1,6 +1,5 @@
 import { Fee } from "../enum/Fee";
 import { AccountType } from "../enum/Account";
-import { Nft } from "../enum/Nft";
 
 export type TransactionType = Transaction;
 
@@ -13,15 +12,3 @@ export class Transaction {
     public memoTag?: string,
   ) {}
 }
-
-export class NFTTransaction extends Transaction {
-  constructor(
-    accountToDebit: AccountType,
-    accountToCredit: AccountType,
-    public nft: Nft,
-    speed?: Fee,
-    memoTag?: string,
-  ) {
-    super(accountToDebit, accountToCredit, "0", speed, memoTag);
-  }
-}