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

package/lib-es/wallet-api/utils/deriveAccountIdForManifest.d.ts

@@ -1,6 +1,12 @@
 import { Account as WalletAPIAccount } from "@ledgerhq/wallet-api-core";
 import { TokenAccount, Account, AccountLike } from "@ledgerhq/types-live";
 import { LiveAppManifest } from "../../platform/types";
+/**
+ * Determines if a manifest uses (Ledger Live) account ID format or UUID (Wallet API) format.
+ * @param manifest - The live app manifest to check
+ * @returns true if the manifest uses encoded format (v3+ dapp), false otherwise
+ */
+export declare function usesEncodedAccountIdFormat(manifest: LiveAppManifest): boolean;
 /** The dapp connector "v3" uses the ledger live account ID to find the correct account. Live app and dapp browser manifests require wallet API ID.   */
 export declare function deriveAccountIdForManifest(accountId: Account["id"] | TokenAccount["id"] | AccountLike["id"], walletApiAccountId: WalletAPIAccount["id"] | string, manifest: LiveAppManifest): string;
 //# sourceMappingURL=deriveAccountIdForManifest.d.ts.map

package/lib-es/wallet-api/utils/deriveAccountIdForManifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deriveAccountIdForManifest.d.ts","sourceRoot":"","sources":["../../../src/wallet-api/utils/deriveAccountIdForManifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,wJAAwJ;AACxJ,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,EACjE,kBAAkB,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,MAAM,EACnD,QAAQ,EAAE,eAAe,UAQ1B"}
+{"version":3,"file":"deriveAccountIdForManifest.d.ts","sourceRoot":"","sources":["../../../src/wallet-api/utils/deriveAccountIdForManifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAM7E;AAED,wJAAwJ;AACxJ,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,EACjE,kBAAkB,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,MAAM,EACnD,QAAQ,EAAE,eAAe,UAO1B"}

package/lib-es/wallet-api/utils/deriveAccountIdForManifest.js

@@ -1,9 +1,18 @@
 import { WALLET_API_VERSION } from "../../wallet-api/constants";
 import semver from "semver";
+/**
+ * Determines if a manifest uses (Ledger Live) account ID format or UUID (Wallet API) format.
+ * @param manifest - The live app manifest to check
+ * @returns true if the manifest uses encoded format (v3+ dapp), false otherwise
+ */
+export function usesEncodedAccountIdFormat(manifest) {
+    return ("dapp" in manifest &&
+        !!manifest.apiVersion &&
+        semver.satisfies(WALLET_API_VERSION, manifest.apiVersion));
+}
 /** The dapp connector "v3" uses the ledger live account ID to find the correct account. Live app and dapp browser manifests require wallet API ID.   */
 export function deriveAccountIdForManifest(accountId, walletApiAccountId, manifest) {
-    const isDapp = "dapp" in manifest;
-    if (isDapp && manifest.apiVersion && semver.satisfies(WALLET_API_VERSION, manifest.apiVersion)) {
+    if (usesEncodedAccountIdFormat(manifest)) {
         return accountId;
     }
     /** Assume dapp browser <=v2 or live app, fallback to wallet ID.   */

package/lib-es/wallet-api/utils/deriveAccountIdForManifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"deriveAccountIdForManifest.js","sourceRoot":"","sources":["../../../src/wallet-api/utils/deriveAccountIdForManifest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAGhE,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,wJAAwJ;AACxJ,MAAM,UAAU,0BAA0B,CACxC,SAAiE,EACjE,kBAAmD,EACnD,QAAyB;IAEzB,MAAM,MAAM,GAAG,MAAM,IAAI,QAAQ,CAAC;IAClC,IAAI,MAAM,IAAI,QAAQ,CAAC,UAAU,IAAI,MAAM,CAAC,SAAS,CAAC,kBAAkB,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE;QAC9F,OAAO,SAAS,CAAC;KAClB;IACD,qEAAqE;IACrE,OAAO,kBAAkB,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"deriveAccountIdForManifest.js","sourceRoot":"","sources":["../../../src/wallet-api/utils/deriveAccountIdForManifest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAGhE,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B;;;;GAIG;AACH,MAAM,UAAU,0BAA0B,CAAC,QAAyB;IAClE,OAAO,CACL,MAAM,IAAI,QAAQ;QAClB,CAAC,CAAC,QAAQ,CAAC,UAAU;QACrB,MAAM,CAAC,SAAS,CAAC,kBAAkB,EAAE,QAAQ,CAAC,UAAU,CAAC,CAC1D,CAAC;AACJ,CAAC;AAED,wJAAwJ;AACxJ,MAAM,UAAU,0BAA0B,CACxC,SAAiE,EACjE,kBAAmD,EACnD,QAAyB;IAEzB,IAAI,0BAA0B,CAAC,QAAQ,CAAC,EAAE;QACxC,OAAO,SAAS,CAAC;KAClB;IACD,qEAAqE;IACrE,OAAO,kBAAkB,CAAC;AAC5B,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.53.0-nightly.20251118023800",
+  "version": "34.53.0-nightly.20251119023741",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -168,79 +168,79 @@
     "xstate": "^5.19.2",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.13.0-nightly.20251118023800",
-    "@ledgerhq/coin-aptos": "^3.6.0-nightly.20251118023800",
-    "@ledgerhq/coin-bitcoin": "^0.25.0-nightly.20251118023800",
-    "@ledgerhq/coin-cardano": "^0.15.0-nightly.20251118023800",
-    "@ledgerhq/coin-canton": "^0.10.0-nightly.20251118023800",
-    "@ledgerhq/coin-casper": "^2.3.1-nightly.20251118023800",
-    "@ledgerhq/coin-celo": "^1.7.1-nightly.20251118023800",
-    "@ledgerhq/coin-cosmos": "^0.20.0-nightly.20251118023800",
-    "@ledgerhq/coin-evm": "^2.35.0-nightly.20251118023800",
-    "@ledgerhq/coin-filecoin": "^1.15.0-nightly.20251118023800",
-    "@ledgerhq/coin-framework": "^6.9.0-nightly.20251118023800",
-    "@ledgerhq/coin-hedera": "^1.14.0-nightly.20251118023800",
-    "@ledgerhq/coin-icon": "^0.15.0-nightly.20251118023800",
-    "@ledgerhq/coin-internet_computer": "^1.10.1-nightly.20251118023800",
-    "@ledgerhq/coin-kaspa": "^1.4.1-nightly.20251118023800",
-    "@ledgerhq/coin-mina": "^1.4.1-nightly.20251118023800",
-    "@ledgerhq/coin-multiversx": "^0.8.0-nightly.20251118023800",
-    "@ledgerhq/coin-near": "^0.16.0-nightly.20251118023800",
-    "@ledgerhq/coin-polkadot": "^6.13.0-nightly.20251118023800",
-    "@ledgerhq/coin-solana": "^0.37.0-nightly.20251118023800",
-    "@ledgerhq/coin-stacks": "^0.12.0-nightly.20251118023800",
-    "@ledgerhq/coin-stellar": "^6.7.0-nightly.20251118023800",
-    "@ledgerhq/coin-sui": "^0.18.0-nightly.20251118023800",
-    "@ledgerhq/coin-tezos": "^6.9.0-nightly.20251118023800",
-    "@ledgerhq/coin-ton": "^0.17.0-nightly.20251118023800",
-    "@ledgerhq/coin-vechain": "^2.12.1-nightly.20251118023800",
-    "@ledgerhq/coin-tron": "^5.7.0-nightly.20251118023800",
-    "@ledgerhq/crypto-icons-ui": "^1.23.0-nightly.20251118023800",
-    "@ledgerhq/coin-xrp": "^7.8.0-nightly.20251118023800",
-    "@ledgerhq/cryptoassets": "^13.33.0-nightly.20251118023800",
-    "@ledgerhq/device-core": "^0.6.8-nightly.20251118023800",
+    "@ledgerhq/coin-algorand": "^0.13.0-nightly.20251119023741",
+    "@ledgerhq/coin-aptos": "^3.6.0-nightly.20251119023741",
+    "@ledgerhq/coin-bitcoin": "^0.25.0-nightly.20251119023741",
+    "@ledgerhq/coin-canton": "^0.10.0-nightly.20251119023741",
+    "@ledgerhq/coin-cardano": "^0.15.0-nightly.20251119023741",
+    "@ledgerhq/coin-casper": "^2.3.1-nightly.20251119023741",
+    "@ledgerhq/coin-celo": "^1.7.1-nightly.20251119023741",
+    "@ledgerhq/coin-cosmos": "^0.20.0-nightly.20251119023741",
+    "@ledgerhq/coin-evm": "^2.35.0-nightly.20251119023741",
+    "@ledgerhq/coin-filecoin": "^1.15.0-nightly.20251119023741",
+    "@ledgerhq/coin-framework": "^6.9.0-nightly.20251119023741",
+    "@ledgerhq/coin-hedera": "^1.14.0-nightly.20251119023741",
+    "@ledgerhq/coin-icon": "^0.15.0-nightly.20251119023741",
+    "@ledgerhq/coin-internet_computer": "^1.10.1-nightly.20251119023741",
+    "@ledgerhq/coin-kaspa": "^1.4.1-nightly.20251119023741",
+    "@ledgerhq/coin-mina": "^1.4.1-nightly.20251119023741",
+    "@ledgerhq/coin-multiversx": "^0.8.0-nightly.20251119023741",
+    "@ledgerhq/coin-near": "^0.16.0-nightly.20251119023741",
+    "@ledgerhq/coin-polkadot": "^6.13.0-nightly.20251119023741",
+    "@ledgerhq/coin-solana": "^0.37.0-nightly.20251119023741",
+    "@ledgerhq/coin-stacks": "^0.12.0-nightly.20251119023741",
+    "@ledgerhq/coin-stellar": "^6.7.0-nightly.20251119023741",
+    "@ledgerhq/coin-sui": "^0.18.0-nightly.20251119023741",
+    "@ledgerhq/coin-tezos": "^6.9.0-nightly.20251119023741",
+    "@ledgerhq/coin-ton": "^0.17.0-nightly.20251119023741",
+    "@ledgerhq/coin-tron": "^5.7.0-nightly.20251119023741",
+    "@ledgerhq/coin-vechain": "^2.12.1-nightly.20251119023741",
+    "@ledgerhq/coin-xrp": "^7.8.0-nightly.20251119023741",
+    "@ledgerhq/crypto-icons-ui": "^1.23.0-nightly.20251119023741",
+    "@ledgerhq/cryptoassets": "^13.33.0-nightly.20251119023741",
+    "@ledgerhq/device-core": "^0.6.8-nightly.20251119023741",
     "@ledgerhq/devices": "8.7.0",
     "@ledgerhq/errors": "^6.27.0",
     "@ledgerhq/hw-app-algorand": "^6.31.9",
     "@ledgerhq/hw-app-aptos": "^6.34.9",
     "@ledgerhq/hw-app-btc": "^10.12.0",
-    "@ledgerhq/hw-app-celo": "^6.35.3-nightly.20251118023800",
-    "@ledgerhq/hw-app-eth": "^6.47.1-nightly.20251118023800",
+    "@ledgerhq/hw-app-celo": "^6.35.3-nightly.20251119023741",
     "@ledgerhq/hw-app-cosmos": "^6.32.9",
+    "@ledgerhq/hw-app-eth": "^6.47.1-nightly.20251119023741",
     "@ledgerhq/hw-app-exchange": "^0.17.0",
     "@ledgerhq/hw-app-hedera": "^1.2.9",
-    "@ledgerhq/hw-app-kaspa": "^1.3.2",
     "@ledgerhq/hw-app-icon": "^1.3.9",
+    "@ledgerhq/hw-app-kaspa": "^1.3.2",
     "@ledgerhq/hw-app-multiversx": "^6.26.0",
     "@ledgerhq/hw-app-near": "^6.31.9",
     "@ledgerhq/hw-app-polkadot": "^6.34.9",
     "@ledgerhq/hw-app-str": "^7.2.9",
-    "@ledgerhq/hw-app-tezos": "^6.31.9",
     "@ledgerhq/hw-app-sui": "^1.4.0",
+    "@ledgerhq/hw-app-tezos": "^6.31.9",
     "@ledgerhq/hw-app-trx": "^6.31.9",
-    "@ledgerhq/hw-app-vet": "^0.7.0",
+    "@ledgerhq/hw-app-vet": "^0.8.0-nightly.20251119023741",
     "@ledgerhq/hw-app-xrp": "^6.32.7",
     "@ledgerhq/hw-bolos": "^6.32.9",
     "@ledgerhq/hw-transport": "6.31.13",
     "@ledgerhq/hw-transport-mocker": "^6.29.13",
-    "@ledgerhq/ledger-trust-service": "^0.4.2-nightly.20251118023800",
+    "@ledgerhq/ledger-cal-service": "^1.9.0-nightly.20251119023741",
+    "@ledgerhq/ledger-trust-service": "^0.4.2-nightly.20251119023741",
     "@ledgerhq/live-config": "^3.2.0",
-    "@ledgerhq/live-countervalues": "^0.10.0-nightly.20251118023800",
-    "@ledgerhq/live-countervalues-react": "^0.7.2-nightly.20251118023800",
-    "@ledgerhq/ledger-cal-service": "^1.9.0-nightly.20251118023800",
+    "@ledgerhq/live-countervalues": "^0.10.0-nightly.20251119023741",
+    "@ledgerhq/live-countervalues-react": "^0.7.2-nightly.20251119023741",
     "@ledgerhq/live-dmk-shared": "^0.15.0",
-    "@ledgerhq/live-env": "^2.21.0-nightly.20251118023800",
+    "@ledgerhq/live-env": "^2.21.0-nightly.20251119023741",
     "@ledgerhq/live-hooks": "0.2.0",
-    "@ledgerhq/live-network": "^2.1.1-nightly.20251118023800",
+    "@ledgerhq/live-network": "^2.1.1-nightly.20251119023741",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-canton": "^0.5.1-nightly.20251118023800",
-    "@ledgerhq/live-signer-evm": "^0.10.1-nightly.20251118023800",
-    "@ledgerhq/live-signer-solana": "^0.6.1-nightly.20251118023800",
-    "@ledgerhq/live-wallet": "^0.16.0-nightly.20251118023800",
+    "@ledgerhq/live-signer-canton": "^0.5.1-nightly.20251119023741",
+    "@ledgerhq/live-signer-evm": "^0.10.1-nightly.20251119023741",
+    "@ledgerhq/live-signer-solana": "^0.6.1-nightly.20251119023741",
+    "@ledgerhq/live-wallet": "^0.16.0-nightly.20251119023741",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/speculos-transport": "^0.2.15-nightly.20251118023800",
-    "@ledgerhq/wallet-api-acre-module": "^0.10.0-nightly.20251118023800",
-    "@ledgerhq/wallet-api-exchange-module": "^0.19.0-nightly.20251118023800"
+    "@ledgerhq/speculos-transport": "^0.2.15-nightly.20251119023741",
+    "@ledgerhq/wallet-api-acre-module": "^0.10.0-nightly.20251119023741",
+    "@ledgerhq/wallet-api-exchange-module": "^0.19.0-nightly.20251119023741"
   },
   "devDependencies": {
     "@solana/web3.js": "1.95.4",
@@ -277,8 +277,8 @@
     "nock": "^13.0.5",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-native": "0.77.2",
-    "react-native-svg": "15.11.2",
+    "react-native": "0.77.3",
+    "react-native-svg": "15.12.1",
     "react-test-renderer": "18.3.1",
     "redux-actions": "2.6.5",
     "timemachine": "^0.3.2",
@@ -288,10 +288,10 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "7",
-    "@ledgerhq/device-react": "^0.3.2-nightly.20251118023800",
+    "@ledgerhq/device-react": "^0.3.2-nightly.20251119023741",
     "@ledgerhq/types-cryptoassets": "^7.30.0",
     "@ledgerhq/types-devices": "^6.27.0",
-    "@ledgerhq/types-live": "^6.89.0-nightly.20251118023800"
+    "@ledgerhq/types-live": "^6.89.0-nightly.20251119023741"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",

package/src/__tests__/test-helpers/bridge.ts

@@ -468,7 +468,6 @@ export function testBridge<T extends TransactionCommon>(data: DatasetTest<T>): v
               };
               const bridge = await getBridge();
               const synced = await syncAccount(bridge, copy);
-              if (initialAccountId.includes("ripple")) return; // ripple wont work because of the current implementation of pagination
               expect(synced.operations.length).toBe(account.operations.length);
               // same ops are restored
               expect(synced.operations).toEqual(account.operations);
@@ -481,7 +480,6 @@ export function testBridge<T extends TransactionCommon>(data: DatasetTest<T>): v
             });
             makeTest("pendingOperations are cleaned up", async () => {
               const account = await getSynced();
-              if (initialAccountId.includes("ripple")) return; // ripple wont work because of the current implementation of pagination
 
               if (account.operations.length) {
                 const operations = account.operations.slice(1);

package/src/bridge/generic-alpaca/getAccountShape.ts

@@ -1,4 +1,4 @@
-import { encodeAccountId } from "@ledgerhq/coin-framework/account/index";
+import { encodeAccountId, getSyncHash } from "@ledgerhq/coin-framework/account/index";
 import { GetAccountShape, mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
 import BigNumber from "bignumber.js";
@@ -8,6 +8,7 @@ import { inferSubOperations } from "@ledgerhq/coin-framework/serialization";
 import { buildSubAccounts, mergeSubAccounts } from "./buildSubAccounts";
 import type { Operation, Pagination } from "@ledgerhq/coin-framework/api/types";
 import type { OperationCommon } from "./types";
+import type { Account } from "@ledgerhq/types-live";
 
 function isNftCoreOp(operation: Operation): boolean {
   return (
@@ -52,14 +53,13 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
         : { ...op, accountId, id: encodeOperationId(accountId, op.hash, op.type) },
     );
     const lastPagingToken = oldOps[0]?.extra?.pagingToken || "";
+    const syncHash = await getSyncHash(currency.id, syncConfig.blacklistedTokenIds);
+    const syncFromScratch = !initialAccount?.blockHeight || initialAccount?.syncHash !== syncHash;
 
     // Calculate minHeight for pagination
-    let minHeight: number = 0;
-    if (oldOps.length > 0 && initialAccount?.blockHeight !== 0) {
-      minHeight = (oldOps[0].blockHeight ?? 0) + 1;
-    }
+    const minHeight = syncFromScratch ? 0 : (oldOps[0]?.blockHeight ?? 0) + 1;
     const paginationParams: Pagination = { minHeight, order: "asc" };
-    if (lastPagingToken) {
+    if (lastPagingToken && !syncFromScratch) {
       paginationParams.lastPagingToken = lastPagingToken;
     }
 
@@ -81,7 +81,9 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
       operations: newAssetOperations,
       getTokenFromAsset: alpacaApi.getTokenFromAsset,
     });
-    const subAccounts = mergeSubAccounts(initialAccount?.subAccounts ?? [], newSubAccounts);
+    const subAccounts = syncFromScratch
+      ? newSubAccounts
+      : mergeSubAccounts(initialAccount?.subAccounts ?? [], newSubAccounts);
 
     const newOpsWithSubs = newOps.map(op => {
       const subOperations = inferSubOperations(op.hash, newSubAccounts);
@@ -95,12 +97,12 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
       alpacaApi.refreshOperations && initialAccount?.pendingOperations.length
         ? await alpacaApi.refreshOperations(initialAccount.pendingOperations)
         : [];
-    const operations = mergeOps(oldOps, [
-      ...confirmedOperations,
-      ...newOpsWithSubs,
-    ]) as OperationCommon[];
+    const newOperations = [...confirmedOperations, ...newOpsWithSubs];
+    const operations = syncFromScratch
+      ? newOperations
+      : (mergeOps(oldOps, newOperations) as OperationCommon[]);
 
-    const res = {
+    const res: Partial<Account> = {
       id: accountId,
       xpub: address,
       blockHeight: operations.length === 0 ? 0 : blockInfo.height || initialAccount?.blockHeight,
@@ -109,6 +111,7 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
       operations,
       subAccounts,
       operationsCount: operations.length,
+      syncHash,
     };
     return res;
   };

package/src/bridge/generic-alpaca/tests/getAccountShape.test.ts

@@ -1,8 +1,10 @@
 import BigNumber from "bignumber.js";
 import { genericGetAccountShape } from "../getAccountShape";
 
+const getSyncHashMock = jest.fn();
 jest.mock("@ledgerhq/coin-framework/account/index", () => ({
   encodeAccountId: jest.fn(() => "accId"),
+  getSyncHash: (...args: any[]) => getSyncHashMock(...args),
 }));
 
 const mergeOpsMock = jest.fn();
@@ -63,105 +65,16 @@ describe("genericGetAccountShape", () => {
   });
 
   describe.each(chains)("$currency.id", ({ currency, network }) => {
-    test("builds account shape with existing operations, pagination and sub accounts", async () => {
-      const oldOp = {
-        hash: "h1",
-        blockHeight: 10,
-        type: "OPT_IN",
-        extra: { pagingToken: "pt1", assetReference: "ar1", assetOwner: "ow1" },
-      };
-      const pendingOp = {
-        hash: "h0",
-        blockHeight: 10,
-        type: "OUT",
-      };
-      const initialAccount = {
-        operations: [oldOp],
-        pendingOperations: [pendingOp],
-        blockHeight: 10,
-      };
-
-      extractBalanceMock.mockReturnValue({ value: "1000", locked: "300" });
-      getBalanceMock.mockResolvedValue([
-        { asset: { type: "native" }, value: "1000", locked: "300" },
-        { asset: { type: "token", symbol: "TOK1" }, value: "42" },
-        { asset: { type: "token", symbol: "TOK_IGNORE" }, value: "5" },
-      ]);
-
-      getTokenFromAssetMock.mockImplementation(asset =>
-        asset.symbol === "TOK1" ? { id: `${currency.id}_token1` } : null,
-      );
-
-      const coreOp = { hash: "h2", height: 12 };
-      listOperationsMock.mockResolvedValue([[coreOp]]);
-      refreshOperationsMock.mockImplementation(ops => {
-        const op = ops[0];
-        if (op?.hash === "h0") {
-          return [{ ...op, blockHeight: 12 }];
-        }
-        return [];
-      });
-
-      adaptCoreOperationToLiveOperationMock.mockImplementation((_accId, op) => ({
-        hash: op.hash,
-        type: "IN",
-        blockHeight: 12,
-        extra: { assetReference: "ar2", assetOwner: "ow2" },
-      }));
-
-      mergeOpsMock.mockImplementation((oldOps, newOps) => [...newOps, ...oldOps]);
-      cleanedOperationMock.mockImplementation(operation => operation);
-      mergeSubAccountsMock.mockImplementation((oldSubAccounts, newSubAccounts) => [
-        ...newSubAccounts,
-        ...oldSubAccounts,
-      ]);
-
-      buildSubAccountsMock.mockReturnValue([
-        { id: `${currency.id}_subAcc1`, type: "TokenAccount" },
-      ]);
-
-      inferSubOperationsMock.mockImplementation(hash =>
-        hash === "h2" ? [{ id: `${currency.id}_subOp1` }] : [],
-      );
-
-      lastBlockMock.mockResolvedValue({ height: 123 });
-
-      const getShape = genericGetAccountShape(network, currency.id);
-      const result = await getShape(
+    test.each([
+      [
+        "an up-to-date sync hash",
+        "sync-hash",
         {
-          address: `${currency.id}_addr1`,
-          initialAccount,
-          currency,
-          derivationMode: "",
-        } as any,
-        { paginationConfig: {} as any },
-      );
-
-      expect(chainSpecificGetAccountShapeMock).toHaveBeenCalledWith(`${currency.id}_addr1`);
-
-      expect(listOperationsMock).toHaveBeenCalledWith(`${currency.id}_addr1`, {
-        minHeight: 11,
-        order: "asc",
-        lastPagingToken: "pt1",
-      });
-
-      const assetsBalancePassed = buildSubAccountsMock.mock.calls[0][0].allTokenAssetsBalances;
-      expect(assetsBalancePassed).toEqual([
-        { asset: { symbol: "TOK1", type: "token" }, value: "42" },
-        { asset: { symbol: "TOK_IGNORE", type: "token" }, value: "5" },
-      ]);
-
-      const assetOpsPassed = buildSubAccountsMock.mock.calls[0][0].operations;
-      expect(assetOpsPassed).toHaveLength(1);
-      expect(assetOpsPassed[0].hash).toBe("h2");
-
-      expect(result).toMatchObject({
-        balance: new BigNumber(1000),
-        spendableBalance: new BigNumber(700),
-        blockHeight: 123,
-        operationsCount: 3,
-        subAccounts: [{ id: `${currency.id}_subAcc1`, type: "TokenAccount" }],
-        operations: [
+          minHeight: 11,
+          order: "asc",
+          lastPagingToken: "pt1",
+        },
+        [
           {
             hash: "h0",
             type: "OUT",
@@ -174,10 +87,138 @@ describe("genericGetAccountShape", () => {
             subOperations: [{ id: `${currency.id}_subOp1` }],
             extra: { assetReference: "ar2", assetOwner: "ow2" },
           },
-          oldOp,
+          {
+            hash: "h1",
+            blockHeight: 10,
+            type: "OPT_IN",
+            extra: { pagingToken: "pt1", assetReference: "ar1", assetOwner: "ow1" },
+          },
         ],
-      });
-    });
+      ],
+      [
+        "an outdated sync hash",
+        "outdated-sync-hash",
+        {
+          minHeight: 0,
+          order: "asc",
+        },
+        [
+          {
+            hash: "h0",
+            type: "OUT",
+            blockHeight: 12,
+          },
+          {
+            hash: "h2",
+            type: "IN",
+            blockHeight: 12,
+            subOperations: [{ id: `${currency.id}_subOp1` }],
+            extra: { assetReference: "ar2", assetOwner: "ow2" },
+          },
+        ],
+      ],
+    ])(
+      "builds account shape with existing operations, pagination and sub accounts from %s",
+      async (_s, syncHash, expectedPagination, expectedOperations) => {
+        const oldOp = {
+          hash: "h1",
+          blockHeight: 10,
+          type: "OPT_IN",
+          extra: { pagingToken: "pt1", assetReference: "ar1", assetOwner: "ow1" },
+        };
+        const pendingOp = {
+          hash: "h0",
+          blockHeight: 10,
+          type: "OUT",
+        };
+        const initialAccount = {
+          operations: [oldOp],
+          pendingOperations: [pendingOp],
+          blockHeight: 10,
+          syncHash,
+        };
+
+        getSyncHashMock.mockReturnValue("sync-hash");
+        extractBalanceMock.mockReturnValue({ value: "1000", locked: "300" });
+        getBalanceMock.mockResolvedValue([
+          { asset: { type: "native" }, value: "1000", locked: "300" },
+          { asset: { type: "token", symbol: "TOK1" }, value: "42" },
+          { asset: { type: "token", symbol: "TOK_IGNORE" }, value: "5" },
+        ]);
+
+        getTokenFromAssetMock.mockImplementation(asset =>
+          asset.symbol === "TOK1" ? { id: `${currency.id}_token1` } : null,
+        );
+
+        const coreOp = { hash: "h2", height: 12 };
+        listOperationsMock.mockResolvedValue([[coreOp]]);
+        refreshOperationsMock.mockImplementation(ops => {
+          const op = ops[0];
+          if (op?.hash === "h0") {
+            return [{ ...op, blockHeight: 12 }];
+          }
+          return [];
+        });
+
+        adaptCoreOperationToLiveOperationMock.mockImplementation((_accId, op) => ({
+          hash: op.hash,
+          type: "IN",
+          blockHeight: 12,
+          extra: { assetReference: "ar2", assetOwner: "ow2" },
+        }));
+
+        mergeOpsMock.mockImplementation((oldOps, newOps) => [...newOps, ...oldOps]);
+        cleanedOperationMock.mockImplementation(operation => operation);
+        mergeSubAccountsMock.mockImplementation((oldSubAccounts, newSubAccounts) => [
+          ...newSubAccounts,
+          ...oldSubAccounts,
+        ]);
+
+        buildSubAccountsMock.mockReturnValue([
+          { id: `${currency.id}_subAcc1`, type: "TokenAccount" },
+        ]);
+
+        inferSubOperationsMock.mockImplementation(hash =>
+          hash === "h2" ? [{ id: `${currency.id}_subOp1` }] : [],
+        );
+
+        lastBlockMock.mockResolvedValue({ height: 123 });
+
+        const getShape = genericGetAccountShape(network, currency.id);
+        const result = await getShape(
+          {
+            address: `${currency.id}_addr1`,
+            initialAccount,
+            currency,
+            derivationMode: "",
+          } as any,
+          { paginationConfig: {} as any },
+        );
+
+        expect(chainSpecificGetAccountShapeMock).toHaveBeenCalledWith(`${currency.id}_addr1`);
+
+        expect(listOperationsMock).toHaveBeenCalledWith(`${currency.id}_addr1`, expectedPagination);
+
+        const assetsBalancePassed = buildSubAccountsMock.mock.calls[0][0].allTokenAssetsBalances;
+        expect(assetsBalancePassed).toEqual([
+          { asset: { symbol: "TOK1", type: "token" }, value: "42" },
+          { asset: { symbol: "TOK_IGNORE", type: "token" }, value: "5" },
+        ]);
+
+        const assetOpsPassed = buildSubAccountsMock.mock.calls[0][0].operations;
+        expect(assetOpsPassed).toHaveLength(1);
+        expect(assetOpsPassed[0].hash).toBe("h2");
+
+        expect(result).toMatchObject({
+          balance: new BigNumber(1000),
+          spendableBalance: new BigNumber(700),
+          blockHeight: 123,
+          operationsCount: expectedOperations.length,
+          subAccounts: [{ id: `${currency.id}_subAcc1`, type: "TokenAccount" }],
+          operations: expectedOperations,
+        });
+      },
+    );
 
     test("handles empty operations (no old ops, no new ops) and blockHeight=0", async () => {
       getBalanceMock.mockResolvedValue([{ asset: { type: "native" }, value: "0", locked: "0" }]);

package/src/deposit/type.ts

@@ -17,30 +17,9 @@ export type MappedAsset = {
   ledgerCurrency?: CryptoOrTokenCurrency;
 };
 
-export type GroupedCurrency = {
-  providerId: string;
-  currenciesByNetwork: MappedAsset[];
-};
-
-export type CurrenciesByProviderId = {
-  currenciesByNetwork: CryptoOrTokenCurrency[];
-  providerId: string;
-  metaCurrencyId?: string;
-};
-
-export type GroupedCurrencies = {
-  currenciesByProvider: CurrenciesByProviderId[];
-  sortedCryptoCurrencies: CryptoOrTokenCurrency[];
-};
-
 export enum LoadingStatus {
   Idle = "idle",
   Pending = "pending",
   Success = "success",
   Error = "error",
 }
-
-export type LoadingBasedGroupedCurrencies = {
-  result: GroupedCurrencies;
-  loadingStatus: LoadingStatus;
-};

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/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,