@ledgerhq/live-common 34.53.0-nightly.20251115023630 → 34.53.0-nightly.20251119023741

package/src/exchange/swap/hooks/v5/useFilteredProviders.ts

@@ -1,27 +1,52 @@
 import { getEnv } from "@ledgerhq/live-env";
-import { useCallback, useEffect, useState } from "react";
-import { fetchAndMergeProviderData } from "../../../providers/swap";
+import { useCallback, useEffect, useState, useMemo } from "react";
+import { fetchAndMergeProviderData, getDefaultSwapProviderKeys } from "../../../providers/swap";
 import { useFeature } from "../../../../featureFlags";
 
+const filterProvidersByFeatureFlags = (
+  providers: string[],
+  ptxSwapMoonpayProviderFlag?: { enabled?: boolean },
+  ptxSwapExodusProviderFlag?: { enabled?: boolean },
+): string[] => {
+  let filtered = providers;
+  if (!ptxSwapMoonpayProviderFlag?.enabled) {
+    filtered = filtered.filter(provider => provider !== "moonpay");
+  }
+  if (!ptxSwapExodusProviderFlag?.enabled) {
+    filtered = filtered.filter(provider => provider !== "exodus");
+  }
+  return filtered;
+};
+
 export const useFilteredProviders = () => {
-  const [providers, setProviders] = useState<string[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<unknown>(null);
   const ptxSwapMoonpayProviderFlag = useFeature("ptxSwapMoonpayProvider");
   const ptxSwapExodusProviderFlag = useFeature("ptxSwapExodusProvider");
+
+  const defaultProviders = useMemo(
+    () =>
+      filterProvidersByFeatureFlags(
+        getDefaultSwapProviderKeys(),
+        ptxSwapMoonpayProviderFlag ?? undefined,
+        ptxSwapExodusProviderFlag ?? undefined,
+      ),
+    [ptxSwapMoonpayProviderFlag, ptxSwapExodusProviderFlag],
+  );
+
+  const [providers, setProviders] = useState<string[]>(defaultProviders);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<unknown>(null);
+
   const fetchProviders = useCallback(async () => {
     try {
       const ledgerSignatureEnv = getEnv("MOCK_EXCHANGE_TEST_CONFIG") ? "test" : "prod";
       const partnerSignatureEnv = getEnv("MOCK_EXCHANGE_TEST_PARTNER") ? "test" : "prod";
 
       const data = await fetchAndMergeProviderData({ ledgerSignatureEnv, partnerSignatureEnv });
-      let filteredProviders = Object.keys(data);
-      if (!ptxSwapMoonpayProviderFlag?.enabled) {
-        filteredProviders = filteredProviders.filter(provider => provider !== "moonpay");
-      }
-      if (!ptxSwapExodusProviderFlag?.enabled) {
-        filteredProviders = filteredProviders.filter(provider => provider !== "exodus");
-      }
+      const filteredProviders = filterProvidersByFeatureFlags(
+        Object.keys(data),
+        ptxSwapMoonpayProviderFlag ?? undefined,
+        ptxSwapExodusProviderFlag ?? undefined,
+      );
 
       setProviders(filteredProviders);
     } catch (error) {

package/src/families/stellar/__snapshots__/bridge.integration.test.ts.snap

@@ -3,20 +3,20 @@
 exports[`stellar currency bridge scanAccounts stellar seed 1 1`] = `
 [
   {
-    "balance": "341065021",
+    "balance": "341065024",
     "currencyId": "stellar",
     "derivationMode": "sep5",
     "freshAddress": "GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV",
     "freshAddressPath": "44'/148'/0'",
     "id": "js:2:stellar:GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV:sep5",
     "index": 0,
-    "operationsCount": 142,
+    "operationsCount": 145,
     "pendingOperations": [],
     "seedIdentifier": "27c586f8499294c64d57f8d7956eef4431de58ab20e1c88001f6cf131c97d6f3",
-    "spendableBalance": "311064921",
+    "spendableBalance": "311064924",
     "subAccounts": [],
     "swapHistory": [],
-    "syncHash": undefined,
+    "syncHash": "0x1431ef5f",
     "used": true,
     "xpub": "GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV",
   },
@@ -34,7 +34,7 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 1`] = `
     "spendableBalance": "79999760",
     "subAccounts": [],
     "swapHistory": [],
-    "syncHash": undefined,
+    "syncHash": "0x1431ef5f",
     "used": true,
     "xpub": "GAIXIJBMYPTSF2CDVQ35WOTULCLZIE4W2SDEK3RQGAA3A22BPWY7R53Z",
   },
@@ -52,7 +52,7 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 1`] = `
     "spendableBalance": "44999262",
     "subAccounts": [],
     "swapHistory": [],
-    "syncHash": undefined,
+    "syncHash": "0x1431ef5f",
     "used": true,
     "xpub": "GCDDN6T2LJN3T7SPWJQV6BCCL5KNY5GBN7X4CMSZLDEXDHXAH32TOAHS",
   },
@@ -70,7 +70,7 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 1`] = `
     "spendableBalance": "10145721",
     "subAccounts": [],
     "swapHistory": [],
-    "syncHash": undefined,
+    "syncHash": "0x1431ef5f",
     "used": true,
     "xpub": "GAHQKL7UW5DSNJXWNA4ASJ6D2I7JYFWVHDFWYJZK3WDR4BUTG27K2PWC",
   },
@@ -88,7 +88,7 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 1`] = `
     "spendableBalance": "0",
     "subAccounts": [],
     "swapHistory": [],
-    "syncHash": undefined,
+    "syncHash": "0x1431ef5f",
     "used": true,
     "xpub": "GBQMOU2WYJUP6AKY53FFKZJGQMDWCMTWSOUTZ5DVIAQPVW7AJUHSX2M5",
   },
@@ -106,7 +106,7 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 1`] = `
     "spendableBalance": "0",
     "subAccounts": [],
     "swapHistory": [],
-    "syncHash": undefined,
+    "syncHash": "0x1431ef5f",
     "used": false,
     "xpub": "GAJEKFXY76YWDSKJESDOKS2EGKRMCHSIC5AU32SU7OF54E5VVREUHXLH",
   },
@@ -690,7 +690,7 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 2`] = `
       ],
       "transactionSequenceNumber": "251606365385008908",
       "type": "IN",
-      "value": "0",
+      "value": "10000",
     },
     {
       "accountId": "js:2:stellar:GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV:sep5",
@@ -764,6 +764,30 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 2`] = `
       "type": "IN",
       "value": "1",
     },
+    {
+      "accountId": "js:2:stellar:GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV:sep5",
+      "blockHash": "0d4b1748aeb13c64f001d9b486054744d5e8521081ce6d21dc9acbb2a1c0a171",
+      "blockHeight": 59792876,
+      "extra": {
+        "memo": {
+          "type": "MEMO_TEXT",
+          "value": "Own VTX & Start Earning XLM!",
+        },
+      },
+      "fee": "10000",
+      "hasFailed": false,
+      "hash": "277aa9d93c6674951b4cc198a25ee1d5726d686f459d957a9bf4b40b0b66ffb6",
+      "id": "js:2:stellar:GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV:sep5-277aa9d93c6674951b4cc198a25ee1d5726d686f459d957a9bf4b40b0b66ffb6-IN",
+      "recipients": [
+        "GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV",
+      ],
+      "senders": [
+        "GDM2UBYCTDJ7LBBNLWU5XTNNIR6GIQW7KXJTPBWOTMFECHF5YJAE3JTH",
+      ],
+      "transactionSequenceNumber": "256741054621943059",
+      "type": "IN",
+      "value": "1",
+    },
     {
       "accountId": "js:2:stellar:GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV:sep5",
       "blockHash": "d43eb458fb93eb861373fbe61743bdc51800bf41eaeff2fd2b6a2b001254044b",
@@ -1676,6 +1700,30 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 2`] = `
       "type": "IN",
       "value": "1",
     },
+    {
+      "accountId": "js:2:stellar:GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV:sep5",
+      "blockHash": "70caf48d48b190098064b972f0142dfa3549adbc4893021d5d002df3c7a6c9b0",
+      "blockHeight": 59745989,
+      "extra": {
+        "memo": {
+          "type": "MEMO_TEXT",
+          "value": "Buy XRVT Earn fchain.io XRP!",
+        },
+      },
+      "fee": "10000",
+      "hasFailed": false,
+      "hash": "6db88bc812940527d1387217bd4574cdac5bf3857efe72e0c1aec661b5c4a90f",
+      "id": "js:2:stellar:GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV:sep5-6db88bc812940527d1387217bd4574cdac5bf3857efe72e0c1aec661b5c4a90f-IN",
+      "recipients": [
+        "GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV",
+      ],
+      "senders": [
+        "GD7NZ4LUIJPEIWM3UY4IW5HMV3WV3PRVM5CPSILLBUIG5YFNNCCTZXJL",
+      ],
+      "transactionSequenceNumber": "256247545699769514",
+      "type": "IN",
+      "value": "1",
+    },
     {
       "accountId": "js:2:stellar:GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV:sep5",
       "blockHash": "d36bfe52924033397bdb89574feb1d4bdf2f063420d204c54d3cf7b829bd571f",
@@ -3068,6 +3116,30 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 2`] = `
       "type": "IN",
       "value": "1",
     },
+    {
+      "accountId": "js:2:stellar:GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV:sep5",
+      "blockHash": "e70f311ceddcb90dd9853589896e4dedfe9d57dcdc130cf62a1c5e8564b24b7b",
+      "blockHeight": 59761051,
+      "extra": {
+        "memo": {
+          "type": "MEMO_TEXT",
+          "value": "Buy XRVT Earn fchain.io XRP!",
+        },
+      },
+      "fee": "10000",
+      "hasFailed": false,
+      "hash": "c911e6f578b4d869a71ea7e8cd139c5a885d996d2f15e63c63b31db10e42f415",
+      "id": "js:2:stellar:GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV:sep5-c911e6f578b4d869a71ea7e8cd139c5a885d996d2f15e63c63b31db10e42f415-IN",
+      "recipients": [
+        "GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV",
+      ],
+      "senders": [
+        "GD7NZ4LUIJPEIWM3UY4IW5HMV3WV3PRVM5CPSILLBUIG5YFNNCCTZXJL",
+      ],
+      "transactionSequenceNumber": "256247545699771532",
+      "type": "IN",
+      "value": "1",
+    },
     {
       "accountId": "js:2:stellar:GAT4LBXYJGJJJRSNK74NPFLO55CDDXSYVMQODSEAAH3M6EY4S7LPH5GV:sep5",
       "blockHash": "6eb78e902ecc290b25216c0afae3a354b9b3bf723510c8aa3162f801635b0f35",
@@ -5283,7 +5355,7 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 2`] = `
       ],
       "transactionSequenceNumber": "119784086674866178",
       "type": "OUT",
-      "value": "200",
+      "value": "100",
     },
     {
       "accountId": "js:2:stellar:GCDDN6T2LJN3T7SPWJQV6BCCL5KNY5GBN7X4CMSZLDEXDHXAH32TOAHS:sep5",
@@ -5798,7 +5870,7 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 2`] = `
       ],
       "transactionSequenceNumber": "119784086674866178",
       "type": "IN",
-      "value": "0",
+      "value": "100",
     },
     {
       "accountId": "js:2:stellar:GAHQKL7UW5DSNJXWNA4ASJ6D2I7JYFWVHDFWYJZK3WDR4BUTG27K2PWC:sep5",

package/src/hw/actions/app.ts

@@ -468,12 +468,13 @@ export const createAction = (
     );
 
     const task: (arg0: ConnectAppInput) => Observable<ConnectAppEvent> = useCallback(
-      ({ deviceId, request }: ConnectAppInput) => {
+      ({ deviceId, deviceName, request }: ConnectAppInput) => {
         //To avoid redundant checks, we remove passed checks from the request.
         const { dependencies, requireLatestFirmware } = request;
 
         return connectAppExec({
           deviceId,
+          deviceName,
           request: {
             ...request,
             dependencies: dependenciesResolvedRef.current ? undefined : dependencies,

package/src/hw/actions/customLockScreenLoad.ts

@@ -37,7 +37,7 @@ type ActionState = State & {
   onRetry: () => void;
 };
 
-type LoadImageAction = Action<LoadImageRequest, ActionState, LoadimageResult>;
+type LoadImageAction = Action<LoadImageRequest | undefined, ActionState, LoadimageResult>;
 
 const mapResult = ({ imageHash, imageSize }: State) => ({
   imageHash,
@@ -131,12 +131,16 @@ export const reducer = (state: State, e: Event): State => {
 export const createAction = (
   task: (arg0: LoadImageInput) => Observable<LoadImageEvent>,
 ): LoadImageAction => {
-  const useHook = (device: Device | null | undefined, request: LoadImageRequest): ActionState => {
+  const useHook = (
+    device: Device | null | undefined,
+    request: LoadImageRequest | undefined,
+  ): ActionState => {
     const [state, setState] = useState(() => getInitialState(device));
     const [resetIndex, setResetIndex] = useState(0);
     const deviceSubject = useReplaySubject(device);
 
     useEffect(() => {
+      if (!request) return;
       if (state.imageLoaded) return;
 
       const impl = getImplementation(currentMode)<LoadImageEvent, LoadImageRequest>({

package/src/hw/actions/implementations.ts

@@ -50,7 +50,11 @@ type PollingImplementationConfig = {
 
 type PollingImplementationParams<Request, EmittedEvents> = {
   deviceSubject: ReplaySubject<Device | null | undefined>;
-  task: (params: { deviceId: string; request: Request }) => Observable<EmittedEvents>;
+  task: (params: {
+    deviceId: string;
+    deviceName: string | null;
+    request: Request;
+  }) => Observable<EmittedEvents>;
   request: Request;
   config?: PollingImplementationConfig;
   // retryableWithDelayDisconnectedErrors has default value of [DisconnectedDevice, DisconnectedDeviceDuringOperation]
@@ -137,7 +141,11 @@ const pollingImplementation: Implementation = <SpecificType, GenericRequestType>
             device: currentDevice,
             replaceable: !firstRound,
           }),
-          task({ deviceId: currentDevice.deviceId, request }),
+          task({
+            deviceId: currentDevice.deviceId,
+            deviceName: currentDevice.deviceName ?? null,
+            request,
+          }),
         )
           .pipe(
             // Any event should clear the initialTimeout.
@@ -241,7 +249,13 @@ const eventImplementation: Implementation = <SpecificType, GenericRequestType>(
 
             return concat(
               initialEvent,
-              !device ? EMPTY : task({ deviceId: device.deviceId, request }),
+              device
+                ? task({
+                    deviceId: device.deviceId,
+                    deviceName: device.deviceName ?? null,
+                    request,
+                  })
+                : EMPTY,
             );
           }),
           catchError((error: Error) =>

package/src/hw/connectApp.ts

@@ -48,6 +48,7 @@ export type RequiresDerivation = {
 };
 export type Input = {
   deviceId: string;
+  deviceName: string | null;
   request: ConnectAppRequest;
 };
 export type ConnectAppRequest = {
@@ -524,10 +525,13 @@ export default function connectAppFactory(
   } = { isLdmkConnectAppEnabled: false },
 ) {
   if (!isLdmkConnectAppEnabled) {
-    return ({ deviceId, request }: Input): Observable<ConnectAppEvent> =>
-      withDevice(deviceId)(transport => cmd(transport, { deviceId, request }));
+    return ({ deviceId, deviceName, request }: Input): Observable<ConnectAppEvent> =>
+      withDevice(
+        deviceId,
+        deviceName ? { matchDeviceByName: deviceName } : undefined,
+      )(transport => cmd(transport, { deviceId, deviceName, request }));
   }
-  return ({ deviceId, request }: Input): Observable<ConnectAppEvent> => {
+  return ({ deviceId, deviceName, request }: Input): Observable<ConnectAppEvent> => {
     const {
       appName,
       requiresDerivation,
@@ -535,9 +539,12 @@ export default function connectAppFactory(
       requireLatestFirmware,
       allowPartialDependencies = false,
     } = request;
-    return withDevice(deviceId)(transport => {
+    return withDevice(
+      deviceId,
+      deviceName ? { matchDeviceByName: deviceName } : undefined,
+    )(transport => {
       if (!isDmkTransport(transport)) {
-        return cmd(transport, { deviceId, request });
+        return cmd(transport, { deviceId, deviceName, request });
       }
       const { dmk, sessionId } = transport;
       const deviceAction = new ConnectAppDeviceAction({

package/src/hw/connectManager.ts

@@ -27,6 +27,7 @@ import { extractOnboardingState, OnboardingStep } from "./extractOnboardingState
 
 export type Input = {
   deviceId: string;
+  deviceName: string | null;
   request: ManagerRequest | null | undefined;
 };
 
@@ -159,13 +160,19 @@ export default function connectManagerFactory(
   } = { isLdmkConnectAppEnabled: false },
 ) {
   if (!isLdmkConnectAppEnabled) {
-    return ({ deviceId, request }: Input): Observable<ConnectManagerEvent> =>
-      withDevice(deviceId)(transport => cmd(transport, { deviceId, request }));
+    return ({ deviceId, deviceName, request }: Input): Observable<ConnectManagerEvent> =>
+      withDevice(
+        deviceId,
+        deviceName ? { matchDeviceByName: deviceName } : undefined,
+      )(transport => cmd(transport, { deviceId, deviceName, request }));
   }
-  return ({ deviceId, request }: Input): Observable<ConnectManagerEvent> =>
-    withDevice(deviceId)(transport => {
+  return ({ deviceId, deviceName, request }: Input): Observable<ConnectManagerEvent> =>
+    withDevice(
+      deviceId,
+      deviceName ? { matchDeviceByName: deviceName } : undefined,
+    )(transport => {
       if (!isDmkTransport(transport)) {
-        return cmd(transport, { deviceId, request });
+        return cmd(transport, { deviceId, deviceName, request });
       }
       const { dmk, sessionId } = transport;
       const deviceAction = new PrepareConnectManagerDeviceAction({
@@ -179,6 +186,6 @@ export default function connectManagerFactory(
       });
       return new PrepareConnectManagerEventMapper(observable)
         .map()
-        .pipe(concatWith(cmd(transport, { deviceId, request })));
+        .pipe(concatWith(cmd(transport, { deviceId, deviceName, request })));
     });
 }

package/src/hw/customLockScreenFetch.ts

@@ -47,13 +47,21 @@ export type FetchImageRequest = {
 
 export type Input = {
   deviceId: string;
+  deviceName: string | null;
   request: FetchImageRequest;
 };
 
-export default function fetchImage({ deviceId, request }: Input): Observable<FetchImageEvent> {
+export default function fetchImage({
+  deviceId,
+  deviceName,
+  request,
+}: Input): Observable<FetchImageEvent> {
   const { backupHash, allowedEmpty = false, deviceModelId } = request;
 
-  const sub = withDevice(deviceId)(
+  const sub = withDevice(
+    deviceId,
+    deviceName ? { matchDeviceByName: deviceName } : undefined,
+  )(
     transport =>
       new Observable(subscriber => {
         const timeoutSub = of<FetchImageEvent>({

package/src/hw/customLockScreenLoad.test.ts

@@ -9,8 +9,12 @@ const mockTransport = {
   send: jest.fn(),
   getTraceContext: jest.fn(),
 };
+const mockWithTransport = jest.fn(
+  (_deviceId: string, _options?: any) => callback =>
+    callback({ transportRef: { current: mockTransport } }),
+);
 jest.mock("../deviceSDK/transports/core", () => ({
-  withTransport: () => callback => callback({ transportRef: { current: mockTransport } }),
+  withTransport: (deviceId: string, options?: any) => mockWithTransport(deviceId, options),
 }));
 jest.mock("./getDeviceInfo", () => jest.fn(() => of([])));
 
@@ -24,7 +28,9 @@ describe("customLockScreenLoad", () => {
     mockTransport.send.mockResolvedValue(Buffer.from([0x42, 0x42, 0x43, 0x90, 0x00]));
 
     // when
-    const ret = await lastValueFrom(await customLockScreenLoad({ deviceId: "deviceId", request }));
+    const ret = await lastValueFrom(
+      await customLockScreenLoad({ deviceId: "deviceId", deviceName: null, request }),
+    );
 
     // then
     expect(mockTransport.send).toHaveBeenNthCalledWith(
@@ -78,9 +84,28 @@ describe("customLockScreenLoad", () => {
 
     // when
     try {
-      await lastValueFrom(await customLockScreenLoad({ deviceId: "nanoX", request }));
+      await lastValueFrom(
+        await customLockScreenLoad({ deviceId: "nanoX", deviceName: null, request }),
+      );
     } catch (err) {
       expect(err).toStrictEqual(error);
     }
   });
+
+  it("should pass deviceName to withTransport", async () => {
+    const request = {
+      deviceModelId: DeviceModelId.stax as CLSSupportedDeviceModelId,
+      hexImage: "hello_world",
+    };
+    mockTransport.send.mockResolvedValue(Buffer.from([0x42, 0x42, 0x43, 0x90, 0x00]));
+
+    await lastValueFrom(
+      await customLockScreenLoad({ deviceId: "deviceId", deviceName: "My Device", request }),
+    );
+
+    expect(mockWithTransport).toHaveBeenCalledWith(
+      "deviceId",
+      expect.objectContaining({ matchDeviceByName: "My Device" }),
+    );
+  });
 });

package/src/hw/customLockScreenLoad.ts

@@ -68,14 +68,22 @@ export type LoadImageRequest = {
 
 export type Input = {
   deviceId: string;
+  deviceName: string | null;
   request: LoadImageRequest;
 };
 
-export default function loadImage({ deviceId, request }: Input): Observable<LoadImageEvent> {
+export default function loadImage({
+  deviceId,
+  deviceName,
+  request,
+}: Input): Observable<LoadImageEvent> {
   const { hexImage, padImage = true, deviceModelId } = request;
   const screenSpecs = getScreenSpecs(deviceModelId);
 
-  const sub = withTransport(deviceId)(
+  const sub = withTransport(
+    deviceId,
+    deviceName ? { matchDeviceByName: deviceName } : undefined,
+  )(
     ({ transportRef }) =>
       new Observable(subscriber => {
         const timeoutSub = of<LoadImageEvent>({ type: "unresponsiveDevice" })

package/src/hw/deviceAccess.ts

@@ -17,7 +17,7 @@ import {
 } from "@ledgerhq/errors";
 import { LocalTracer, TraceContext, trace } from "@ledgerhq/logs";
 import { getEnv } from "@ledgerhq/live-env";
-import { open, close } from ".";
+import { open, close, OpenOptions } from ".";
 
 const LOG_TYPE = "hw";
 
@@ -172,9 +172,10 @@ export class DeviceQueuedJobsManager {
  * @param deviceId
  * @param options contains optional configuration
  *   - openTimeoutMs: optional timeout that limits in time the open attempt of the matching registered transport.
+ *   - matchDeviceByName: optional name of the device to match.
  */
 export const withDevice =
-  (deviceId: string, options?: { openTimeoutMs?: number }) =>
+  (deviceId: string, options?: OpenOptions) =>
   <T>(job: (t: Transport) => Observable<T>): Observable<T> =>
     new Observable(o => {
       const queuedJobManager = DeviceQueuedJobsManager.getInstance();
@@ -221,7 +222,7 @@ export const withDevice =
             previousJobId: previousQueuedJob.id,
             currentJobId: jobId,
           });
-          return open(deviceId, options?.openTimeoutMs, tracer.getContext());
+          return open(deviceId, options, tracer.getContext());
         }) // open the transport
         .then(async transport => {
           tracer.trace("Got a Transport instance from open");

package/src/hw/getGenuineCheckFromDeviceId.test.ts

@@ -85,6 +85,7 @@ describe("getGenuineCheckFromDeviceId", () => {
         let step = 1;
         getGenuineCheckFromDeviceId({
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
           lockedDeviceTimeoutMs: 1000,
         }).subscribe({
           next: ({ socketEvent, lockedDevice }: GetGenuineCheckFromDeviceIdResult) => {
@@ -147,6 +148,7 @@ describe("getGenuineCheckFromDeviceId", () => {
         let step = 1;
         getGenuineCheckFromDeviceId({
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
           lockedDeviceTimeoutMs: 1000,
         }).subscribe({
           next: ({ socketEvent, lockedDevice }: GetGenuineCheckFromDeviceIdResult) => {
@@ -227,6 +229,7 @@ describe("getGenuineCheckFromDeviceId", () => {
         let step = 1;
         const subscriber = getGenuineCheckFromDeviceId({
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
           lockedDeviceTimeoutMs: 1000,
         }).subscribe({
           next: ({ socketEvent, lockedDevice }: GetGenuineCheckFromDeviceIdResult) => {
@@ -286,6 +289,7 @@ describe("getGenuineCheckFromDeviceId", () => {
         let step = 1;
         getGenuineCheckFromDeviceId({
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
           lockedDeviceTimeoutMs: 1000,
         }).subscribe({
           next: ({ socketEvent, lockedDevice }: GetGenuineCheckFromDeviceIdResult) => {

package/src/hw/getGenuineCheckFromDeviceId.ts

@@ -8,6 +8,7 @@ import genuineCheck from "./genuineCheck";
 
 export type GetGenuineCheckFromDeviceIdArgs = {
   deviceId: string;
+  deviceName: string | null;
   lockedDeviceTimeoutMs?: number;
 };
 
@@ -29,6 +30,7 @@ export type GetGenuineCheckFromDeviceIdOutput = Observable<GetGenuineCheckFromDe
  */
 export const getGenuineCheckFromDeviceId = ({
   deviceId,
+  deviceName,
   lockedDeviceTimeoutMs = 1000,
 }: GetGenuineCheckFromDeviceIdArgs): GetGenuineCheckFromDeviceIdOutput => {
   return new Observable(subscriber => {
@@ -42,7 +44,10 @@ export const getGenuineCheckFromDeviceId = ({
 
     // Returns a Subscription that can be unsubscribed/cleaned
     return (
-      withDevice(deviceId)(t =>
+      withDevice(
+        deviceId,
+        deviceName ? { matchDeviceByName: deviceName } : undefined,
+      )(t =>
         from(getDeviceInfo(t)).pipe(
           mergeMap(deviceInfo => {
             clearTimeout(lockedDeviceTimeout);