@ledgerhq/live-common 34.52.0-nightly.1 → 34.52.0-nightly.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.52.0-nightly.1",
+  "version": "34.52.0-nightly.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -103,7 +103,7 @@
   "dependencies": {
     "@blooo/hw-app-acre": "^1.1.1",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.2",
-    "@ledgerhq/device-management-kit": "0.9.1",
+    "@ledgerhq/device-management-kit": "0.9.2",
     "@ledgerhq/live-app-sdk": "^0.8.1",
     "@ledgerhq/wallet-api-client": "^1.12.3",
     "@ledgerhq/wallet-api-core": "^1.25.0",
@@ -129,7 +129,7 @@
     "@zondax/ledger-mina-js": "0.0.2",
     "@zondax/ledger-stacks": "^1.0.2",
     "async": "^3.2.3",
-    "axios": "1.11.0",
+    "axios": "1.12.2",
     "bech32": "^1.1.3",
     "bignumber.js": "^9.1.2",
     "bip32": "^2.0.6",
@@ -163,77 +163,78 @@
     "xstate": "^5.19.2",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.11.1-nightly.0",
-    "@ledgerhq/coin-aptos": "^3.4.1-nightly.0",
-    "@ledgerhq/coin-bitcoin": "^0.23.1-nightly.0",
-    "@ledgerhq/coin-canton": "^0.8.1-nightly.0",
-    "@ledgerhq/coin-cardano": "^0.13.1-nightly.0",
-    "@ledgerhq/coin-casper": "^2.2.1-nightly.0",
-    "@ledgerhq/coin-celo": "^1.6.1-nightly.1",
-    "@ledgerhq/coin-cosmos": "^0.18.1-nightly.0",
-    "@ledgerhq/coin-evm": "^2.34.0-nightly.1",
-    "@ledgerhq/coin-filecoin": "^1.13.1-nightly.0",
-    "@ledgerhq/coin-framework": "^6.7.1-nightly.0",
-    "@ledgerhq/coin-hedera": "^1.12.1-nightly.0",
-    "@ledgerhq/coin-icon": "^0.13.1-nightly.0",
-    "@ledgerhq/coin-internet_computer": "^1.9.1-nightly.0",
-    "@ledgerhq/coin-kaspa": "^1.3.1-nightly.0",
-    "@ledgerhq/coin-mina": "^1.3.1-nightly.0",
-    "@ledgerhq/coin-multiversx": "^0.6.1-nightly.0",
-    "@ledgerhq/coin-near": "^0.14.1-nightly.0",
-    "@ledgerhq/coin-polkadot": "^6.11.1-nightly.0",
-    "@ledgerhq/coin-solana": "^0.35.1-nightly.0",
-    "@ledgerhq/coin-stacks": "^0.10.1-nightly.0",
-    "@ledgerhq/coin-stellar": "^6.5.1-nightly.0",
-    "@ledgerhq/coin-sui": "^0.16.1-nightly.0",
-    "@ledgerhq/coin-tezos": "^6.7.1-nightly.0",
-    "@ledgerhq/coin-ton": "^0.15.1-nightly.0",
-    "@ledgerhq/coin-tron": "^5.5.1-nightly.0",
-    "@ledgerhq/coin-vechain": "^2.11.1-nightly.0",
-    "@ledgerhq/coin-xrp": "^7.6.1-nightly.0",
-    "@ledgerhq/crypto-icons-ui": "^1.21.0",
-    "@ledgerhq/cryptoassets": "^13.31.1-nightly.0",
-    "@ledgerhq/device-core": "^0.6.7-nightly.0",
-    "@ledgerhq/devices": "8.6.2-nightly.0",
+    "react-redux": "^7.2.9",
+    "@ledgerhq/coin-algorand": "^0.12.0-nightly.8",
+    "@ledgerhq/coin-aptos": "^3.5.0-nightly.7",
+    "@ledgerhq/coin-bitcoin": "^0.24.0-nightly.7",
+    "@ledgerhq/coin-canton": "^0.9.0-nightly.7",
+    "@ledgerhq/coin-cardano": "^0.14.0-nightly.7",
+    "@ledgerhq/coin-casper": "^2.3.0-nightly.7",
+    "@ledgerhq/coin-celo": "^1.7.0-nightly.9",
+    "@ledgerhq/coin-cosmos": "^0.19.0-nightly.7",
+    "@ledgerhq/coin-evm": "^2.34.0-nightly.9",
+    "@ledgerhq/coin-filecoin": "^1.14.0-nightly.7",
+    "@ledgerhq/coin-framework": "^6.8.0-nightly.7",
+    "@ledgerhq/coin-hedera": "^1.13.0-nightly.7",
+    "@ledgerhq/coin-icon": "^0.14.0-nightly.7",
+    "@ledgerhq/coin-internet_computer": "^1.10.0-nightly.8",
+    "@ledgerhq/coin-kaspa": "^1.4.0-nightly.7",
+    "@ledgerhq/coin-mina": "^1.4.0-nightly.7",
+    "@ledgerhq/coin-multiversx": "^0.7.0-nightly.8",
+    "@ledgerhq/coin-near": "^0.15.0-nightly.7",
+    "@ledgerhq/coin-polkadot": "^6.12.0-nightly.7",
+    "@ledgerhq/coin-solana": "^0.36.0-nightly.7",
+    "@ledgerhq/coin-stacks": "^0.11.0-nightly.7",
+    "@ledgerhq/coin-stellar": "^6.6.0-nightly.7",
+    "@ledgerhq/coin-sui": "^0.17.0-nightly.9",
+    "@ledgerhq/coin-tezos": "^6.8.0-nightly.7",
+    "@ledgerhq/coin-ton": "^0.16.0-nightly.7",
+    "@ledgerhq/coin-tron": "^5.6.0-nightly.7",
+    "@ledgerhq/coin-vechain": "^2.12.0-nightly.7",
+    "@ledgerhq/coin-xrp": "^7.7.0-nightly.7",
+    "@ledgerhq/crypto-icons-ui": "^1.22.0-nightly.1",
+    "@ledgerhq/cryptoassets": "^13.32.0-nightly.5",
+    "@ledgerhq/device-core": "^0.6.7-nightly.3",
+    "@ledgerhq/devices": "8.7.0-nightly.1",
     "@ledgerhq/errors": "^6.27.0-nightly.0",
-    "@ledgerhq/hw-app-algorand": "^6.31.9-nightly.0",
-    "@ledgerhq/hw-app-aptos": "^6.34.9-nightly.0",
-    "@ledgerhq/hw-app-btc": "^10.11.3-nightly.1",
-    "@ledgerhq/hw-app-celo": "^6.35.2-nightly.0",
-    "@ledgerhq/hw-app-cosmos": "^6.32.9-nightly.0",
-    "@ledgerhq/hw-app-eth": "^6.46.2-nightly.0",
-    "@ledgerhq/hw-app-exchange": "^0.16.0",
-    "@ledgerhq/hw-app-hedera": "^1.2.9-nightly.0",
-    "@ledgerhq/hw-app-icon": "^1.3.9-nightly.0",
-    "@ledgerhq/hw-app-kaspa": "^1.3.2-nightly.0",
-    "@ledgerhq/hw-app-multiversx": "^6.25.4-nightly.0",
-    "@ledgerhq/hw-app-near": "^6.31.9-nightly.0",
-    "@ledgerhq/hw-app-polkadot": "^6.34.9-nightly.0",
-    "@ledgerhq/hw-app-str": "^7.2.9-nightly.0",
+    "@ledgerhq/hw-app-algorand": "^6.31.9-nightly.1",
+    "@ledgerhq/hw-app-aptos": "^6.34.9-nightly.1",
+    "@ledgerhq/hw-app-btc": "^10.12.0-nightly.4",
+    "@ledgerhq/hw-app-celo": "^6.35.2-nightly.3",
+    "@ledgerhq/hw-app-cosmos": "^6.32.9-nightly.1",
+    "@ledgerhq/hw-app-eth": "^6.47.0-nightly.3",
+    "@ledgerhq/hw-app-exchange": "^0.17.0-nightly.0",
+    "@ledgerhq/hw-app-hedera": "^1.2.9-nightly.1",
+    "@ledgerhq/hw-app-icon": "^1.3.9-nightly.1",
+    "@ledgerhq/hw-app-kaspa": "^1.3.2-nightly.1",
+    "@ledgerhq/hw-app-multiversx": "^6.26.0-nightly.2",
+    "@ledgerhq/hw-app-near": "^6.31.9-nightly.1",
+    "@ledgerhq/hw-app-polkadot": "^6.34.9-nightly.1",
+    "@ledgerhq/hw-app-str": "^7.2.9-nightly.1",
     "@ledgerhq/hw-app-sui": "^1.4.0",
-    "@ledgerhq/hw-app-tezos": "^6.31.9-nightly.0",
-    "@ledgerhq/hw-app-trx": "^6.31.9-nightly.0",
-    "@ledgerhq/hw-app-vet": "^0.6.2",
-    "@ledgerhq/hw-app-xrp": "^6.32.7-nightly.0",
-    "@ledgerhq/hw-bolos": "^6.32.9-nightly.0",
-    "@ledgerhq/hw-transport": "6.31.13-nightly.0",
-    "@ledgerhq/hw-transport-mocker": "^6.29.13-nightly.0",
-    "@ledgerhq/ledger-cal-service": "^1.7.0",
-    "@ledgerhq/ledger-trust-service": "^0.4.0",
+    "@ledgerhq/hw-app-tezos": "^6.31.9-nightly.1",
+    "@ledgerhq/hw-app-trx": "^6.31.9-nightly.1",
+    "@ledgerhq/hw-app-vet": "^0.6.3-nightly.0",
+    "@ledgerhq/hw-app-xrp": "^6.32.7-nightly.1",
+    "@ledgerhq/hw-bolos": "^6.32.9-nightly.1",
+    "@ledgerhq/hw-transport": "6.31.13-nightly.1",
+    "@ledgerhq/hw-transport-mocker": "^6.29.13-nightly.1",
+    "@ledgerhq/ledger-cal-service": "^1.8.0-nightly.1",
+    "@ledgerhq/ledger-trust-service": "^0.4.1-nightly.1",
     "@ledgerhq/live-config": "^3.2.0",
-    "@ledgerhq/live-countervalues": "^0.8.1-nightly.0",
-    "@ledgerhq/live-countervalues-react": "^0.7.1-nightly.0",
-    "@ledgerhq/live-dmk-shared": "^0.14.0",
-    "@ledgerhq/live-env": "^2.19.0",
+    "@ledgerhq/live-countervalues": "^0.8.1-nightly.7",
+    "@ledgerhq/live-countervalues-react": "^0.7.1-nightly.7",
+    "@ledgerhq/live-dmk-shared": "^0.15.0-nightly.0",
+    "@ledgerhq/live-env": "^2.20.0-nightly.0",
     "@ledgerhq/live-hooks": "0.2.0",
-    "@ledgerhq/live-network": "^2.0.20",
+    "@ledgerhq/live-network": "^2.1.0-nightly.1",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-canton": "^0.4.3-nightly.0",
-    "@ledgerhq/live-signer-evm": "^0.9.1-nightly.1",
-    "@ledgerhq/live-signer-solana": "^0.5.9-nightly.0",
-    "@ledgerhq/live-wallet": "^0.14.4-nightly.0",
+    "@ledgerhq/live-signer-canton": "^0.5.0-nightly.7",
+    "@ledgerhq/live-signer-evm": "^0.10.0-nightly.9",
+    "@ledgerhq/live-signer-solana": "^0.5.9-nightly.7",
+    "@ledgerhq/live-wallet": "^0.15.0-nightly.7",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/speculos-transport": "^0.2.13",
+    "@ledgerhq/speculos-transport": "^0.2.14-nightly.2",
     "@ledgerhq/wallet-api-acre-module": "^0.8.0",
     "@ledgerhq/wallet-api-exchange-module": "^0.17.0"
   },
@@ -251,6 +252,7 @@
     "@types/lodash": "^4.14.179",
     "@types/node": "^22.10.10",
     "@types/react": "^18.2.21",
+    "@types/react-redux": "^7.1.33",
     "@types/uuid": "^8.3.4",
     "benchmark": "^2.1.4",
     "buffer": "6.0.3",
@@ -273,7 +275,6 @@
     "react-dom": "18.3.1",
     "react-native": "0.77.2",
     "react-native-svg": "15.11.2",
-    "react-redux": "^7.2.9",
     "react-test-renderer": "18.3.1",
     "redux-actions": "2.6.5",
     "timemachine": "^0.3.2",
@@ -283,10 +284,10 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "7",
-    "@ledgerhq/device-react": "^0.3.1-nightly.0",
+    "@ledgerhq/device-react": "^0.3.1-nightly.3",
     "@ledgerhq/types-cryptoassets": "^7.29.0",
     "@ledgerhq/types-devices": "^6.27.0",
-    "@ledgerhq/types-live": "^6.88.0-nightly.0"
+    "@ledgerhq/types-live": "^6.88.0-nightly.3"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",

package/src/__tests__/environment.test.ts

@@ -4,9 +4,12 @@ import "./test-helpers/setup";
 import { getAbandonSeedAddress, listSupportedCurrencies } from "../currencies";
 
 describe("supported currencies are ready to work", () => {
-  listSupportedCurrencies().forEach(c =>
-    test("getAbandonSeedAddress works for currency " + c.id, () =>
-      expect(getAbandonSeedAddress(c.id)).toBeTruthy(),
-    ),
-  );
+  // Skip bitcoin_regtest this one because it's only for cointester bitcoin
+  listSupportedCurrencies()
+    .filter(c => c.id !== "bitcoin_regtest")
+    .forEach(c =>
+      test("getAbandonSeedAddress works for currency " + c.id, () =>
+        expect(getAbandonSeedAddress(c.id)).toBeTruthy(),
+      ),
+    );
 });

package/src/__tests__/migration/account-migration.ts

@@ -100,6 +100,7 @@ setSupportedCurrencies([
   "linea",
   "ton",
   "mina",
+  "monad",
 ]);
 
 LiveConfig.setConfig(liveConfig);

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

@@ -46,6 +46,7 @@ setSupportedCurrencies([
   "algorand",
   "polkadot",
   "bitcoin_testnet",
+  "bitcoin_regtest",
   "ethereum_sepolia",
   "ethereum_holesky",
   "ethereum_hoodi",
@@ -122,6 +123,7 @@ setSupportedCurrencies([
   "canton_network_devnet",
   "canton_network_testnet",
   "kaspa",
+  "monad",
 ]);
 LiveConfig.setConfig(liveConfig);
 

package/src/account/serialization.test.ts

@@ -26,6 +26,7 @@ setCryptoAssetsStoreForCoinFramework({
     return undefined;
   },
   findTokenByAddressInCurrency: (_: string, __: string) => undefined,
+  getTokensSyncHash: (_: string) => Promise.resolve("0"),
 } as CryptoAssetsStore);
 
 describe("serialization", () => {

package/src/apps/config.ts

@@ -41,7 +41,7 @@ const appConfig: Record<string, ConfigInfo> = {
   config_nanoapp_celo: {
     type: "object",
     default: {
-      minVersion: "1.4.0",
+      minVersion: "1.5.0",
     },
   },
   config_nanoapp_cardano_ada: {

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

@@ -14,6 +14,7 @@ import type {
   Stake,
   Reward,
   CraftedTransaction,
+  Validator,
 } from "@ledgerhq/coin-framework/api/index";
 import network from "@ledgerhq/live-network";
 
@@ -206,4 +207,7 @@ export const getNetworkAlpacaApi = (networkFamily: string) =>
     getRewards(_address: string, _cursor?: Cursor): Promise<Page<Reward>> {
       throw new Error("getRewards is not supported");
     },
+    getValidators(_cursor?: Cursor): Promise<Page<Validator>> {
+      throw new Error("getValidators is not supported");
+    },
   }) satisfies Api<any>;

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

@@ -91,7 +91,14 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
         subOperations,
       });
     });
-    const operations = mergeOps(oldOps, newOpsWithSubs) as OperationCommon[];
+    const confirmedOperations =
+      alpacaApi.refreshOperations && initialAccount?.pendingOperations.length
+        ? await alpacaApi.refreshOperations(initialAccount.pendingOperations)
+        : [];
+    const operations = mergeOps(oldOps, [
+      ...confirmedOperations,
+      ...newOpsWithSubs,
+    ]) as OperationCommon[];
 
     const res = {
       id: accountId,

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

@@ -15,12 +15,14 @@ const getBalanceMock = jest.fn();
 const lastBlockMock = jest.fn();
 const getTokenFromAssetMock = jest.fn();
 const chainSpecificGetAccountShapeMock = jest.fn();
+const refreshOperationsMock = jest.fn();
 jest.mock("../alpaca", () => ({
   getAlpacaApi: () => ({
     lastBlock: (...a: any[]) => lastBlockMock(...a),
     getBalance: (...a: any[]) => getBalanceMock(...a),
     listOperations: (...a: any[]) => listOperationsMock(...a),
     getTokenFromAsset: (...a: any[]) => getTokenFromAssetMock(...a),
+    refreshOperations: (...a: any[]) => refreshOperationsMock(...a),
     getChainSpecificRules: () => ({
       getAccountShape: (...a: any[]) => chainSpecificGetAccountShapeMock(...a),
     }),
@@ -68,7 +70,16 @@ describe("genericGetAccountShape", () => {
         type: "OPT_IN",
         extra: { pagingToken: "pt1", assetReference: "ar1", assetOwner: "ow1" },
       };
-      const initialAccount = { operations: [oldOp], blockHeight: 10 };
+      const pendingOp = {
+        hash: "h0",
+        blockHeight: 10,
+        type: "OUT",
+      };
+      const initialAccount = {
+        operations: [oldOp],
+        pendingOperations: [pendingOp],
+        blockHeight: 10,
+      };
 
       extractBalanceMock.mockReturnValue({ value: "1000", locked: "300" });
       getBalanceMock.mockResolvedValue([
@@ -83,6 +94,13 @@ describe("genericGetAccountShape", () => {
 
       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,
@@ -141,9 +159,14 @@ describe("genericGetAccountShape", () => {
         balance: new BigNumber(1000),
         spendableBalance: new BigNumber(700),
         blockHeight: 123,
-        operationsCount: 2,
+        operationsCount: 3,
         subAccounts: [{ id: `${currency.id}_subAcc1`, type: "TokenAccount" }],
         operations: [
+          {
+            hash: "h0",
+            type: "OUT",
+            blockHeight: 12,
+          },
           {
             hash: "h2",
             type: "IN",

package/src/bridge/generic-alpaca/utils.test.ts

@@ -1,5 +1,6 @@
 import {
   adaptCoreOperationToLiveOperation,
+  buildOptimisticOperation,
   cleanedOperation,
   extractBalance,
   findCryptoCurrencyByNetwork,
@@ -11,6 +12,170 @@ import { Account } from "@ledgerhq/types-live";
 import { GenericTransaction, OperationCommon } from "./types";
 
 describe("Alpaca utils", () => {
+  describe("buildOptimisticOperation", () => {
+    it.each([
+      [
+        "coin",
+        "changeTrust",
+        {},
+        {
+          parentType: "OPT_IN",
+          subType: undefined,
+          parentValue: new BigNumber(50),
+        },
+      ],
+      [
+        "coin",
+        "delegate",
+        {},
+        {
+          parentType: "DELEGATE",
+          subType: undefined,
+          parentValue: new BigNumber(50),
+        },
+      ],
+      [
+        "coin",
+        "stake",
+        {},
+        {
+          parentType: "DELEGATE",
+          subType: undefined,
+          parentValue: new BigNumber(50),
+        },
+      ],
+      [
+        "coin",
+        "undelegate",
+        {},
+        {
+          parentType: "UNDELEGATE",
+          subType: undefined,
+          parentValue: new BigNumber(50),
+        },
+      ],
+      [
+        "coin",
+        "unstake",
+        {},
+        {
+          parentType: "UNDELEGATE",
+          subType: undefined,
+          parentValue: new BigNumber(50),
+        },
+      ],
+      [
+        "coin",
+        "send",
+        {},
+        {
+          parentType: "OUT",
+          subType: undefined,
+          parentValue: new BigNumber(50),
+        },
+      ],
+      [
+        "token",
+        "changeTrust",
+        { subAccountId: "sub-account-id" },
+        {
+          parentType: "FEES",
+          subType: "OPT_IN",
+          parentValue: new BigNumber(12),
+        },
+      ],
+      [
+        "token",
+        "delegate",
+        { subAccountId: "sub-account-id" },
+        {
+          parentType: "FEES",
+          subType: "DELEGATE",
+          parentValue: new BigNumber(12),
+        },
+      ],
+      [
+        "token",
+        "stake",
+        { subAccountId: "sub-account-id" },
+        {
+          parentType: "FEES",
+          subType: "DELEGATE",
+          parentValue: new BigNumber(12),
+        },
+      ],
+      [
+        "token",
+        "undelegate",
+        { subAccountId: "sub-account-id" },
+        {
+          parentType: "FEES",
+          subType: "UNDELEGATE",
+          parentValue: new BigNumber(12),
+        },
+      ],
+      [
+        "token",
+        "unstake",
+        { subAccountId: "sub-account-id" },
+        {
+          parentType: "FEES",
+          subType: "UNDELEGATE",
+          parentValue: new BigNumber(12),
+        },
+      ],
+      [
+        "token",
+        "send",
+        { subAccountId: "sub-account-id" },
+        { parentType: "FEES", subType: "OUT", parentValue: new BigNumber(12) },
+      ],
+    ])("builds an optimistic %s operation with %s mode ", (_s, mode, params, expected) => {
+      const operation = buildOptimisticOperation(
+        {
+          id: "parent-account-id",
+          freshAddress: "account-address",
+          subAccounts: [{ id: "sub-account-id" }],
+        } as Account,
+        {
+          mode,
+          amount: new BigNumber(50),
+          fees: new BigNumber(12),
+          recipient: "recipient-address",
+          ...params,
+        } as GenericTransaction,
+      );
+
+      expect(operation).toMatchObject({
+        id: `parent-account-id--${expected.parentType}`,
+        type: expected.parentType,
+        value: expected.parentValue,
+        accountId: "parent-account-id",
+        senders: ["account-address"],
+        recipients: ["recipient-address"],
+        fee: new BigNumber(12),
+        blockHash: null,
+        blockHeight: null,
+        ...(expected.subType
+          ? {
+              subOperations: [
+                {
+                  id: `sub-account-id--${expected.subType}`,
+                  accountId: "sub-account-id",
+                  type: expected.subType,
+                  senders: ["account-address"],
+                  recipients: ["recipient-address"],
+                  value: new BigNumber(50),
+                  blockHash: null,
+                  blockHeight: null,
+                },
+              ],
+            }
+          : {}),
+      });
+    });
+  });
+
   describe("cleanedOperation", () => {
     it("creates a cleaned version of an operation without mutating it", () => {
       const dirty = {

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

@@ -241,11 +241,12 @@ export const buildOptimisticOperation = (
   const fees = BigInt(transaction.fees?.toString() || "0");
   const { subAccountId } = transaction;
   const { subAccounts } = account;
+  const parentType = subAccountId ? "FEES" : type;
 
   const operation: Operation = {
-    id: encodeOperationId(account.id, "", type),
+    id: encodeOperationId(account.id, "", parentType),
     hash: "",
-    type: type,
+    type: parentType,
     value: subAccountId ? new BigNumber(fees.toString()) : transaction.amount, // match old behavior
     fee: new BigNumber(fees.toString()),
     blockHash: null,
@@ -266,9 +267,9 @@ export const buildOptimisticOperation = (
   if (tokenAccount && subAccountId) {
     operation.subOperations = [
       {
-        id: `${subAccountId}--OUT`,
+        id: `${subAccountId}--${type}`,
         hash: "",
-        type: "OUT",
+        type,
         value: transaction.useAllAmount ? tokenAccount.balance : transaction.amount,
         fee: new BigNumber(0),
         blockHash: null,

package/src/dada-client/hooks/useAssetsData.ts

@@ -1,6 +1,6 @@
 import { useMemo } from "react";
 import { useGetAssetsDataInfiniteQuery } from "../state-manager/api";
-import { AssetsDataWithPagination } from "../state-manager/types";
+import { AssetsDataWithPagination, GetAssetsDataParams } from "../state-manager/types";
 
 const emptyData = () => ({
   cryptoAssets: {},
@@ -25,14 +25,9 @@ export function useAssetsData({
   product,
   version,
   isStaging,
-}: {
-  search?: string;
-  currencyIds?: string[];
-  useCase?: string;
+  includeTestNetworks,
+}: GetAssetsDataParams & {
   areCurrenciesFiltered?: boolean;
-  product: "llm" | "lld";
-  version: string;
-  isStaging?: boolean;
 }) {
   const {
     data,
@@ -51,6 +46,7 @@ export function useAssetsData({
     product,
     version,
     isStaging,
+    includeTestNetworks,
   });
 
   const joinedPages = useMemo(() => {

package/src/dada-client/state-manager/api.ts

@@ -45,6 +45,9 @@ export const assetsDataApi = createApi({
           ...(queryArg?.search && { search: queryArg.search }),
           product: queryArg.product,
           minVersion: queryArg.version,
+          ...(queryArg?.includeTestNetworks && {
+            includeTestNetworks: queryArg.includeTestNetworks,
+          }),
           additionalData: queryArg.additionalData || [
             AssetsAdditionalData.Apy,
             AssetsAdditionalData.MarketTrend,

package/src/dada-client/state-manager/types.ts

@@ -17,6 +17,7 @@ export interface GetAssetsDataParams {
   version: string;
   isStaging?: boolean;
   additionalData?: AssetsAdditionalData[];
+  includeTestNetworks?: boolean;
 }
 
 export interface PageParam {