@ledgerhq/live-common 34.53.0-nightly.20251120023735 → 34.53.0

package/src/e2e/families/cosmos.ts

@@ -2,44 +2,32 @@ import expect from "expect";
 import { Delegate } from "../models/Delegate";
 import { Transaction } from "../models/Transaction";
 import { containsSubstringInEvent, getDelegateEvents, getSendEvents } from "../speculos";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { isTouchDevice } from "../speculosAppVersion";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
 
-export const delegateCosmos = withDeviceController(
-  ({ getButtonsController }) =>
-    async (delegatingAccount: Delegate) => {
-      const buttons = getButtonsController();
+export async function delegateCosmos(delegatingAccount: Delegate) {
+  const events = await getDelegateEvents(delegatingAccount);
+  const isAmountCorrect = containsSubstringInEvent(delegatingAccount.amount, events);
+  expect(isAmountCorrect).toBeTruthy();
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
+}
 
-      const events = await getDelegateEvents(delegatingAccount);
-      const isAmountCorrect = containsSubstringInEvent(delegatingAccount.amount, events);
-      expect(isAmountCorrect).toBeTruthy();
+export async function sendCosmos(tx: 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();
 
-      if (isTouchDevice()) {
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
-
-export const sendCosmos = withDeviceController(
-  ({ getButtonsController }) =>
-    async (tx: Transaction) => {
-      const buttons = getButtonsController();
-
-      const events = await getSendEvents(tx);
-      const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
-      expect(isAmountCorrect).toBeTruthy();
-
-      const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
-      expect(isAddressCorrect).toBeTruthy();
-
-      if (isTouchDevice()) {
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
+}

package/src/e2e/families/evm.ts

@@ -1,17 +1,17 @@
 import expect from "expect";
 import { Transaction } from "../models/Transaction";
 import { containsSubstringInEvent, pressUntilTextFound } from "../speculos";
-import { getSpeculosModel, isTouchDevice } from "../speculosAppVersion";
+import { getSpeculosModel } from "../speculosAppVersion";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import { DeviceModelId } from "@ledgerhq/types-devices";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
+import { isTouchDevice } from "../speculosAppVersion";
 
 function validateTransactionData(tx: Transaction, events: string[]) {
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
-
   if (tx.accountToCredit.ensName && process.env.SPECULOS_DEVICE !== Device.LNS.name) {
     const isENSNameCorrect = containsSubstringInEvent(tx.accountToCredit.ensName, events);
     expect(isENSNameCorrect).toBeTruthy();
@@ -27,31 +27,20 @@ async function sendEvmTouchDevices(tx: Transaction) {
   await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
 }
 
-export const sendEvmButtonDevice = withDeviceController(
-  ({ getButtonsController }) =>
-    async (tx: Transaction) => {
-      const buttons = getButtonsController();
-
-      const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
-      validateTransactionData(tx, events);
-      await buttons.both();
-    },
-);
-
-export const sendEvmNanoS = withDeviceController(
-  ({ getButtonsController }) =>
-    async (tx: Transaction) => {
-      const buttons = getButtonsController();
+async function sendEvmButtonDevice(tx: Transaction) {
+  const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
+  validateTransactionData(tx, events);
+  await pressBoth();
+}
 
-      const events = await pressUntilTextFound(DeviceLabels.ACCEPT);
-      validateTransactionData(tx, events);
-      await buttons.both();
-    },
-);
+async function sendEvmNanoS(tx: Transaction) {
+  const events = await pressUntilTextFound(DeviceLabels.ACCEPT);
+  validateTransactionData(tx, events);
+  await pressBoth();
+}
 
 export async function sendEVM(tx: Transaction) {
   const speculosModel = getSpeculosModel();
-
   if (isTouchDevice()) {
     return sendEvmTouchDevices(tx);
   }

package/src/e2e/families/hedera.ts

@@ -1,10 +1,8 @@
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { pressUntilTextFound } from "../speculos";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
-
-export const sendHedera = withDeviceController(({ getButtonsController }) => async () => {
-  const buttons = getButtonsController();
 
+export async function sendHedera() {
   await pressUntilTextFound(DeviceLabels.APPROVE);
-  await buttons.both();
-});
+  await pressBoth();
+}

package/src/e2e/families/kaspa.ts

@@ -1,37 +1,25 @@
 import expect from "expect";
 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";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
 
-export const sendKaspa = withDeviceController(
-  ({ getButtonsController }) =>
-    async (tx: Transaction) => {
-      const buttons = getButtonsController();
+export async function sendKaspa(tx: Transaction) {
+  await getSendEvents(tx);
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
+}
 
-      await getSendEvents(tx);
-
-      if (isTouchDevice()) {
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
-
-export const delegateKaspa = withDeviceController(
-  ({ getButtonsController }) =>
-    async (delegatingAccount: Delegate) => {
-      const buttons = getButtonsController();
-
-      await waitFor(DeviceLabels.REVIEW_OPERATION);
-      const events = await pressUntilTextFound(DeviceLabels.APPROVE);
-      const isAmountCorrect = containsSubstringInEvent(delegatingAccount.amount, events);
-      expect(isAmountCorrect).toBeTruthy();
-
-      await buttons.both();
-    },
-);
+export async function delegateKaspa(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/multiversX.ts

@@ -1,22 +1,16 @@
 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";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
 
-export const delegateMultiversX = withDeviceController(
-  ({ getButtonsController }) =>
-    async (delegatingAccount: Delegate) => {
-      const buttons = getButtonsController();
-
-      await getDelegateEvents(delegatingAccount);
-
-      if (isTouchDevice()) {
-        await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
+export async function delegateMultiversX(delegatingAccount: Delegate) {
+  await getDelegateEvents(delegatingAccount);
+  if (isTouchDevice()) {
+    await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
+}

package/src/e2e/families/near.ts

@@ -7,29 +7,23 @@ import {
   pressUntilTextFound,
 } from "../speculos";
 import { isTouchDevice } from "../speculosAppVersion";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { longPressAndRelease, pressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
 
-export const delegateNear = withDeviceController(
-  ({ getButtonsController }) =>
-    async (delegatingAccount: Delegate) => {
-      const buttons = getButtonsController();
-
-      const events = await getDelegateEvents(delegatingAccount);
-      const isProviderCorrect = containsSubstringInEvent(delegatingAccount.provider, events);
-      expect(isProviderCorrect).toBeTruthy();
-
-      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 buttons.both();
-        await waitFor(DeviceLabels.VIEW_ACTION);
-        await pressUntilTextFound(DeviceLabels.SIGN);
-        await buttons.both();
-      }
-    },
-);
+export async function delegateNear(delegatingAccount: Delegate) {
+  const events = await getDelegateEvents(delegatingAccount);
+  const isProviderCorrect = containsSubstringInEvent(delegatingAccount.provider, events);
+  expect(isProviderCorrect).toBeTruthy();
+  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

@@ -2,25 +2,19 @@ import { Delegate } from "../models/Delegate";
 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";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
 
-export const delegateOsmosis = withDeviceController(
-  ({ getButtonsController }) =>
-    async (delegatingAccount: Delegate) => {
-      const buttons = getButtonsController();
-
-      const events = await getDelegateEvents(delegatingAccount);
-      const amountInUosmo = (Number(delegatingAccount.amount) * 1_000_000).toString();
-      const isAmountCorrect = containsSubstringInEvent(amountInUosmo, events);
-      expect(isAmountCorrect).toBeTruthy();
-
-      if (isTouchDevice()) {
-        await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
+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();
+  if (isTouchDevice()) {
+    await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
+}

package/src/e2e/families/polkadot.ts

@@ -2,26 +2,20 @@ import expect from "expect";
 import { Transaction } from "../models/Transaction";
 import { containsSubstringInEvent, getSendEvents } from "../speculos";
 import { isTouchDevice } from "../speculosAppVersion";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
 
-export const sendPolkadot = withDeviceController(
-  ({ getButtonsController }) =>
-    async (tx: Transaction) => {
-      const buttons = getButtonsController();
+export async function sendPolkadot(tx: 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();
 
-      const events = await getSendEvents(tx);
-      const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
-      expect(isAmountCorrect).toBeTruthy();
-
-      const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
-      expect(isAddressCorrect).toBeTruthy();
-
-      if (isTouchDevice()) {
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
+}

package/src/e2e/families/solana.ts

@@ -2,45 +2,33 @@ import expect from "expect";
 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 { withDeviceController } from "../deviceInteraction/DeviceController";
 
-export const delegateSolana = withDeviceController(
-  ({ getButtonsController }) =>
-    async (delegatingAccount: Delegate) => {
-      const buttons = getButtonsController();
+export async function delegateSolana(delegatingAccount: Delegate) {
+  await getDelegateEvents(delegatingAccount);
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
+}
 
-      await getDelegateEvents(delegatingAccount);
+export async function sendSolana(tx: Transaction) {
+  const events = await getSendEvents(tx);
+  const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
+  expect(isAmountCorrect).toBeTruthy();
+  if (process.env.SPECULOS_DEVICE !== Device.LNS.name) {
+    const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
+    expect(isAddressCorrect).toBeTruthy();
+  }
 
-      if (isTouchDevice()) {
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
-
-export const sendSolana = withDeviceController(
-  ({ getButtonsController }) =>
-    async (tx: Transaction) => {
-      const buttons = getButtonsController();
-
-      const events = await getSendEvents(tx);
-      const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
-      expect(isAmountCorrect).toBeTruthy();
-
-      if (process.env.SPECULOS_DEVICE !== Device.LNS.name) {
-        const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
-        expect(isAddressCorrect).toBeTruthy();
-      }
-
-      if (isTouchDevice()) {
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
+}

package/src/e2e/families/stellar.ts

@@ -2,26 +2,21 @@ import expect from "expect";
 import { Transaction } from "../models/Transaction";
 import { containsSubstringInEvent, getSendEvents } from "../speculos";
 import { isTouchDevice } from "../speculosAppVersion";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
 
-export const sendStellar = withDeviceController(
-  ({ getButtonsController }) =>
-    async (tx: Transaction) => {
-      const buttons = getButtonsController();
+export async function sendStellar(tx: Transaction) {
+  const events = await getSendEvents(tx);
+  const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
+  expect(isAmountCorrect).toBeTruthy();
 
-      const events = await getSendEvents(tx);
-      const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
-      expect(isAmountCorrect).toBeTruthy();
+  const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
+  expect(isAddressCorrect).toBeTruthy();
 
-      const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
-      expect(isAddressCorrect).toBeTruthy();
-
-      if (isTouchDevice()) {
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
+}

package/src/e2e/families/sui.ts

@@ -1,21 +1,15 @@
 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";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
 
-export const sendSui = withDeviceController(
-  ({ getButtonsController }) =>
-    async (tx: Transaction) => {
-      const buttons = getButtonsController();
-
-      await getSendEvents(tx);
-
-      if (isTouchDevice()) {
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
+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,33 +1,26 @@
 import { getDelegateEvents, getDeviceLabels, pressUntilTextFound } from "../speculos";
-import { isTouchDevice, getSpeculosModel } from "../speculosAppVersion";
+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 { withDeviceController } from "../deviceInteraction/DeviceController";
+import { getSpeculosModel } from "../speculosAppVersion";
 
-export const delegateTezos = withDeviceController(
-  ({ getButtonsController }) =>
-    async (delegatingAccount: Delegate) => {
-      const buttons = getButtonsController();
+export async function delegateTezos(delegatingAccount: Delegate) {
+  const { delegateConfirmLabel } = getDeviceLabels(delegatingAccount.account.currency.speculosApp);
 
-      const { delegateConfirmLabel } = getDeviceLabels(
-        delegatingAccount.account.currency.speculosApp,
-      );
+  await getDelegateEvents(delegatingAccount);
+  await pressUntilTextFound(delegateConfirmLabel);
+  if (isTouchDevice()) {
+    await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
 
-      await getDelegateEvents(delegatingAccount);
-      await pressUntilTextFound(delegateConfirmLabel);
-
-      if (isTouchDevice()) {
-        await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-
-      if (getSpeculosModel() === DeviceModelId.nanoS) {
-        await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND);
-        await buttons.both();
-      }
-    },
-);
+  if (getSpeculosModel() == DeviceModelId.nanoS) {
+    await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND);
+    await pressBoth();
+  }
+}

package/src/e2e/families/tron.ts

@@ -2,26 +2,20 @@ import expect from "expect";
 import { Transaction } from "../models/Transaction";
 import { containsSubstringInEvent, getSendEvents } from "../speculos";
 import { isTouchDevice } from "../speculosAppVersion";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
 
-export const sendTron = withDeviceController(
-  ({ getButtonsController }) =>
-    async (tx: Transaction) => {
-      const buttons = getButtonsController();
+export async function sendTron(tx: 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();
 
-      const events = await getSendEvents(tx);
-      const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
-      expect(isAmountCorrect).toBeTruthy();
-
-      const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
-      expect(isAddressCorrect).toBeTruthy();
-
-      if (isTouchDevice()) {
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
+}

package/src/e2e/families/xrp.ts

@@ -2,26 +2,20 @@ import expect from "expect";
 import { Transaction } from "../models/Transaction";
 import { containsSubstringInEvent, getSendEvents } from "../speculos";
 import { isTouchDevice } from "../speculosAppVersion";
+import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-import { withDeviceController } from "../deviceInteraction/DeviceController";
 
-export const sendXRP = withDeviceController(
-  ({ getButtonsController }) =>
-    async (tx: Transaction) => {
-      const buttons = getButtonsController();
+export async function sendXRP(tx: 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();
 
-      const events = await getSendEvents(tx);
-      const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
-      expect(isAmountCorrect).toBeTruthy();
-
-      const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
-      expect(isAddressCorrect).toBeTruthy();
-
-      if (isTouchDevice()) {
-        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-      } else {
-        await buttons.both();
-      }
-    },
-);
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
+}