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

package/src/hw/getOnboardingStatePolling.test.ts

@@ -79,6 +79,7 @@ describe("getOnboardingStatePolling", () => {
 
         getOnboardingStatePolling({
           deviceId: device.deviceId,
+          deviceName: null,
           pollingPeriodMs,
         }).subscribe({
           next: value => {
@@ -107,6 +108,7 @@ describe("getOnboardingStatePolling", () => {
 
         getOnboardingStatePolling({
           deviceId: device.deviceId,
+          deviceName: null,
           pollingPeriodMs,
         }).subscribe({
           next: value => {
@@ -135,6 +137,7 @@ describe("getOnboardingStatePolling", () => {
 
         getOnboardingStatePolling({
           deviceId: device.deviceId,
+          deviceName: null,
           pollingPeriodMs,
         }).subscribe({
           next: value => {
@@ -164,6 +167,7 @@ describe("getOnboardingStatePolling", () => {
 
         getOnboardingStatePolling({
           deviceId: device.deviceId,
+          deviceName: null,
           pollingPeriodMs,
           safeGuardTimeoutMs,
         }).subscribe({
@@ -192,6 +196,7 @@ describe("getOnboardingStatePolling", () => {
 
         getOnboardingStatePolling({
           deviceId: device.deviceId,
+          deviceName: null,
           pollingPeriodMs,
         }).subscribe({
           error: error => {
@@ -221,6 +226,7 @@ describe("getOnboardingStatePolling", () => {
 
       onboardingStatePollingSubscription = getOnboardingStatePolling({
         deviceId: device.deviceId,
+        deviceName: null,
         pollingPeriodMs,
       }).subscribe({
         next: value => {
@@ -248,6 +254,7 @@ describe("getOnboardingStatePolling", () => {
 
       onboardingStatePollingSubscription = getOnboardingStatePolling({
         deviceId: device.deviceId,
+        deviceName: null,
         pollingPeriodMs,
       }).subscribe({
         next: value => {
@@ -281,6 +288,7 @@ describe("getOnboardingStatePolling", () => {
 
       onboardingStatePollingSubscription = getOnboardingStatePolling({
         deviceId: device.deviceId,
+        deviceName: null,
         pollingPeriodMs,
         safeGuardTimeoutMs: pollingPeriodMs * 10,
       }).subscribe({
@@ -310,6 +318,7 @@ describe("getOnboardingStatePolling", () => {
 
       onboardingStatePollingSubscription = getOnboardingStatePolling({
         deviceId: device.deviceId,
+        deviceName: null,
         pollingPeriodMs,
       }).subscribe({
         next: value => {
@@ -328,4 +337,29 @@ describe("getOnboardingStatePolling", () => {
       jest.advanceTimersByTime(pollingPeriodMs - 1);
     });
   });
+
+  describe("When deviceName is provided", () => {
+    it("should pass deviceName to withDevice", done => {
+      mockedGetVersion.mockResolvedValue(aFirmwareInfo);
+      mockedExtractOnboardingState.mockReturnValue(anOnboardingState);
+
+      const device = aDevice;
+
+      getOnboardingStatePolling({
+        deviceId: device.deviceId,
+        deviceName: "My Device",
+        pollingPeriodMs,
+      }).subscribe({
+        next: () => {
+          expect(mockedWithDevice).toHaveBeenCalledWith(
+            device.deviceId,
+            expect.objectContaining({ matchDeviceByName: "My Device" }),
+          );
+          done();
+        },
+      });
+
+      jest.advanceTimersByTime(pollingPeriodMs - 1);
+    });
+  });
 });

package/src/hw/getOnboardingStatePolling.ts

@@ -28,6 +28,7 @@ export type GetOnboardingStatePollingResult = Observable<OnboardingStatePollingR
 
 export type GetOnboardingStatePollingArgs = {
   deviceId: string;
+  deviceName: string | null;
   pollingPeriodMs: number;
   transportAbortTimeoutMs?: number;
   safeGuardTimeoutMs?: number;
@@ -51,15 +52,17 @@ export type GetOnboardingStatePollingArgs = {
  */
 export const getOnboardingStatePolling = ({
   deviceId,
+  deviceName,
   pollingPeriodMs,
   transportAbortTimeoutMs = pollingPeriodMs - 100,
   safeGuardTimeoutMs = pollingPeriodMs * 10, // Nb Empirical value
   allowedErrorChecks = [],
 }: GetOnboardingStatePollingArgs): GetOnboardingStatePollingResult => {
   const getOnboardingStateOnce = (): Observable<OnboardingStatePollingResult> => {
-    return withDevice(deviceId, { openTimeoutMs: transportAbortTimeoutMs })(t =>
-      from(getVersion(t, { abortTimeoutMs: transportAbortTimeoutMs })),
-    ).pipe(
+    return withDevice(deviceId, {
+      openTimeoutMs: transportAbortTimeoutMs,
+      matchDeviceByName: deviceName ?? undefined,
+    })(t => from(getVersion(t, { abortTimeoutMs: transportAbortTimeoutMs }))).pipe(
       timeout(safeGuardTimeoutMs), // Throws a TimeoutError
       first(),
       catchError((error: unknown) => {

package/src/hw/hooks/useGenuineCheck.test.ts

@@ -37,6 +37,7 @@ describe("useGenuineCheck", () => {
         useGenuineCheck({
           getGenuineCheckFromDeviceId: mockedGetGenuineCheckFromDeviceId,
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
         }),
       );
 
@@ -60,6 +61,7 @@ describe("useGenuineCheck", () => {
         useGenuineCheck({
           getGenuineCheckFromDeviceId: mockedGetGenuineCheckFromDeviceId,
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
         }),
       );
 
@@ -80,6 +82,7 @@ describe("useGenuineCheck", () => {
         useGenuineCheck({
           getGenuineCheckFromDeviceId: mockedGetGenuineCheckFromDeviceId,
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
         }),
       );
 
@@ -102,6 +105,7 @@ describe("useGenuineCheck", () => {
         useGenuineCheck({
           getGenuineCheckFromDeviceId: mockedGetGenuineCheckFromDeviceId,
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
         }),
       );
 
@@ -127,6 +131,7 @@ describe("useGenuineCheck", () => {
           useGenuineCheck({
             getGenuineCheckFromDeviceId: mockedGetGenuineCheckFromDeviceId,
             deviceId: "A_DEVICE_ID",
+            deviceName: null,
           }),
         );
 
@@ -151,6 +156,7 @@ describe("useGenuineCheck", () => {
           useGenuineCheck({
             getGenuineCheckFromDeviceId: mockedGetGenuineCheckFromDeviceId,
             deviceId: "A_DEVICE_ID",
+            deviceName: null,
           }),
         );
 
@@ -185,6 +191,7 @@ describe("useGenuineCheck", () => {
           getGenuineCheckFromDeviceId: mockedGetGenuineCheckFromDeviceId,
           isHookEnabled: true,
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
         }),
       );
 
@@ -220,6 +227,7 @@ describe("useGenuineCheck", () => {
         useGenuineCheck({
           getGenuineCheckFromDeviceId: mockedGetGenuineCheckFromDeviceId,
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
         }),
       );
 
@@ -250,6 +258,7 @@ describe("useGenuineCheck", () => {
         useGenuineCheck({
           getGenuineCheckFromDeviceId: mockedGetGenuineCheckFromDeviceId,
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
           permissionTimeoutMs,
         }),
       );
@@ -288,6 +297,7 @@ describe("useGenuineCheck", () => {
         useGenuineCheck({
           getGenuineCheckFromDeviceId: mockedGetGenuineCheckFromDeviceId,
           deviceId: "A_DEVICE_ID",
+          deviceName: null,
         }),
       );
 
@@ -300,4 +310,31 @@ describe("useGenuineCheck", () => {
       expect(result.current.error).toBeNull();
     });
   });
+
+  describe("When deviceName is provided", () => {
+    it("should pass deviceName to getGenuineCheckFromDeviceId", async () => {
+      const mockGetGenuineCheck = jest.fn().mockReturnValue(
+        of({
+          socketEvent: { type: "device-permission-granted" },
+          lockedDevice: false,
+        }),
+      );
+
+      renderHook(() =>
+        useGenuineCheck({
+          getGenuineCheckFromDeviceId: mockGetGenuineCheck,
+          deviceId: "A_DEVICE_ID",
+          deviceName: "My Device",
+        }),
+      );
+
+      await act(async () => {
+        jest.advanceTimersByTime(1);
+      });
+
+      expect(mockGetGenuineCheck).toHaveBeenCalledWith(
+        expect.objectContaining({ deviceName: "My Device" }),
+      );
+    });
+  });
 });

package/src/hw/hooks/useGenuineCheck.ts

@@ -22,6 +22,7 @@ export type DevicePermissionState =
 export type UseGenuineCheckArgs = {
   isHookEnabled?: boolean;
   deviceId: DeviceId;
+  deviceName: string | null;
   lockedDeviceTimeoutMs?: number;
   permissionTimeoutMs?: number;
 };
@@ -70,6 +71,7 @@ export const useGenuineCheck = ({
   getGenuineCheckFromDeviceId = defaultGetGenuineCheckFromDeviceId,
   isHookEnabled = true,
   deviceId,
+  deviceName,
   lockedDeviceTimeoutMs = 1000,
   permissionTimeoutMs = 60 * 1000,
 }: UseGenuineCheckArgs & UseGenuineCheckDependencies): UseGenuineCheckResult => {
@@ -92,6 +94,7 @@ export const useGenuineCheck = ({
 
     const sub = getGenuineCheckFromDeviceId({
       deviceId,
+      deviceName,
       lockedDeviceTimeoutMs,
     }).subscribe({
       next: ({ socketEvent, lockedDevice }: GetGenuineCheckFromDeviceIdResult) => {
@@ -146,6 +149,7 @@ export const useGenuineCheck = ({
   }, [
     isHookEnabled,
     deviceId,
+    deviceName,
     lockedDeviceTimeoutMs,
     getGenuineCheckFromDeviceId,
     permissionTimeoutMs,

package/src/hw/index.test.ts

@@ -9,7 +9,7 @@ describe("open", () => {
     it("should reject with a CantOpenDevice error", async () => {
       registerTransportModule({
         id: "test_0",
-        open: (_id: string, _timeoutMs?: number) => {
+        open: (_id: string, _timeoutMs?: number, _context?, _matchDeviceByName?: string) => {
           // Handles no device
           return null;
         },
@@ -27,7 +27,7 @@ describe("open", () => {
     it("should return the associated opened Transport instance", async () => {
       registerTransportModule({
         id: "test_1",
-        open: (id: string, _timeoutMs?: number) => {
+        open: (id: string, _timeoutMs?: number, _context?, _matchDeviceByName?: string) => {
           // Filters on this current test
           if (id !== "device_1") return null;
 
@@ -47,7 +47,7 @@ describe("open", () => {
     it("should reject with an error on timeout", async () => {
       registerTransportModule({
         id: "test_2",
-        open: (id: string, timeoutMs?: number) => {
+        open: (id: string, timeoutMs?: number, _context?, _matchDeviceByName?: string) => {
           // Filters on this current test
           if (id !== "device_2") return null;
 
@@ -63,7 +63,7 @@ describe("open", () => {
 
       const timeoutMs = 1000;
 
-      const openPromise = open("device_2", timeoutMs);
+      const openPromise = open("device_2", { openTimeoutMs: timeoutMs });
       jest.advanceTimersByTime(timeoutMs);
       await expect(openPromise).rejects.toBeInstanceOf(CantOpenDevice);
     });
@@ -71,7 +71,7 @@ describe("open", () => {
     test("And the Transport/module implementation timeouts before open, it should still reject with an error", async () => {
       registerTransportModule({
         id: "test_3",
-        open: (id: string, timeoutMs?: number) => {
+        open: (id: string, timeoutMs?: number, _context?, _matchDeviceByName?: string) => {
           // Filters on this current test
           if (id !== "device_3") return null;
 
@@ -88,10 +88,31 @@ describe("open", () => {
 
       const timeoutMs = 1000;
 
-      const openPromise = open("device_3", timeoutMs);
+      const openPromise = open("device_3", { openTimeoutMs: timeoutMs });
       // Advances time after the implementation timeout but before the `open` timeout
       jest.advanceTimersByTime(timeoutMs - 100);
       await expect(openPromise).rejects.toBeInstanceOf(TransportError);
     });
   });
+
+  describe("When matchDeviceByName is provided", () => {
+    it("should pass matchDeviceByName to the transport module open function", async () => {
+      const mockOpen = jest.fn(
+        (_id: string, _timeoutMs?: number, _context?, _matchDeviceByName?: string) => {
+          return Promise.resolve(aTransportBuilder());
+        },
+      );
+
+      registerTransportModule({
+        id: "test_4",
+        open: mockOpen,
+        disconnect: (_id: string) => {
+          return Promise.resolve();
+        },
+      });
+
+      await open("device_4", { matchDeviceByName: "My Device" });
+      expect(mockOpen).toHaveBeenCalledWith("device_4", undefined, undefined, "My Device");
+    });
+  });
 });

package/src/hw/index.ts

@@ -17,6 +17,7 @@ export type DeviceEvent = {
 };
 
 export type Discovery = Observable<DeviceEvent>;
+
 // NB open/close/disconnect semantic will have to be refined...
 export type TransportModule = {
   // unique transport name that identify the transport module
@@ -35,6 +36,7 @@ export type TransportModule = {
     id: string,
     timeoutMs?: number,
     context?: TraceContext,
+    matchDeviceByName?: string,
   ) => Promise<Transport> | null | undefined;
   // here, close means we want to STOP doing something with the transport
   close?: (transport: Transport, id: string) => Promise<void> | null | undefined;
@@ -88,6 +90,11 @@ export const discoverDevices = (
   );
 };
 
+export type OpenOptions = {
+  openTimeoutMs?: number;
+  matchDeviceByName?: string;
+};
+
 /**
  * Tries to call `open` on the 1st matching registered transport implementation
  *
@@ -109,7 +116,7 @@ export const discoverDevices = (
  */
 export const open = (
   deviceId: string,
-  timeoutMs?: number,
+  options?: OpenOptions,
   context?: TraceContext,
 ): Promise<Transport> => {
   // The first registered Transport (TransportModule) accepting the given device will be returned.
@@ -117,16 +124,16 @@ export const open = (
   // A TransportModule can check the prefix of the device id to guess if it should use USB or not on LLM for ex.
   for (let i = 0; i < modules.length; i++) {
     const m = modules[i];
-    const p = m.open(deviceId, timeoutMs, context);
+    const p = m.open(deviceId, options?.openTimeoutMs, context, options?.matchDeviceByName);
     if (p) {
       trace({
         type: LOG_TYPE,
         message: `Found a matching Transport: ${m.id}`,
         context,
-        data: { timeoutMs },
+        data: { options },
       });
 
-      if (!timeoutMs) {
+      if (!options?.openTimeoutMs) {
         return p;
       }
 
@@ -144,18 +151,18 @@ export const open = (
 
           return transport;
         }),
-        new Promise((_resolve, reject) => {
+        new Promise<never>((_resolve, reject) => {
           timer = setTimeout(() => {
             trace({
               type: LOG_TYPE,
-              message: `Could not open registered transport ${m.id} on ${deviceId}, timed out after ${timeoutMs}ms`,
+              message: `Could not open registered transport ${m.id} on ${deviceId}, timed out after ${options?.openTimeoutMs}ms`,
               context,
             });
 
             return reject(new CantOpenDevice(`Timeout while opening device on transport ${m.id}`));
-          }, timeoutMs);
+          }, options?.openTimeoutMs);
         }),
-      ]) as Promise<Transport>;
+      ]);
     }
   }
   return Promise.reject(new CantOpenDevice(`Cannot find registered transport to open ${deviceId}`));

package/src/hw/installLanguage.ts

@@ -36,16 +36,21 @@ export type InstallLanguageEvent =
 export type InstallLanguageRequest = { language: Language };
 export type Input = {
   deviceId: string;
+  deviceName: string | null;
   request: InstallLanguageRequest;
 };
 
 export default function installLanguage({
   deviceId,
+  deviceName,
   request,
 }: Input): Observable<InstallLanguageEvent> {
   const { language } = request;
 
-  const sub = withDevice(deviceId)(
+  const sub = withDevice(
+    deviceId,
+    deviceName ? { matchDeviceByName: deviceName } : undefined,
+  )(
     transport =>
       new Observable(subscriber => {
         const timeoutSub = of<InstallLanguageEvent>({

package/src/market/hooks/useMarketDataProvider.ts

@@ -134,6 +134,7 @@ function combineMarketData(
   return {
     data: results.flatMap(result => result.data?.formattedData ?? []),
     isPending: results.some(result => result.isPending),
+    isFetching: results.some(result => result.isFetching),
     isLoading: results.some(result => result.isLoading),
     isError: results.some(result => result.isError),
     cachedMetadataMap: hashMap,

package/src/market/utils/types.ts

@@ -36,6 +36,7 @@ export type MarketListRequestResult = {
   isPending: boolean;
   isLoading: boolean;
   isError: boolean;
+  isFetching: boolean;
   cachedMetadataMap: Map<string, HashMapBody>;
 };
 

package/src/modularDrawer/hooks/__test__/useAssetAccountCounts.test.ts

@@ -12,7 +12,6 @@ describe("useNetworkAccountCounts", () => {
     const assetAccountCounts = useNetworkAccountCounts({
       networks: [ethereumCurrency],
       nestedAccounts: [ethereumAccountHigh],
-      accountIds: new Map([[ethereumAccountHigh.id, true]]),
       formatLabel: (count: number) => `${count}`,
     });
 
@@ -27,10 +26,6 @@ describe("useNetworkAccountCounts", () => {
     const assetAccountCounts = useNetworkAccountCounts({
       networks: [ethereumCurrency],
       nestedAccounts: [ethereumAccountHigh, ethereumAccountLow],
-      accountIds: new Map([
-        [ethereumAccountHigh.id, true],
-        [ethereumAccountLow.id, true],
-      ]),
       formatLabel: (count: number) => `${count}`,
     });
 

package/src/modularDrawer/hooks/useCurrenciesUnderFeatureFlag.ts

@@ -227,6 +227,8 @@ export function useCurrenciesUnderFeatureFlag() {
       mina,
       babylon,
       canton,
+      cantonDevnet,
+      cantonTestnet,
       kaspa,
       core,
       ethereumHoodi,

package/src/modularDrawer/hooks/useNetworkAccountCounts.tsx

@@ -1,15 +1,11 @@
-import { Observable } from "rxjs";
 import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { getAccountTuplesForCurrency } from "../../utils/getAccountTuplesForCurrency";
 import type { Account } from "@ledgerhq/types-live";
-import { WalletAPIAccount } from "../../wallet-api/types";
 
 type AccountModuleParams = {
   networks: CryptoOrTokenCurrency[];
   nestedAccounts: Account[];
-  accountIds: Map<string, boolean> | undefined;
   formatLabel: (count: number) => string;
-  accounts$?: Observable<WalletAPIAccount[]>;
 };
 
 export type NetworkCountItem = {
@@ -21,12 +17,11 @@ export type NetworkCountItem = {
 export const useNetworkAccountCounts = ({
   networks,
   nestedAccounts,
-  accountIds,
   formatLabel,
 }: AccountModuleParams): NetworkCountItem[] =>
   networks.map(network => {
     const asset = network.type === "TokenCurrency" ? network.parentCurrency : network;
-    const { length } = getAccountTuplesForCurrency(asset, nestedAccounts, accountIds);
+    const { length } = getAccountTuplesForCurrency(asset, nestedAccounts);
     return {
       asset,
       label: formatLabel(length),

package/src/modularDrawer/modules/__test__/createAssetConfiguration.test.tsx

@@ -5,7 +5,7 @@
 import React from "react";
 import { renderHook } from "@testing-library/react";
 import { mockEthCryptoCurrency } from "../../__mocks__/currencies.mock";
-import { groupCurrenciesByProvider } from "../../utils";
+import { groupCurrenciesByAsset } from "../../utils";
 import createAssetConfigurationHook from "../createAssetConfiguration";
 import { BigNumber } from "bignumber.js";
 import { genAccount, genTokenAccount } from "@ledgerhq/coin-framework/lib/mocks/account";
@@ -114,7 +114,7 @@ const assetConfigurationDeps = {
   ApyIndicator,
   MarketPercentIndicator,
   MarketPriceIndicator,
-  assetsMap: groupCurrenciesByProvider([
+  assetsMap: groupCurrenciesByAsset([
     {
       asset: {
         id: "ethereum",

package/src/modularDrawer/modules/createNetworkConfiguration.ts

@@ -78,7 +78,7 @@ const sortNetworks = (
 
 export const createNetworkConfigurationHook =
   (NetworkConfigurationDeps: NetworkConfigurationDeps) =>
-  ({ networksConfig, accounts$ }: CreateNetworkConfigurationHookProps) => {
+  ({ networksConfig }: CreateNetworkConfigurationHookProps) => {
     const { leftElement, rightElement } = networksConfig ?? {};
     const leftHook = getLeftElement(NetworkConfigurationDeps)(leftElement);
     const rightHook = getRightElement(NetworkConfigurationDeps)(rightElement);
@@ -90,7 +90,6 @@ export const createNetworkConfigurationHook =
     ): Array<CryptoOrTokenCurrency & Network & { balanceData?: BalanceUI; count?: number }> => {
       const hookResults = hooks.map(hook =>
         hook({
-          accounts$,
           networks,
         }),
       );

package/src/modularDrawer/utils/__tests__/{groupCurrenciesByProvider.test.ts → groupCurrenciesByAsset.test.ts}

@@ -1,4 +1,4 @@
-import { groupCurrenciesByProvider } from "../groupCurrenciesByProvider";
+import { groupCurrenciesByAsset } from "../groupCurrenciesByAsset";
 import { AssetData } from "../type";
 import {
   mockBtcCryptoCurrency,
@@ -6,9 +6,9 @@ import {
   mockBaseCryptoCurrency,
 } from "../../__mocks__/currencies.mock";
 
-describe("groupCurrenciesByProvider", () => {
+describe("groupCurrenciesByAsset", () => {
   it("should return an empty map when given an empty array", () => {
-    const result = groupCurrenciesByProvider([]);
+    const result = groupCurrenciesByAsset([]);
     expect(result).toBeInstanceOf(Map);
     expect(result.size).toBe(0);
   });
@@ -26,7 +26,7 @@ describe("groupCurrenciesByProvider", () => {
       },
     ];
 
-    const result = groupCurrenciesByProvider(assetData);
+    const result = groupCurrenciesByAsset(assetData);
     expect(result.size).toBe(0);
   });
 
@@ -43,7 +43,7 @@ describe("groupCurrenciesByProvider", () => {
       },
     ];
 
-    const result = groupCurrenciesByProvider(assetData);
+    const result = groupCurrenciesByAsset(assetData);
     expect(result.size).toBe(1);
     expect(result.has("ethereum")).toBe(true);
 
@@ -74,7 +74,7 @@ describe("groupCurrenciesByProvider", () => {
       },
     ];
 
-    const result = groupCurrenciesByProvider(assetData);
+    const result = groupCurrenciesByAsset(assetData);
     expect(result.size).toBe(2);
     expect(result.has("bitcoin")).toBe(true);
     expect(result.has("ethereum")).toBe(true);

package/src/modularDrawer/utils/{groupCurrenciesByProvider.ts → groupCurrenciesByAsset.ts}

@@ -1,7 +1,7 @@
 import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { AssetData } from "./type";
 
-export const groupCurrenciesByProvider = (assetsSorted: AssetData[]) => {
+export const groupCurrenciesByAsset = (assetsSorted: AssetData[]) => {
   const assetMap = new Map<
     string,
     { mainCurrency: CryptoOrTokenCurrency; currencies: CryptoOrTokenCurrency[] }
@@ -10,12 +10,12 @@ export const groupCurrenciesByProvider = (assetsSorted: AssetData[]) => {
   if (assetsSorted) {
     for (const item of assetsSorted) {
       const {
-        asset: { id: providerId },
+        asset: { id: assetId },
         networks = [],
       } = item;
       if (networks?.length > 0) {
-        const mainCurrency = networks.find(c => c.id === providerId) ?? networks[0];
-        assetMap.set(providerId, {
+        const mainCurrency = networks.find(c => c.id === assetId) ?? networks[0];
+        assetMap.set(assetId, {
           mainCurrency,
           currencies: networks,
         });

package/src/modularDrawer/utils/index.ts

@@ -1,5 +1,5 @@
 import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
-export { groupCurrenciesByProvider } from "./groupCurrenciesByProvider";
+export { groupCurrenciesByAsset } from "./groupCurrenciesByAsset";
 export { sortAccountsByFiatValue } from "./sortAccountsByFiatValue";
 
 const getBaseId = (currency: CryptoOrTokenCurrency) =>

package/src/modularDrawer/utils/type.ts

@@ -2,8 +2,6 @@ import { CounterValuesState } from "@ledgerhq/live-countervalues/lib/types";
 import { CryptoOrTokenCurrency, Currency, Unit } from "@ledgerhq/types-cryptoassets";
 import { AccountLike } from "@ledgerhq/types-live";
 import { ReactNode } from "react";
-import { Observable } from "rxjs";
-import { WalletAPIAccount } from "../../wallet-api/types";
 import { EnhancedModularDrawerConfiguration } from "../../wallet-api/ModularDrawer/types";
 import { InterestRate } from "../../dada-client/entities";
 import { MarketItemResponse } from "../../market/utils/types";
@@ -71,7 +69,6 @@ export type AccountDataItem = {
 
 export type AccountModuleParams = {
   networks: CryptoOrTokenCurrency[];
-  accounts$?: Observable<WalletAPIAccount[]>;
 };
 
 export type CreateAccountsCount = (args: { label: string }) => ReactNode;
@@ -80,7 +77,6 @@ export type UseAccountData = (params: AccountModuleParams) => AccountDataItem[];
 
 export type NetworkHookParams = {
   networks: CryptoOrTokenCurrency[];
-  accounts$?: Observable<WalletAPIAccount[]>;
 };
 // Network hook type that returns additional properties to be merged with currencies
 export type NetworkHook = (params: NetworkHookParams) => Array<{
@@ -111,7 +107,6 @@ export type Network = {
 
 export type CreateNetworkConfigurationHookProps = {
   networksConfig: EnhancedModularDrawerConfiguration["networks"];
-  accounts$?: Observable<WalletAPIAccount[]>;
 };
 
 type Props = {