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

package/src/deviceSDK/actions/getDeviceInfo.ts

@@ -4,7 +4,7 @@ import { scan } from "rxjs/operators";
 import { FullActionState, initialSharedActionState, sharedReducer } from "./core";
 import { getDeviceInfoTask, GetDeviceInfoTaskError } from "../tasks/getDeviceInfo";
 
-export type GetDeviceInfoActionArgs = { deviceId: DeviceId };
+export type GetDeviceInfoActionArgs = { deviceId: DeviceId; deviceName: string | null };
 
 // Union of all the tasks specific errors
 export type GetDeviceInfoActionErrorType = GetDeviceInfoTaskError;
@@ -21,10 +21,11 @@ export const initialState: GetDeviceInfoActionState = {
 
 export function getDeviceInfoAction({
   deviceId,
+  deviceName,
 }: GetDeviceInfoActionArgs): Observable<GetDeviceInfoActionState> {
   // TODO: to decide: should we push an event if the state is not changing?
   // For ex: when the device is locked with 0x5515: an event with lockedDevice: true is pushed for each retry
-  return getDeviceInfoTask({ deviceId }).pipe(
+  return getDeviceInfoTask({ deviceId, deviceName }).pipe(
     scan((currentState, event) => {
       switch (event.type) {
         case "taskError":

package/src/deviceSDK/actions/getLatestAvailableFirmware.test.ts

@@ -70,6 +70,7 @@ describe("getLatestAvailableFirmwareAction", () => {
 
       getLatestAvailableFirmwareAction({
         deviceId: "A_DEVICE_ID",
+        deviceName: null,
       }).subscribe({
         next: ({
           firmwareUpdateContext,
@@ -124,6 +125,7 @@ describe("getLatestAvailableFirmwareAction", () => {
 
       getLatestAvailableFirmwareAction({
         deviceId: "A_DEVICE_ID",
+        deviceName: null,
       }).subscribe({
         next: ({
           firmwareUpdateContext,
@@ -188,6 +190,7 @@ describe("getLatestAvailableFirmwareAction", () => {
       let step = 1;
       getLatestAvailableFirmwareAction({
         deviceId: "A_DEVICE_ID",
+        deviceName: null,
       }).subscribe({
         next: ({
           firmwareUpdateContext,
@@ -265,6 +268,7 @@ describe("getLatestAvailableFirmwareAction", () => {
       let step = 1;
       getLatestAvailableFirmwareAction({
         deviceId: "A_DEVICE_ID",
+        deviceName: null,
       }).subscribe({
         next: ({
           firmwareUpdateContext,
@@ -322,4 +326,31 @@ describe("getLatestAvailableFirmwareAction", () => {
       });
     });
   });
+
+  describe("When deviceName is provided", () => {
+    it("should pass deviceName to the underlying tasks", done => {
+      mockedInternalGetDeviceInfoTask.mockReturnValue(
+        of({ type: "data", deviceInfo: aDeviceInfo }),
+      );
+
+      mockedGetLatestFirmwareTask.mockReturnValue(
+        of({ type: "data", firmwareUpdateContext: aLatestFirmwareContext }),
+      );
+
+      getLatestAvailableFirmwareAction({
+        deviceId: "A_DEVICE_ID",
+        deviceName: "My Device",
+      }).subscribe({
+        complete: () => {
+          expect(mockedInternalGetDeviceInfoTask).toHaveBeenCalledWith(
+            expect.objectContaining({ deviceName: "My Device" }),
+          );
+          expect(mockedGetLatestFirmwareTask).toHaveBeenCalledWith(
+            expect.objectContaining({ deviceName: "My Device" }),
+          );
+          done();
+        },
+      });
+    });
+  });
 });

package/src/deviceSDK/actions/getLatestAvailableFirmware.ts

@@ -17,6 +17,7 @@ import { SharedTaskEvent } from "../tasks/core";
 
 export type GetLatestAvailableFirmwareActionArgs = {
   deviceId: DeviceId;
+  deviceName: string | null;
 };
 
 // Union of all the tasks specific errors
@@ -65,6 +66,7 @@ export const initialState: GetLatestAvailableFirmwareActionState = {
  */
 export function getLatestAvailableFirmwareAction({
   deviceId,
+  deviceName,
 }: GetLatestAvailableFirmwareActionArgs): Observable<GetLatestAvailableFirmwareActionState> {
   const observable = new Observable<
     | (GetLatestFirmwareTaskEvent & {
@@ -81,7 +83,7 @@ export function getLatestAvailableFirmwareAction({
       status: "ongoing",
     });
 
-    getDeviceInfoTask({ deviceId })
+    getDeviceInfoTask({ deviceId, deviceName })
       .pipe(
         switchMap(event => {
           if (event.type !== "data") {
@@ -99,7 +101,10 @@ export function getLatestAvailableFirmwareAction({
           });
 
           // Keeps `deviceInfo` in the next event
-          return forkJoin([getLatestFirmwareTask({ deviceId, deviceInfo }), of(deviceInfo)]).pipe(
+          return forkJoin([
+            getLatestFirmwareTask({ deviceId, deviceName, deviceInfo }),
+            of(deviceInfo),
+          ]).pipe(
             // Creating a new "event"-like object, extending it with `deviceInfo`
             switchMap(([event, deviceInfo]) => {
               return of({

package/src/deviceSDK/actions/toggleOnboardingEarlyCheck.ts

@@ -10,6 +10,7 @@ import { scan } from "rxjs/operators";
 
 export type ToggleOnboardingEarlyCheckActionArgs = {
   deviceId: DeviceId;
+  deviceName: string | null;
   toggleType: "enter" | "exit";
 };
 
@@ -44,9 +45,10 @@ export const initialState: ToggleOnboardingEarlyCheckActionState = {
  */
 export function toggleOnboardingEarlyCheckAction({
   deviceId,
+  deviceName,
   toggleType,
 }: ToggleOnboardingEarlyCheckActionArgs): Observable<ToggleOnboardingEarlyCheckActionState> {
-  return toggleOnboardingEarlyCheckTask({ deviceId, toggleType }).pipe(
+  return toggleOnboardingEarlyCheckTask({ deviceId, deviceName, toggleType }).pipe(
     scan<ToggleOnboardingEarlyCheckTaskEvent, ToggleOnboardingEarlyCheckActionState>(
       (currentState, event) => {
         switch (event.type) {

package/src/deviceSDK/actions/updateFirmware.ts

@@ -8,6 +8,7 @@ import { getLatestFirmwareTask, GetLatestFirmwareTaskErrorEvent } from "../tasks
 
 export type updateFirmwareActionArgs = {
   deviceId: DeviceId;
+  deviceName: string | null;
 };
 
 export type UpdateFirmwareActionState = FullActionState<{
@@ -51,16 +52,17 @@ export const initialState: UpdateFirmwareActionState = {
  */
 export function updateFirmwareAction({
   deviceId,
+  deviceName,
 }: updateFirmwareActionArgs): Observable<UpdateFirmwareActionState> {
   return concat(
     of(initialState),
-    getDeviceInfoTask({ deviceId }).pipe(
+    getDeviceInfoTask({ deviceId, deviceName }).pipe(
       switchMap(event => {
         if (event.type !== "data") {
           return of(event);
         }
         const { deviceInfo } = event;
-        return getLatestFirmwareTask({ deviceId, deviceInfo });
+        return getLatestFirmwareTask({ deviceId, deviceName, deviceInfo });
       }),
       switchMap(event => {
         if (event.type !== "data") {
@@ -68,6 +70,7 @@ export function updateFirmwareAction({
         } else {
           return updateFirmwareTask({
             deviceId,
+            deviceName,
             updateContext: event.firmwareUpdateContext,
           });
         }

package/src/deviceSDK/hooks/useBatteryStatuses.test.ts

@@ -6,7 +6,9 @@ import { useBatteryStatuses } from "./useBatteryStatuses";
 
 describe("useBatteryStatuses", () => {
   it("should return an initial cancelRequest method that is callable", async () => {
-    const { result } = renderHook(() => useBatteryStatuses({ statuses: [], enabled: true }));
+    const { result } = renderHook(() =>
+      useBatteryStatuses({ deviceName: null, statuses: [], enabled: true }),
+    );
     expect(() => result.current.cancelRequest()).not.toThrow();
   });
 });

package/src/deviceSDK/hooks/useBatteryStatuses.ts

@@ -11,6 +11,7 @@ import { useEnv } from "../../env.react";
 
 export type UseBatteryStatusesArgs = {
   deviceId?: string;
+  deviceName: string | null;
   statuses: BatteryStatusTypes[];
   enabled: boolean;
 };
@@ -29,6 +30,7 @@ export type UseBatteryStatusesArgs = {
  */
 export const useBatteryStatuses = ({
   deviceId,
+  deviceName,
   statuses,
   enabled,
 }: UseBatteryStatusesArgs): {
@@ -56,6 +58,7 @@ export const useBatteryStatuses = ({
     if (nonce > 0 && deviceId) {
       const sub = getBatteryStatusesAction({
         deviceId,
+        deviceName,
         statuses,
       }).subscribe({
         next: state => {
@@ -90,7 +93,7 @@ export const useBatteryStatuses = ({
         sub.unsubscribe();
       };
     }
-  }, [deviceId, lowBatteryPercentage, statuses, nonce, enabled]);
+  }, [deviceId, deviceName, lowBatteryPercentage, statuses, nonce, enabled]);
 
   const triggerRequest = useCallback(() => {
     setRequestCompleted(false);

package/src/deviceSDK/hooks/useGetDeviceInfo.ts

@@ -8,19 +8,21 @@ import {
 export type UseGetDeviceInfoArgs = {
   getDeviceInfoAction?: typeof defaultGetDeviceInfoAction;
   deviceId: string;
+  deviceName: string | null;
 };
 
 export const useGetDeviceInfo = ({
   getDeviceInfoAction = defaultGetDeviceInfoAction,
   deviceId,
+  deviceName,
 }: UseGetDeviceInfoArgs): GetDeviceInfoActionState => {
   const [state, setState] = useState<GetDeviceInfoActionState>(initialState);
 
   useEffect(() => {
-    const sub = getDeviceInfoAction({ deviceId }).subscribe(setState);
+    const sub = getDeviceInfoAction({ deviceId, deviceName }).subscribe(setState);
 
     return () => sub.unsubscribe();
-  }, [deviceId, getDeviceInfoAction]);
+  }, [deviceId, getDeviceInfoAction, deviceName]);
 
   return state;
 };

package/src/deviceSDK/hooks/useGetLatestAvailableFirmware.ts

@@ -11,6 +11,7 @@ import type { IgnoredOSUpdates } from "@ledgerhq/types-live";
 export type UseGetLatestAvailableFirmwareArgs = {
   getLatestAvailableFirmwareAction?: typeof defaultGetLatestAvailableFirmwareAction;
   deviceId: string;
+  deviceName: string | null;
   isHookEnabled?: boolean;
   ignoredOSUpdates?: IgnoredOSUpdates;
 };
@@ -32,6 +33,7 @@ export type UseGetLatestAvailableFirmwareArgs = {
 export const useGetLatestAvailableFirmware = ({
   getLatestAvailableFirmwareAction = defaultGetLatestAvailableFirmwareAction,
   deviceId,
+  deviceName,
   isHookEnabled = true,
   ignoredOSUpdates,
 }: UseGetLatestAvailableFirmwareArgs): {
@@ -50,6 +52,7 @@ export const useGetLatestAvailableFirmware = ({
 
     const subscription = getLatestAvailableFirmwareAction({
       deviceId,
+      deviceName,
     }).subscribe({
       next: newValue => {
         const filteredValue = filterIgnoredFirmwareUpdates(newValue, ignoredOSUpdates);

package/src/deviceSDK/hooks/useToggleOnboardingEarlyChecks.test.ts

@@ -24,6 +24,7 @@ describe("useToggleOnboardingEarlyCheck", () => {
       useToggleOnboardingEarlyCheck({
         toggleOnboardingEarlyCheckAction: mockedToggleOnboardingEarlyCheckAction,
         deviceId: "",
+        deviceName: null,
         toggleType: "enter",
       }),
     );
@@ -50,6 +51,7 @@ describe("useToggleOnboardingEarlyCheck", () => {
       useToggleOnboardingEarlyCheck({
         toggleOnboardingEarlyCheckAction: mockedToggleOnboardingEarlyCheckAction,
         deviceId: "",
+        deviceName: null,
         toggleType,
       }),
     );

package/src/deviceSDK/hooks/useToggleOnboardingEarlyChecks.ts

@@ -10,6 +10,7 @@ import {
 export type UseToggleOnboardingEarlyCheckArgs = {
   toggleOnboardingEarlyCheckAction?: typeof defaultToggleOnboardingEarlyCheckAction;
   deviceId: string;
+  deviceName: string | null;
   toggleType: ToggleOnboardingEarlyCheckActionArgs["toggleType"] | null;
 };
 
@@ -39,6 +40,7 @@ export type UseToggleOnboardingEarlyCheckArgs = {
 export const useToggleOnboardingEarlyCheck = ({
   toggleOnboardingEarlyCheckAction = defaultToggleOnboardingEarlyCheckAction,
   deviceId,
+  deviceName,
   toggleType,
 }: UseToggleOnboardingEarlyCheckArgs): {
   state: ToggleOnboardingEarlyCheckActionState;
@@ -50,6 +52,7 @@ export const useToggleOnboardingEarlyCheck = ({
 
     const subscription = toggleOnboardingEarlyCheckAction({
       deviceId,
+      deviceName,
       toggleType,
     }).subscribe({
       next: setState,
@@ -64,7 +67,7 @@ export const useToggleOnboardingEarlyCheck = ({
 
       subscription.unsubscribe();
     };
-  }, [deviceId, toggleOnboardingEarlyCheckAction, toggleType]);
+  }, [deviceId, deviceName, toggleOnboardingEarlyCheckAction, toggleType]);
 
   return { state };
 };

package/src/deviceSDK/hooks/useUpdateFirmware.ts

@@ -10,6 +10,7 @@ const STATE_UPDATE_THROTTLE = 500;
 
 export type UseUpdateFirmwareArgs = {
   deviceId: string;
+  deviceName: string | null;
   updateFirmwareAction?: typeof defaultUpdateFirmwareAction;
 };
 
@@ -22,6 +23,7 @@ export type UseUpdateFirmwareArgs = {
  */
 export function useUpdateFirmware({
   deviceId,
+  deviceName,
   updateFirmwareAction = defaultUpdateFirmwareAction,
 }: UseUpdateFirmwareArgs): {
   updateState: UpdateFirmwareActionState;
@@ -34,6 +36,7 @@ export function useUpdateFirmware({
     if (nonce > 0) {
       const sub = updateFirmwareAction({
         deviceId,
+        deviceName,
       })
         .pipe(
           // in order to correctly throttle the events without losing any important events
@@ -52,7 +55,7 @@ export function useUpdateFirmware({
         sub.unsubscribe();
       };
     }
-  }, [deviceId, updateFirmwareAction, nonce]);
+  }, [deviceId, updateFirmwareAction, nonce, deviceName]);
 
   const triggerUpdate = useCallback(() => {
     setUpdateState(initialState);

package/src/deviceSDK/tasks/core.test.ts

@@ -1,9 +1,11 @@
 import { of, throwError } from "rxjs";
 import { retryOnErrorsCommandWrapper, sharedLogicTaskWrapper } from "./core";
 import { DisconnectedDevice, LockedDeviceError } from "@ledgerhq/errors";
+import { DeviceBusyError } from "@ledgerhq/device-management-kit";
 import { concatMap } from "rxjs/operators";
 import { TransportRef } from "../transports/core";
 import { aTransportRefBuilder } from "../mocks/aTransportRef";
+import { isDmkError } from "./core";
 
 // Needs to mock the timer from rxjs used in the retry mechanism
 jest.mock("rxjs", () => {
@@ -330,4 +332,22 @@ describe("retryOnErrorsCommandWrapper", () => {
       });
     });
   });
+
+  describe("isDmkError (deviceSDK/tasks/core)", () => {
+    it("returns true for a DMK error instance", () => {
+      expect(isDmkError(new DeviceBusyError())).toBe(true);
+    });
+
+    it("returns false for a regular Error instance", () => {
+      expect(isDmkError(new Error("error"))).toBe(false);
+    });
+
+    it("returns false for a string error (e.g. 'Invalid extension provided')", () => {
+      expect(isDmkError("Invalid extension provided")).toBe(false);
+    });
+
+    it("returns false for undefined", () => {
+      expect(isDmkError(undefined)).toBe(false);
+    });
+  });
 });

package/src/deviceSDK/tasks/core.ts

@@ -79,7 +79,8 @@ type ErrorClass = CustomErrorClassType | TransportStatusErrorClassType;
 // To be able to retry a command, the command needs to take an object containing a transport as its argument
 type CommandTransportArgs = { transport: Transport };
 
-export const isDmkError = (error: any): error is DmkError => error && "_tag" in error;
+export const isDmkError = (error: unknown): error is DmkError =>
+  !!error && typeof error === "object" && error !== null && "_tag" in error;
 
 /**
  * Calls a command and retries it on given errors. The transport is refreshed before each retry.

package/src/deviceSDK/tasks/getBatteryStatuses.ts

@@ -12,6 +12,7 @@ import getBatteryStatus from "../commands/getBatteryStatus";
 
 export type GetBatteryStatusesTaskArgs = {
   deviceId: DeviceId;
+  deviceName: string | null;
   statuses: BatteryStatusTypes[];
 };
 
@@ -30,10 +31,14 @@ export type GetBatteryStatusesTaskEvent =
 
 function internalGetBatteryStatusesTask({
   deviceId,
+  deviceName,
   statuses,
 }: GetBatteryStatusesTaskArgs): Observable<GetBatteryStatusesTaskEvent> {
   return new Observable(subscriber => {
-    return withTransport(deviceId)(({ transportRef }) =>
+    return withTransport(
+      deviceId,
+      deviceName ? { matchDeviceByName: deviceName } : undefined,
+    )(({ transportRef }) =>
       quitApp(transportRef.current).pipe(
         switchMap(() => {
           const statusesObservable = statuses.map(statusType =>

package/src/deviceSDK/tasks/getDeviceInfo.ts

@@ -16,7 +16,7 @@ import { SendApduEmptyResponseError } from "@ledgerhq/device-management-kit";
 const ManagerAllowedFlag = 0x08;
 const PinValidatedFlag = 0x80;
 
-export type GetDeviceInfoTaskArgs = { deviceId: DeviceId };
+export type GetDeviceInfoTaskArgs = { deviceId: DeviceId; deviceName: string | null };
 
 // No taskError for getDeviceInfoTask. Kept for consistency with other tasks.
 export type GetDeviceInfoTaskError = "None";
@@ -34,10 +34,14 @@ export type GetDeviceInfoTaskEvent =
 // Exported for tests
 export function internalGetDeviceInfoTask({
   deviceId,
+  deviceName,
 }: GetDeviceInfoTaskArgs): Observable<GetDeviceInfoTaskEvent> {
   return new Observable(subscriber => {
     return (
-      withTransport(deviceId)(({ transportRef }) =>
+      withTransport(
+        deviceId,
+        deviceName ? { matchDeviceByName: deviceName } : undefined,
+      )(({ transportRef }) =>
         quitApp(transportRef.current).pipe(
           switchMap(() => {
             return retryOnErrorsCommandWrapper({

package/src/deviceSDK/tasks/getLatestFirmware.ts

@@ -10,6 +10,7 @@ import { withTransport } from "../transports/core";
 
 export type GetLatestFirmwareTaskArgs = {
   deviceId: DeviceId;
+  deviceName: string | null;
   deviceInfo: DeviceInfo;
 };
 
@@ -27,10 +28,14 @@ export type GetLatestFirmwareTaskEvent =
 
 function internalGetLatestFirmwareTask({
   deviceId,
+  deviceName,
   deviceInfo,
 }: GetLatestFirmwareTaskArgs): Observable<GetLatestFirmwareTaskEvent> {
   return new Observable(subscriber => {
-    return withTransport(deviceId)(({ transportRef }) =>
+    return withTransport(
+      deviceId,
+      deviceName ? { matchDeviceByName: deviceName } : undefined,
+    )(({ transportRef }) =>
       quitApp(transportRef.current).pipe(
         switchMap(() => {
           return from(getLatestFirmwareForDeviceUseCase(deviceInfo));

package/src/deviceSDK/tasks/toggleOnboardingEarlyCheck.test.ts

@@ -26,6 +26,7 @@ describe("@deviceSDK/tasks/toggleOnboardingEarlyCheckTask", () => {
       // `enter` and `exit` have the same behavior
       toggleOnboardingEarlyCheckTask({
         deviceId: "",
+        deviceName: null,
         toggleType: "exit",
       }).subscribe({
         next: event => {
@@ -47,6 +48,7 @@ describe("@deviceSDK/tasks/toggleOnboardingEarlyCheckTask", () => {
 
       toggleOnboardingEarlyCheckTask({
         deviceId: "",
+        deviceName: null,
         toggleType: "enter",
       }).subscribe({
         next: event => {
@@ -78,6 +80,7 @@ describe("@deviceSDK/tasks/toggleOnboardingEarlyCheckTask", () => {
 
       toggleOnboardingEarlyCheckTask({
         deviceId: "",
+        deviceName: null,
         toggleType: "enter",
       }).subscribe({
         next: event => {

package/src/deviceSDK/tasks/toggleOnboardingEarlyCheck.ts

@@ -26,11 +26,13 @@ export type ToggleOnboardingEarlyCheckTaskEvent =
 
 export type ToggleOnboardingEarlyCheckTaskArgs = {
   deviceId: DeviceId;
+  deviceName: string | null;
   toggleType: "enter" | "exit";
 };
 
 function internalToggleOnboardingEarlyCheckTask({
   deviceId,
+  deviceName,
   toggleType,
 }: ToggleOnboardingEarlyCheckTaskArgs): Observable<ToggleOnboardingEarlyCheckTaskEvent> {
   const tracer = new LocalTracer(LOG_TYPE, {
@@ -42,7 +44,10 @@ function internalToggleOnboardingEarlyCheckTask({
   const p2 = toggleType === "enter" ? ToggleTypeP2.EnterChecking : ToggleTypeP2.ExitChecking;
 
   return new Observable(subscriber => {
-    withTransport(deviceId)(({ transportRef }) =>
+    withTransport(
+      deviceId,
+      deviceName ? { matchDeviceByName: deviceName } : undefined,
+    )(({ transportRef }) =>
       toggleOnboardingEarlyCheckCmd({
         transport: transportRef.current,
         p2,

package/src/deviceSDK/tasks/updateFirmware.ts

@@ -41,6 +41,7 @@ import {
 
 export type UpdateFirmwareTaskArgs = {
   deviceId: DeviceId;
+  deviceName: string | null;
   updateContext: FirmwareUpdateContext;
 };
 
@@ -85,6 +86,7 @@ const waitForGetVersion = retryOnErrorsCommandWrapper({
 
 function internalUpdateFirmwareTask({
   deviceId,
+  deviceName,
   updateContext,
 }: UpdateFirmwareTaskArgs): Observable<UpdateFirmwareTaskEvent> {
   const tracer = new LocalTracer(LOG_TYPE, {
@@ -92,7 +94,10 @@ function internalUpdateFirmwareTask({
   });
 
   return new Observable(subscriber => {
-    const sub = withTransport(deviceId)(({ transportRef }) =>
+    const sub = withTransport(
+      deviceId,
+      deviceName ? { matchDeviceByName: deviceName } : undefined,
+    )(({ transportRef }) =>
       concat(
         quitApp(transportRef.current).pipe(
           switchMap(() => {

package/src/deviceSDK/transports/core.ts

@@ -63,7 +63,10 @@ export type JobArgs = {
  *  job: the job to execute with the transport. It takes:
  *   - transportRef: a reference to the transport that can be updated by calling a transportRef.refreshTransport()
  */
-export const withTransport = (deviceId: string, options?: { openTimeoutMs?: number }) => {
+export const withTransport = (
+  deviceId: string,
+  options?: { openTimeoutMs?: number; matchDeviceByName?: string },
+) => {
   return <T>(job: ({ transportRef }: JobArgs) => Observable<T>): Observable<T> =>
     new Observable(subscriber => {
       const queuedJobManager = DeviceQueuedJobsManager.getInstance();
@@ -149,7 +152,7 @@ export const withTransport = (deviceId: string, options?: { openTimeoutMs?: numb
             close(transportRef.current, deviceId)
               // Silently ignore errors on transport close
               .catch(() => {})
-              .then(async () => open(deviceId, options?.openTimeoutMs, tracer.getContext()))
+              .then(async () => open(deviceId, options, tracer.getContext()))
               .then(async newTransport => {
                 await setupTransport(transportRef.current);
 
@@ -176,7 +179,7 @@ export const withTransport = (deviceId: string, options?: { openTimeoutMs?: numb
             currentJobId: jobId,
           });
 
-          return open(deviceId, options?.openTimeoutMs, tracer.getContext());
+          return open(deviceId, options, tracer.getContext());
         })
         .then(transport => {
           return buildRefreshableTransport(transport);

package/src/e2e/enum/Account.ts

@@ -108,12 +108,6 @@ export class Account {
     "0xa1baa625c5E6A9304cB7AcD86d2fee6B710eC3eB",
     1,
   );
-  static readonly BSC_SHIBA = new Account(
-    Currency.BSC_SHIBA,
-    "BNB Chain 1",
-    "0x4BE2E2B8872AA298D6d123b9211B53E41f611566",
-    0,
-  );
 
   static readonly BTC_LEGACY_1 = new Account(
     Currency.BTC,

package/src/e2e/enum/Currency.ts

@@ -156,10 +156,6 @@ export class Currency {
     AppInfos.BNB_CHAIN,
     [Network.BNB_CHAIN, Network.POLYGON],
   );
-  static readonly BSC_SHIBA = new Currency("Shiba Inu", "SHIB", "bsc", AppInfos.BNB_CHAIN, [
-    Network.BNB_CHAIN,
-    Network.ETHEREUM,
-  ]);
   static readonly POL_DAI = new Currency(
     "(PoS) Dai Stablecoin",
     "DAI",
@@ -204,7 +200,7 @@ export class Currency {
   static readonly SUI = new Currency("Sui", "SUI", "sui", AppInfos.SUI, [Network.SUI]);
 
   static readonly SUI_USDC = new Currency(
-    "USDC",
+    "USD Coin",
     "USDC",
     "sui/coin/usdc_0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::usdc",
     AppInfos.SUI,

package/src/e2e/enum/ReceiveFundsOptions.ts

@@ -0,0 +1,7 @@
+export const ReceiveFundsOptions = {
+  CRYPTO: "crypto",
+  FIAT: "fiat",
+} as const;
+
+export type ReceiveFundsOptionsType =
+  (typeof ReceiveFundsOptions)[keyof typeof ReceiveFundsOptions];

package/src/exchange/providers/swap.ts

@@ -328,3 +328,7 @@ export const getAvailableProviders = async (): Promise<string[]> => {
   }
   return Object.keys(await fetchAndMergeProviderData({ ledgerSignatureEnv, partnerSignatureEnv }));
 };
+
+export const getDefaultSwapProviderKeys = (): string[] => {
+  return Object.keys(DEFAULT_SWAP_PROVIDERS);
+};

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

@@ -6,7 +6,7 @@ import { useFilteredProviders } from "./useFilteredProviders";
 
 export function useFetchCurrencyAll() {
   const fetchAdditionalCoins = useFeature("fetchAdditionalCoins");
-  const { providers, loading, error } = useFilteredProviders();
+  const { providers, error } = useFilteredProviders();
 
   const { data, ...rest } = useAPI({
     queryFn: fetchCurrencyAll,
@@ -14,9 +14,8 @@ export function useFetchCurrencyAll() {
       additionalCoinsFlag: fetchAdditionalCoins?.enabled,
       providers,
     },
-    // assume the all currency list for the given props won't change during a users session.
     staleTimeout: FETCH_CURRENCIES_TIMEOUT_MS,
-    enabled: !loading && !error,
+    enabled: !error && providers.length > 0,
   });
   return {
     ...rest,