@ledgerhq/live-common 34.53.0-nightly.20251119110540 → 34.53.0-nightly.20251120135143

package/src/e2e/families/solana.ts

@@ -2,33 +2,45 @@ 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 async function delegateSolana(delegatingAccount: Delegate) {
-  await getDelegateEvents(delegatingAccount);
-  if (isTouchDevice()) {
-    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-  } else {
-    await pressBoth();
-  }
-}
+export const delegateSolana = withDeviceController(
+  ({ getButtonsController }) =>
+    async (delegatingAccount: Delegate) => {
+      const buttons = getButtonsController();
 
-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();
-  }
+      await getDelegateEvents(delegatingAccount);
 
-  if (isTouchDevice()) {
-    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-  } else {
-    await pressBoth();
-  }
-}
+      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();
+      }
+    },
+);

package/src/e2e/families/stellar.ts

@@ -2,21 +2,26 @@ 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 async function sendStellar(tx: Transaction) {
-  const events = await getSendEvents(tx);
-  const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
-  expect(isAmountCorrect).toBeTruthy();
+export const sendStellar = withDeviceController(
+  ({ getButtonsController }) =>
+    async (tx: Transaction) => {
+      const buttons = getButtonsController();
 
-  const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
-  expect(isAddressCorrect).toBeTruthy();
+      const events = await getSendEvents(tx);
+      const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
+      expect(isAmountCorrect).toBeTruthy();
 
-  if (isTouchDevice()) {
-    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-  } else {
-    await pressBoth();
-  }
-}
+      const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
+      expect(isAddressCorrect).toBeTruthy();
+
+      if (isTouchDevice()) {
+        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+      } else {
+        await buttons.both();
+      }
+    },
+);

package/src/e2e/families/sui.ts

@@ -1,15 +1,21 @@
 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 async function sendSui(tx: Transaction) {
-  await getSendEvents(tx);
-  if (isTouchDevice()) {
-    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-  } else {
-    await pressBoth();
-  }
-}
+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();
+      }
+    },
+);

package/src/e2e/families/tezos.ts

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

package/src/e2e/families/tron.ts

@@ -2,20 +2,26 @@ 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 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();
+export const sendTron = withDeviceController(
+  ({ getButtonsController }) =>
+    async (tx: Transaction) => {
+      const buttons = getButtonsController();
 
-  if (isTouchDevice()) {
-    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-  } else {
-    await pressBoth();
-  }
-}
+      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();
+      }
+    },
+);

package/src/e2e/families/xrp.ts

@@ -2,20 +2,26 @@ 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 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();
+export const sendXRP = withDeviceController(
+  ({ getButtonsController }) =>
+    async (tx: Transaction) => {
+      const buttons = getButtonsController();
 
-  if (isTouchDevice()) {
-    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-  } else {
-    await pressBoth();
-  }
-}
+      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();
+      }
+    },
+);

package/src/e2e/speculos.ts

@@ -48,7 +48,7 @@ import {
   longPressAndRelease,
   swipeRight,
 } from "./deviceInteraction/TouchDeviceSimulator";
-import { pressBoth, pressRightButton } from "./deviceInteraction/ButtonDeviceSimulator";
+import { withDeviceController } from "./deviceInteraction/DeviceController";
 
 const isSpeculosRemote = process.env.REMOTE_SPECULOS === "true";
 
@@ -555,32 +555,35 @@ export async function fetchAllEvents(speculosApiPort: number): Promise<string[]>
   return response.data.events.map(event => event.text);
 }
 
-export async function pressUntilTextFound(
-  targetText: string,
-  strictMatch: boolean = false,
-): Promise<string[]> {
-  const maxAttempts = 18;
-  const speculosApiPort = getEnv("SPECULOS_API_PORT");
-
-  for (let attempts = 0; attempts < maxAttempts; attempts++) {
-    const texts = await fetchCurrentScreenTexts(speculosApiPort);
-    if (
-      strictMatch ? texts === targetText : texts.toLowerCase().includes(targetText.toLowerCase())
-    ) {
-      return await fetchAllEvents(speculosApiPort);
-    }
-    if (isTouchDevice()) {
-      await swipeRight();
-    } else {
-      await pressRightButton();
-    }
-    await waitForTimeOut(200);
-  }
+export const pressUntilTextFound = withDeviceController(
+  ({ getButtonsController }) =>
+    async (targetText: string, strictMatch: boolean = false): Promise<string[]> => {
+      const maxAttempts = 18;
+      const speculosApiPort = getEnv("SPECULOS_API_PORT");
+      const buttons = getButtonsController();
+
+      for (let attempts = 0; attempts < maxAttempts; attempts++) {
+        const texts = await fetchCurrentScreenTexts(speculosApiPort);
+        if (
+          strictMatch
+            ? texts === targetText
+            : texts.toLowerCase().includes(targetText.toLowerCase())
+        ) {
+          return await fetchAllEvents(speculosApiPort);
+        }
+        if (isTouchDevice()) {
+          await swipeRight();
+        } else {
+          await buttons.right();
+        }
+        await waitForTimeOut(200);
+      }
 
-  throw new Error(
-    `ElementNotFoundException: Element with text "${targetText}" not found on speculos screen`,
-  );
-}
+      throw new Error(
+        `ElementNotFoundException: Element with text "${targetText}" not found on speculos screen`,
+      );
+    },
+);
 
 export function containsSubstringInEvent(targetString: string, events: string[]): boolean {
   const concatenatedEvents = events.join("");
@@ -615,38 +618,45 @@ export async function waitForTimeOut(ms: number) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-export async function removeMemberLedgerSync() {
-  await waitFor(DeviceLabels.CONNECT_WITH);
-  if (isTouchDevice()) {
-    await pressAndRelease(DeviceLabels.CONNECT);
-    await waitFor(DeviceLabels.REMOVE_FROM_LEDGER_SYNC);
-    await pressAndRelease(DeviceLabels.REMOVE);
-    await waitFor(DeviceLabels.CONFIRM_CHANGE);
-    await pressAndRelease(DeviceLabels.TAP_TO_CONTINUE);
-    await waitFor(DeviceLabels.TURN_ON_SYNC);
-    await pressUntilTextFound(DeviceLabels.LEDGER_LIVE_WILL_BE);
-    await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC);
-    await pressAndRelease(DeviceLabels.TURN_ON_SYNC);
-  } else {
-    await pressUntilTextFound(DeviceLabels.CONNECT_WITH_LEDGER_SYNC, true);
-    await pressBoth();
-    await waitFor(DeviceLabels.REMOVE_PHONE_OR_COMPUTER);
-    await pressUntilTextFound(DeviceLabels.REMOVE_PHONE_OR_COMPUTER, true);
-    await pressBoth();
-    await waitFor(DeviceLabels.TURN_ON_SYNC);
-    await pressUntilTextFound(DeviceLabels.LEDGER_LIVE_WILL_BE);
-    await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC);
-    await pressBoth();
-  }
-}
+export const removeMemberLedgerSync = withDeviceController(
+  ({ getButtonsController }) =>
+    async () => {
+      const buttons = getButtonsController();
+      await waitFor(DeviceLabels.CONNECT_WITH);
+
+      if (isTouchDevice()) {
+        await pressAndRelease(DeviceLabels.CONNECT);
+        await waitFor(DeviceLabels.REMOVE_FROM_LEDGER_SYNC);
+        await pressAndRelease(DeviceLabels.REMOVE);
+        await waitFor(DeviceLabels.CONFIRM_CHANGE);
+        await pressAndRelease(DeviceLabels.TAP_TO_CONTINUE);
+        await waitFor(DeviceLabels.TURN_ON_SYNC);
+        await pressUntilTextFound(DeviceLabels.LEDGER_LIVE_WILL_BE);
+        await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC);
+        await pressAndRelease(DeviceLabels.TURN_ON_SYNC);
+      } else {
+        await pressUntilTextFound(DeviceLabels.CONNECT_WITH_LEDGER_SYNC, true);
+        await buttons.both();
+        await waitFor(DeviceLabels.REMOVE_PHONE_OR_COMPUTER);
+        await pressUntilTextFound(DeviceLabels.REMOVE_PHONE_OR_COMPUTER, true);
+        await buttons.both();
+        await waitFor(DeviceLabels.TURN_ON_SYNC);
+        await pressUntilTextFound(DeviceLabels.LEDGER_LIVE_WILL_BE);
+        await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC);
+        await buttons.both();
+      }
+    },
+);
 
-export async function activateLedgerSync() {
+export const activateLedgerSync = withDeviceController(({ getButtonsController }) => async () => {
+  const buttons = getButtonsController();
   await waitFor(DeviceLabels.CONNECT_WITH);
+
   if (isTouchDevice()) {
     await pressAndRelease(DeviceLabels.CONNECT_WITH_LEDGER_SYNC);
   } else {
     await pressUntilTextFound(DeviceLabels.CONNECT_WITH_LEDGER_SYNC, true);
-    await pressBoth();
+    await buttons.both();
   }
   await waitFor(DeviceLabels.TURN_ON_SYNC);
   if (isTouchDevice()) {
@@ -654,11 +664,13 @@ export async function activateLedgerSync() {
   } else {
     await pressUntilTextFound(DeviceLabels.LEDGER_LIVE_WILL_BE);
     await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC);
-    await pressBoth();
+    await buttons.both();
   }
-}
+});
+
+export const activateExpertMode = withDeviceController(({ getButtonsController }) => async () => {
+  const buttons = getButtonsController();
 
-export async function activateExpertMode() {
   if (isTouchDevice()) {
     await goToSettings();
     const SettingsToggle1Coordinates = { x: 344, y: 136 };
@@ -669,18 +681,22 @@ export async function activateExpertMode() {
     );
   } else {
     await pressUntilTextFound(DeviceLabels.EXPERT_MODE);
-    await pressBoth();
+    await buttons.both();
   }
-}
+});
+
+export const activateContractData = withDeviceController(({ getButtonsController }) => async () => {
+  const buttons = getButtonsController();
 
-export async function activateContractData() {
   await pressUntilTextFound(DeviceLabels.SETTINGS);
-  await pressBoth();
+  await buttons.both();
   await waitFor(DeviceLabels.CONTRACT_DATA);
-  await pressBoth();
-}
+  await buttons.both();
+});
+
+export const goToSettings = withDeviceController(({ getButtonsController }) => async () => {
+  const buttons = getButtonsController();
 
-export async function goToSettings() {
   if (isTouchDevice()) {
     const SettingsCogwheelCoordinates = { x: 400, y: 75 };
     await pressAndRelease(
@@ -690,13 +706,14 @@ export async function goToSettings() {
     );
   } else {
     await pressUntilTextFound(DeviceLabels.SETTINGS);
-    await pressBoth();
+    await buttons.both();
   }
-}
+});
 
-export async function providePublicKey() {
-  await pressRightButton();
-}
+export const providePublicKey = withDeviceController(({ getButtonsController }) => async () => {
+  const buttons = getButtonsController();
+  await buttons.right();
+});
 
 type DeviceLabelsReturn = {
   delegateConfirmLabel: string;
@@ -737,28 +754,31 @@ export function getDeviceLabels(appInfo: AppInfos): DeviceLabelsReturn {
   };
 }
 
-export async function expectValidAddressDevice(account: Account, addressDisplayed: string) {
-  if (account.currency === Currency.SUI_USDC) {
-    providePublicKey();
-  }
-  const { receiveVerifyLabel, receiveConfirmLabel } = getDeviceLabels(account.currency.speculosApp);
-  await waitFor(receiveVerifyLabel);
-  if (isTouchDevice()) {
-    const events = await pressUntilTextFound(receiveConfirmLabel);
-    const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
-    expect(isAddressCorrect).toBeTruthy();
-    await pressAndRelease(DeviceLabels.CONFIRM);
-  } else {
-    const { receiveVerifyLabel, receiveConfirmLabel } = getDeviceLabels(
-      account.currency.speculosApp,
-    );
-    await waitFor(receiveVerifyLabel);
-    const events = await pressUntilTextFound(receiveConfirmLabel);
-    const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
-    expect(isAddressCorrect).toBeTruthy();
-    await pressBoth();
-  }
-}
+export const expectValidAddressDevice = withDeviceController(
+  ({ getButtonsController }) =>
+    async (account: Account, addressDisplayed: string) => {
+      const buttons = getButtonsController();
+      if (account.currency === Currency.SUI_USDC) {
+        await providePublicKey();
+      }
+      const { receiveVerifyLabel, receiveConfirmLabel } = getDeviceLabels(
+        account.currency.speculosApp,
+      );
+      await waitFor(receiveVerifyLabel);
+
+      if (isTouchDevice()) {
+        const events = await pressUntilTextFound(receiveConfirmLabel);
+        const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
+        expect(isAddressCorrect).toBeTruthy();
+        await pressAndRelease(DeviceLabels.CONFIRM);
+      } else {
+        const events = await pressUntilTextFound(receiveConfirmLabel);
+        const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
+        expect(isAddressCorrect).toBeTruthy();
+        await buttons.both();
+      }
+    },
+);
 
 export async function signSendTransaction(tx: Transaction) {
   const currencyName = tx.accountToDebit.currency;
@@ -873,58 +893,66 @@ export async function getDelegateEvents(delegatingAccount: Delegate): Promise<st
   return await pressUntilTextFound(delegateConfirmLabel);
 }
 
-export async function verifyAmountsAndAcceptSwap(swap: Swap, amount: string) {
-  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
-  const events =
-    getSpeculosModel() === DeviceModelId.nanoS
-      ? await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND)
-      : await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
-  verifySwapData(swap, events, amount);
-  if (isTouchDevice()) {
-    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-  } else {
-    await pressBoth();
-  }
-}
-
-export async function verifyAmountsAndAcceptSwapForDifferentSeed(
-  swap: Swap,
-  amount: string,
-  errorMessage: string | null,
-) {
-  if (errorMessage === null && isTouchDevice()) {
-    await waitFor(DeviceLabels.RECEIVE_ADDRESS_DOES_NOT_BELONG);
-    await pressAndRelease(DeviceLabels.CONTINUE_ANYWAY);
-  } else {
-    await waitFor(DeviceLabels.REVIEW_TRANSACTION);
-  }
-  const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
-  verifySwapData(swap, events, amount);
-  if (isTouchDevice()) {
-    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
-  } else {
-    await pressBoth();
-  }
-}
-
-export async function verifyAmountsAndRejectSwap(swap: Swap, amount: string) {
-  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
-  let events: string[] = [];
-  if (isTouchDevice()) {
-    events = await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
-  } else {
-    events = await pressUntilTextFound(DeviceLabels.REJECT);
-  }
+export const verifyAmountsAndAcceptSwap = withDeviceController(
+  ({ getButtonsController }) =>
+    async (swap: Swap, amount: string) => {
+      const buttons = getButtonsController();
+      await waitFor(DeviceLabels.REVIEW_TRANSACTION);
+      const events =
+        getSpeculosModel() === DeviceModelId.nanoS
+          ? await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND)
+          : await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
+      verifySwapData(swap, events, amount);
+      if (isTouchDevice()) {
+        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+      } else {
+        await buttons.both();
+      }
+    },
+);
+
+export const verifyAmountsAndAcceptSwapForDifferentSeed = withDeviceController(
+  ({ getButtonsController }) =>
+    async (swap: Swap, amount: string, errorMessage: string | null) => {
+      const buttons = getButtonsController();
+      if (errorMessage === null) {
+        await waitFor(DeviceLabels.RECEIVE_ADDRESS_DOES_NOT_BELONG);
+        await pressAndRelease(DeviceLabels.CONTINUE_ANYWAY);
+      } else {
+        await waitFor(DeviceLabels.REVIEW_TRANSACTION);
+      }
+      const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
+      verifySwapData(swap, events, amount);
+      if (isTouchDevice()) {
+        await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+      } else {
+        await buttons.both();
+      }
+    },
+);
+
+export const verifyAmountsAndRejectSwap = withDeviceController(
+  ({ getButtonsController }) =>
+    async (swap: Swap, amount: string) => {
+      const buttons = getButtonsController();
+      await waitFor(DeviceLabels.REVIEW_TRANSACTION);
+      let events: string[] = [];
+      if (isTouchDevice()) {
+        events = await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
+      } else {
+        events = await pressUntilTextFound(DeviceLabels.REJECT);
+      }
 
-  verifySwapData(swap, events, amount);
-  if (isTouchDevice()) {
-    await pressAndRelease(DeviceLabels.REJECT);
-    await waitFor(DeviceLabels.YES_REJECT);
-    await pressAndRelease(DeviceLabels.YES_REJECT);
-  } else {
-    await pressBoth();
-  }
-}
+      verifySwapData(swap, events, amount);
+      if (isTouchDevice()) {
+        await pressAndRelease(DeviceLabels.REJECT);
+        await waitFor(DeviceLabels.YES_REJECT);
+        await pressAndRelease(DeviceLabels.YES_REJECT);
+      } else {
+        await buttons.both();
+      }
+    },
+);
 
 function verifySwapData(swap: Swap, events: string[], amount: string) {
   const swapPair = `swap ${swap.getAccountToDebit.currency.ticker} to ${swap.getAccountToCredit.currency.ticker}`;