Merge pull request #7430 from LedgerHQ/support/update_device_label

fix: Updating labels for ETH, ETC, ETH sep and ETH Hol

apps/ledger-live-desktop/tests/enum/Currency.ts

@@ -38,28 +38,28 @@ export class Currency {
     "Ethereum",
     "ETH",
     "Ethereum",
-    [DeviceLabels.AMOUT, DeviceLabels.ADDRESS, DeviceLabels.ACCEPT, DeviceLabels.REJECT],
+    [DeviceLabels.AMOUT, DeviceLabels.TO, DeviceLabels.ACCEPT, DeviceLabels.REJECT],
     [DeviceLabels.ADDRESS, DeviceLabels.APPROVE, DeviceLabels.REJECT],
   );
   static readonly tETH = new Currency(
     "Ethereum Holesky",
     "𝚝ETH",
     "Ethereum Holesky",
-    [DeviceLabels.AMOUT, DeviceLabels.ADDRESS, DeviceLabels.ACCEPT, DeviceLabels.REJECT],
+    [DeviceLabels.AMOUT, DeviceLabels.TO, DeviceLabels.ACCEPT, DeviceLabels.REJECT],
     [DeviceLabels.ADDRESS, DeviceLabels.APPROVE, DeviceLabels.REJECT],
   );
   static readonly sepETH = new Currency(
     "Ethereum Sepolia",
     "𝚝ETH",
     "Ethereum Sepolia",
-    [DeviceLabels.AMOUT, DeviceLabels.ADDRESS, DeviceLabels.ACCEPT, DeviceLabels.REJECT],
+    [DeviceLabels.AMOUT, DeviceLabels.TO, DeviceLabels.ACCEPT, DeviceLabels.REJECT],
     [DeviceLabels.ADDRESS, DeviceLabels.APPROVE, DeviceLabels.REJECT],
   );
   static readonly ETC = new Currency(
     "Ethereum Classic",
     "ETC",
     "Ethereum Classic",
-    [DeviceLabels.AMOUT, DeviceLabels.ADDRESS, DeviceLabels.ACCEPT, DeviceLabels.REJECT],
+    [DeviceLabels.AMOUT, DeviceLabels.TO, DeviceLabels.ACCEPT, DeviceLabels.REJECT],
     [DeviceLabels.ADDRESS, DeviceLabels.APPROVE, DeviceLabels.REJECT],
   );
   static readonly SOL = new Currency(

apps/ledger-live-desktop/tests/page/speculos.page.ts

@@ -25,9 +25,9 @@ export class SpeculosPage extends AppPage {
 
   @step("Verify transaction info on device")
   async expectValidTxInfo(tx: Transaction) {
-    const amountScreen = await pressRightUntil(DeviceLabels.AMOUT);
+    const amountScreen = await pressRightUntil(tx.accountToDebit.currency.sendPattern[0]);
     expect(verifyAmount(tx.amount, amountScreen)).toBe(true);
-    const addressScreen = await pressRightUntil(DeviceLabels.ADDRESS);
+    const addressScreen = await pressRightUntil(tx.accountToDebit.currency.sendPattern[1]);
     expect(assertAddressesEquality(tx.recipient, addressScreen)).toBe(true);
     await pressRightUntil(tx.accountToDebit.currency.sendPattern[2]);
     await pressBoth();

apps/ledger-live-desktop/tests/utils/speculos.ts

@@ -4,7 +4,7 @@ import {
   listAppCandidates,
   createSpeculosDevice,
   releaseSpeculosDevice,
-  findAppCandidate,
+  findLatestAppCandidate,
   SpeculosTransport,
 } from "@ledgerhq/live-common/load/speculos";
 import { SpeculosDevice } from "@ledgerhq/speculos-transport";
@@ -202,7 +202,7 @@ export async function startSpeculos(
   }
 
   const { appQuery, dependency, onSpeculosDeviceCreated } = spec;
-  const appCandidate = findAppCandidate(appCandidates, appQuery);
+  const appCandidate = findLatestAppCandidate(appCandidates, appQuery);
   if (!appCandidate) {
     console.warn("no app found for " + testName);
     console.warn(appQuery);

libs/ledger-live-common/src/load/speculos.ts

@@ -123,6 +123,20 @@ export function appCandidatesMatches(appCandidate: AppCandidate, search: AppSear
       (search.appVersion && semver.satisfies(appCandidate.appVersion, search.appVersion)))
   );
 }
+
+export const findLatestAppCandidate = (
+  appCandidates: AppCandidate[],
+  search: AppSearch,
+): AppCandidate | null => {
+  let apps = appCandidates.filter(c => appCandidatesMatches(c, search));
+  if (apps.length === 0) {
+    return null;
+  }
+
+  apps = apps.sort((a, b) => semver.rcompare(a.appVersion, b.appVersion));
+  return apps[0];
+};
+
 export const findAppCandidate = (
   appCandidates: AppCandidate[],
   search: AppSearch,