@ledgerhq/live-common 34.51.0-nightly.1 → 34.51.0-nightly.11

package/src/currencies/cryptoIcons.test.ts

@@ -1,6 +1,6 @@
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { inferCryptoCurrencyIcon } from "./cryptoIcons";
-import { getTokenById } from "@ledgerhq/cryptoassets/tokens";
+import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
 
 describe("inferCryptoCurrencyIcon", () => {
   const registryMock = {
@@ -23,8 +23,8 @@ describe("inferCryptoCurrencyIcon", () => {
   });
 
   test("USDT is inferred properly", () => {
-    expect(
-      inferCryptoCurrencyIcon(registryMock, getTokenById("ethereum/erc20/usd_tether__erc20_")),
-    ).toBe(4);
+    const usdt = findTokenById("ethereum/erc20/usd_tether__erc20_");
+    if (!usdt) throw new Error("USDT token not found");
+    expect(inferCryptoCurrencyIcon(registryMock, usdt)).toBe(4);
   });
 });

package/src/currencies/index.ts

@@ -14,12 +14,9 @@ export {
   listTokens,
   listTokensForCryptoCurrency,
   listTokenTypesForCryptoCurrency,
-  findTokenByTicker,
   findTokenById,
-  findTokenByAddress,
-  hasTokenId,
+  findTokenByAddressInCurrency,
   getAbandonSeedAddress,
-  getTokenById,
   addTokens,
 } from "@ledgerhq/cryptoassets";
 export {

package/src/currencies/sortByMarketcap.test.ts

@@ -7,9 +7,7 @@ import type { CryptoAssetsStore } from "@ledgerhq/types-live";
 import { findCurrencyByTicker } from "@ledgerhq/live-countervalues/findCurrencyByTicker";
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-setCryptoAssetsStoreForCoinFramework({
-  findTokenByTicker: (_: string) => undefined,
-} as CryptoAssetsStore);
+setCryptoAssetsStoreForCoinFramework({} as CryptoAssetsStore);
 
 test("sortCurrenciesByIds snapshot", () => {
   const list = [...listCryptoCurrencies(), ...listTokens()];

package/src/dada-client/MIGRATION_GUIDE.md

@@ -0,0 +1,187 @@
+# DaDa Client Migration Guide
+
+## Overview
+
+Migrate from `listTokens()` and `listTokensForCryptoCurrency()` to the DaDa Client API.
+
+> **Remove CAL Initiative ([LIVE-21487](https://ledgerhq.atlassian.net/browse/LIVE-21487))**: Replace static token lists with dynamic, server-managed asset data. Beware there are many usages of listTokens that actually are going to get dropped or moved to simpler solution than even using DaDa. This guide is for the usecases we still need to list tokens.
+
+### useAssetsData
+
+```typescript
+const { data, isLoading, isSuccess, isError, loadNext, error, refetch } = useAssetsData({
+  product: "lld" | "llm", // app identifier
+  version: string, // app version
+  search?: string, // server-side search query
+  currencyIds?: string[], // filter by parent currencies
+  areCurrenciesFiltered?: boolean, // required when using currencyIds
+  useCase?: string, // optimize server response
+  isStaging?: boolean, // use staging API
+});
+```
+
+## Integration on LLD
+
+**Configuration:**
+
+```typescript
+product: "lld";
+version: __APP_VERSION__;
+```
+
+**Pagination:** Use `react-window`'s `InfiniteLoader` + `FixedSizeList` with `loadMoreItems` callback, or implement scroll detection to call `loadNext`
+
+## Integration on LLM
+
+**Configuration:**
+
+```typescript
+import { VersionNumber } from "react-native-version-number";
+
+product: "llm";
+version: VersionNumber.appVersion;
+```
+
+**Pagination:** Use `BottomSheetVirtualizedList` or `FlatList` with `onEndReached={loadNext}`
+
+
+## Migration Examples
+
+### 1. Basic Token Lists
+
+**Before:**
+
+```typescript
+import { listTokens } from "@ledgerhq/cryptoassets";
+
+function TokenList() {
+  const tokens = listTokens();
+  return (
+    <div>
+      {tokens.map(token => <div key={token.id}>{token.name}</div>)}
+    </div>
+  );
+}
+```
+
+**After:**
+
+```typescript
+import { useAssetsData } from "@ledgerhq/live-common/dada-client/hooks/useAssetsData";
+
+function TokenList() {
+  const { data, isLoading, loadNext } = useAssetsData({
+    product: "lld",
+    version: __APP_VERSION__,
+  });
+
+  if (isLoading) return <div>Loading...</div>;
+
+  const tokens = Object.values(data?.cryptoOrTokenCurrencies || {})
+    .filter(currency => currency.type === "TokenCurrency");
+
+  return (
+    <SomethingThatManagesInfiniteScrollList
+      data={tokens}
+      renderItem={(token, index) => (
+        <div key={token.id}>{token.name}</div>
+      )}
+      onScrollEnd={loadNext}
+    />
+  );
+}
+```
+
+### 2. Currency-Specific Tokens
+
+**Before:**
+
+```typescript
+import { listTokensForCryptoCurrency } from "@ledgerhq/cryptoassets";
+
+function EthereumTokens({ currency }) {
+  const tokens = listTokensForCryptoCurrency(currency);
+  return (
+    <select>
+      {tokens.map(token => (
+        <option key={token.id} value={token.id}>{token.name}</option>
+      ))}
+    </select>
+  );
+}
+```
+
+**After:**
+
+```typescript
+import { useAssetsData } from "@ledgerhq/live-common/dada-client/hooks/useAssetsData";
+
+function EthereumTokens({ currency }) {
+  const { data, isLoading } = useAssetsData({
+    currencyIds: [currency.id],
+    areCurrenciesFiltered: true,
+    product: "lld",
+    version: __APP_VERSION__,
+  });
+
+  if (isLoading) return <div>Loading...</div>;
+
+  const tokens = Object.values(data?.cryptoOrTokenCurrencies || {})
+    .filter(c => c.type === "TokenCurrency" && c.parentCurrency?.id === currency.id);
+
+  return (
+    <select>
+      {tokens.map(token => (
+        <option key={token.id} value={token.id}>{token.name}</option>
+      ))}
+    </select>
+  );
+}
+```
+
+### 3. Search
+
+**Before:**
+
+```typescript
+import { listTokens } from "@ledgerhq/cryptoassets";
+
+function SearchableTokens({ searchQuery }) {
+  const allTokens = listTokens();
+  const filteredTokens = allTokens.filter(token =>
+    token.name.toLowerCase().includes(searchQuery.toLowerCase())
+  );
+  return (
+    <div>
+      {filteredTokens.map(token => <div key={token.id}>{token.name}</div>)}
+    </div>
+  );
+}
+```
+
+**After:**
+
+```typescript
+import { useAssetsData } from "@ledgerhq/live-common/dada-client/hooks/useAssetsData";
+
+function SearchableTokens({ searchQuery }) {
+  const { data, isLoading, loadNext } = useAssetsData({
+    search: searchQuery,
+    product: "lld",
+    version: __APP_VERSION__,
+  });
+
+  if (isLoading) return <div>Loading...</div>;
+
+  const tokens = Object.values(data?.cryptoOrTokenCurrencies || {})
+    .filter(currency => currency.type === "TokenCurrency");
+
+  return (
+    <SomethingThatManagesInfiniteScrollList
+      data={tokens}
+      renderItem={(token) => <div key={token.id}>{token.name}</div>}
+      onScrollEnd={loadNext}
+    />
+  );
+}
+```

package/src/dada-client/entities/index.ts

@@ -1,6 +1,6 @@
 import type { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import type { ApiAsset } from "@ledgerhq/cryptoassets";
-import { PartialMarketItemResponse } from "@ledgerhq/live-common/market/utils/types";
+import { PartialMarketItemResponse } from "../../market/utils/types";
 
 // Types for crypto asset metadata
 export interface CryptoAssetMeta {

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

@@ -41,18 +41,20 @@ export const assetsDataApi = createApi({
           ...(pageParam?.cursor && { cursor: pageParam.cursor }),
           ...(queryArg?.useCase && { transaction: queryArg.useCase }),
           ...(queryArg?.currencyIds &&
-            queryArg?.currencyIds.length > 0 &&
-            !queryArg?.useCase && { currencyIds: queryArg.currencyIds }),
+            queryArg?.currencyIds.length > 0 && { currencyIds: queryArg.currencyIds }),
           ...(queryArg?.search && { search: queryArg.search }),
           product: queryArg.product,
           minVersion: queryArg.version,
-          additionalData: [AssetsAdditionalData.Apy, AssetsAdditionalData.MarketTrend],
+          additionalData: queryArg.additionalData || [
+            AssetsAdditionalData.Apy,
+            AssetsAdditionalData.MarketTrend,
+          ],
         };
 
         const baseUrl = queryArg.isStaging ? getEnv("DADA_API_STAGING") : getEnv("DADA_API_PROD");
 
         return {
-          url: `${baseUrl}assets`,
+          url: `${baseUrl}/assets`,
           params,
         };
       },
@@ -81,7 +83,10 @@ export const assetsDataApi = createApi({
             queryArg?.currencyIds.length > 0 && { currencyIds: queryArg.currencyIds }),
           product: queryArg.product,
           minVersion: queryArg.version,
-          additionalData: [AssetsAdditionalData.Apy, AssetsAdditionalData.MarketTrend],
+          additionalData: queryArg.additionalData || [
+            AssetsAdditionalData.Apy,
+            AssetsAdditionalData.MarketTrend,
+          ],
         };
 
         const baseUrl = queryArg.isStaging ? getEnv("DADA_API_STAGING") : getEnv("DADA_API_PROD");

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

@@ -16,6 +16,7 @@ export interface GetAssetsDataParams {
   product: "llm" | "lld";
   version: string;
   isStaging?: boolean;
+  additionalData?: AssetsAdditionalData[];
 }
 
 export interface PageParam {

package/src/deposit/deposit.test.ts

@@ -9,12 +9,12 @@ import { MOCK_TOKENS_ONLY, MOCK_WITH_TOKEN_AND_CURRENCY_ASSET, MOCK_IDS, MOCK_PO
 import { MappedAsset } from "./type";
 import {
   getCryptoCurrencyById,
-  getTokenById,
+  findTokenById,
   setSupportedCurrencies,
   sortCurrenciesByIds,
 } from "../currencies/index";
 import { isCurrencySupported, listSupportedCurrencies, listTokens } from "../currencies";
-import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { CryptoOrTokenCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 
 const TOKEN_ONLY_ASSETS = MOCK_TOKENS_ONLY as MappedAsset[];
 
@@ -107,7 +107,9 @@ describe("Deposit logic", () => {
 
   describe("groupCurrenciesByProvider", () => {
     test("should group currencies by provider", () => {
-      const currencies = TOKEN_ONLY_ASSETS.map(asset => getTokenById(asset.ledgerId));
+      const currencies = TOKEN_ONLY_ASSETS.map(asset => findTokenById(asset.ledgerId)).filter(
+        (t): t is TokenCurrency => t !== undefined,
+      );
       const { currenciesByProvider } = groupCurrenciesByProvider(TOKEN_ONLY_ASSETS, currencies);
       expect(currenciesByProvider).toEqual([
         {
@@ -120,9 +122,9 @@ describe("Deposit logic", () => {
     test("should handle POL assets correctly", () => {
       const currenciesPol = MOCK_POL.map(asset =>
         asset.$type === "Token"
-          ? getTokenById(asset.ledgerId)
+          ? findTokenById(asset.ledgerId)
           : getCryptoCurrencyById(asset.ledgerId),
-      );
+      ).filter((c): c is CryptoOrTokenCurrency => c !== undefined);
       const { currenciesByProvider: currenciesByProviderBis, sortedCryptoCurrencies } =
         groupCurrenciesByProvider(MOCK_POL as MappedAsset[], currenciesPol);
       expect(currenciesByProviderBis).toEqual([
@@ -136,7 +138,9 @@ describe("Deposit logic", () => {
     });
 
     test("should handle empty assets array", () => {
-      const currencies = TOKEN_ONLY_ASSETS.map(asset => getTokenById(asset.ledgerId));
+      const currencies = TOKEN_ONLY_ASSETS.map(asset => findTokenById(asset.ledgerId)).filter(
+        (t): t is TokenCurrency => t !== undefined,
+      );
       const { currenciesByProvider, sortedCryptoCurrencies } = groupCurrenciesByProvider(
         [],
         currencies,
@@ -172,7 +176,8 @@ describe("Deposit logic", () => {
 
       setSupportedCurrencies(["ethereum"]);
       const ethCurrency = getCryptoCurrencyById("ethereum");
-      const tokenCurrency = getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      const tokenCurrency = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!tokenCurrency) throw new Error("Token not found");
 
       const { sortedCryptoCurrencies } = groupCurrenciesByProvider(mockAssets, [
         tokenCurrency,
@@ -188,7 +193,9 @@ describe("Deposit logic", () => {
         { ...TOKEN_ONLY_ASSETS[0], ledgerId: "different-id" },
       ] as MappedAsset[];
 
-      const currencies = [getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId)];
+      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!token) throw new Error("Token not found");
+      const currencies = [token];
       const { currenciesByProvider } = groupCurrenciesByProvider(duplicateAssets, currencies);
 
       expect(currenciesByProvider).toHaveLength(1);
@@ -319,7 +326,7 @@ describe("Deposit logic", () => {
         MOCK_TOKENS_ONLY as MappedAsset[],
         currencies,
       );
-      expect(sortedCryptoCurrencies).toEqual([getTokenById("polygon/erc20/(pos)_tether_usd")]);
+      expect(sortedCryptoCurrencies).toEqual([findTokenById("polygon/erc20/(pos)_tether_usd")]);
     });
 
     it("should return only BSC token while its currency is supported in the list", () => {
@@ -333,7 +340,7 @@ describe("Deposit logic", () => {
         MOCK_TOKENS_ONLY as MappedAsset[],
         currencies,
       );
-      expect(sortedCryptoCurrencies).toEqual([getTokenById("bsc/bep20/binance-peg_bsc-usd")]);
+      expect(sortedCryptoCurrencies).toEqual([findTokenById("bsc/bep20/binance-peg_bsc-usd")]);
     });
 
     it("should return tokens that are actually supported based on mock data", () => {
@@ -596,7 +603,9 @@ describe("Deposit logic", () => {
         { ...TOKEN_ONLY_ASSETS[0], providerId: null as any },
       ] as MappedAsset[];
 
-      const currencies = [getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId)];
+      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!token) throw new Error("Token not found");
+      const currencies = [token];
 
       expect(() => {
         groupCurrenciesByProvider(malformedAssets, currencies);
@@ -608,7 +617,9 @@ describe("Deposit logic", () => {
         { ...TOKEN_ONLY_ASSETS[0], providerId: "" },
       ] as MappedAsset[];
 
-      const currencies = [getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId)];
+      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!token) throw new Error("Token not found");
+      const currencies = [token];
 
       expect(() => {
         groupCurrenciesByProvider(partiallyMalformedAssets, currencies);
@@ -624,7 +635,9 @@ describe("Deposit logic", () => {
           providerId: `provider_${index % 10}`,
         })) as MappedAsset[];
 
-      const currencies = [getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId)];
+      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!token) throw new Error("Token not found");
+      const currencies = [token];
 
       const startTime = Date.now();
       const result = groupCurrenciesByProvider(largeAssetList, currencies);
@@ -640,7 +653,9 @@ describe("Deposit logic", () => {
         { ...TOKEN_ONLY_ASSETS[0], ledgerId: TOKEN_ONLY_ASSETS[0].ledgerId.toUpperCase() },
       ] as MappedAsset[];
 
-      const currencies = [getTokenById(TOKEN_ONLY_ASSETS[0].ledgerId)];
+      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      if (!token) throw new Error("Token not found");
+      const currencies = [token];
       const { currenciesByProvider } = groupCurrenciesByProvider(mixedCaseAssets, currencies);
 
       expect(currenciesByProvider).toHaveLength(1);

package/src/deposit/helper.ts

@@ -3,7 +3,7 @@ import { MappedAsset, CurrenciesByProviderId, GroupedCurrencies } from "./type";
 import {
   currenciesByMarketcap,
   getCryptoCurrencyById,
-  getTokenById,
+  findTokenById,
   hasCryptoCurrencyId,
 } from "../currencies";
 import { getMappedAssets } from "./api";
@@ -75,5 +75,9 @@ export const getTokenOrCryptoCurrencyById = (id: string): CryptoOrTokenCurrency
   if (hasCryptoCurrencyId(id)) {
     return getCryptoCurrencyById(id);
   }
-  return getTokenById(id);
+  const token = findTokenById(id);
+  if (!token) {
+    throw new Error(`token with id "${id}" not found`);
+  }
+  return token;
 };

package/src/deposit/useGroupedCurrenciesByProvider.hook.ts

@@ -3,7 +3,7 @@ import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { useEffect, useMemo, useState } from "react";
 import { isCurrencySupported, listSupportedCurrencies, listTokens } from "../currencies";
 import { loadCurrenciesByProvider } from "./helper";
-import { useCurrenciesUnderFeatureFlag } from "../modularDrawer/hooks/useCurrenciesUnderFeatureFlag";
+import { useAcceptedCurrency } from "../modularDrawer/hooks/useAcceptedCurrency";
 
 // FIXME(LIVE-10505): bad performane & shared utility to move to coin-framework
 const listSupportedTokens = () => listTokens().filter(t => isCurrencySupported(t.parentCurrency));
@@ -17,16 +17,15 @@ export const useGroupedCurrenciesByProvider = (
   withLoading?: boolean,
 ): GroupedCurrencies | LoadingBasedGroupedCurrencies => {
   const [result, setResult] = useState(initialResult);
-  // the import is from MAD but as this hook will be removed, it's fine to keep it here
-  const { deactivatedCurrencyIds } = useCurrenciesUnderFeatureFlag();
+  const isAcceptedCurrency = useAcceptedCurrency();
 
   const [loadingStatus, setLoadingStatus] = useState<LoadingStatus>(LoadingStatus.Idle);
   const coinsAndTokensSupported = useMemo(
     () =>
       (listSupportedCurrencies() as CryptoOrTokenCurrency[])
         .concat(listSupportedTokens())
-        .filter(c => !deactivatedCurrencyIds.has(c.id)),
-    [deactivatedCurrencyIds],
+        .filter(isAcceptedCurrency),
+    [isAcceptedCurrency],
   );
 
   // Get mapped assets filtered by supported & sorted currencies, grouped by provider id

package/src/e2e/data/deviceLabelsData.ts

@@ -65,7 +65,7 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.ETHEREUM.name]: DeviceLabels.VERIFY_ETHEREUM,
       [AppInfos.POLKADOT.name]: DeviceLabels.PLEASE_REVIEW,
       [AppInfos.POLYGON.name]: DeviceLabels.VERIFY_POLYGON,
-      [AppInfos.SOLANA.name]: DeviceLabels.VERIFY_SOLANA_ADDRESS,
+      [AppInfos.SOLANA.name]: DeviceLabels.PUBKEY,
       default: DeviceLabels.ADDRESS,
     },
     receiveConfirm: {
@@ -75,14 +75,13 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.ETHEREUM.name]: DeviceLabels.CONFIRM,
       [AppInfos.POLKADOT.name]: DeviceLabels.CAPS_APPROVE,
       [AppInfos.POLYGON.name]: DeviceLabels.CONFIRM,
-      [AppInfos.SOLANA.name]: DeviceLabels.CONFIRM,
       default: DeviceLabels.APPROVE,
     },
     delegateVerify: {
       [AppInfos.COSMOS.name]: DeviceLabels.PLEASE_REVIEW,
       [AppInfos.MULTIVERS_X.name]: DeviceLabels.RECEIVER,
       [AppInfos.NEAR.name]: DeviceLabels.VIEW_HEADER,
-      [AppInfos.SOLANA.name]: DeviceLabels.REVIEW_TRANSACTION,
+      [AppInfos.SOLANA.name]: DeviceLabels.DELEGATE_FROM,
       default: DeviceLabels.REVIEW_OPERATION,
     },
     delegateConfirm: {
@@ -92,7 +91,6 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.INJECTIVE.name]: DeviceLabels.CAPS_APPROVE,
       [AppInfos.MULTIVERS_X.name]: DeviceLabels.SIGN,
       [AppInfos.NEAR.name]: DeviceLabels.CONTINUE_TO_ACTION,
-      [AppInfos.SOLANA.name]: DeviceLabels.SIGN_TRANSACTION,
       [AppInfos.OSMOSIS.name]: DeviceLabels.CAPS_APPROVE,
       default: DeviceLabels.APPROVE,
     },

package/src/e2e/enum/Account.ts

@@ -526,6 +526,19 @@ export class Account {
     1,
   );
 
+  static readonly SUI_1 = new Account(
+    Currency.SUI,
+    "Sui 1",
+    "0xc6169bcce8718609e43d179b087e6c1e2ac28e5325660af34d22fb5ce284031e",
+    0,
+  );
+  static readonly SUI_2 = new Account(
+    Currency.SUI,
+    "Sui 2",
+    "0x6644c1ce77c5e5ef8d8bd3ae2a4e18239e5d418a5e0800ed5037818399e3a7f6",
+    1,
+  );
+
   static readonly EMPTY = new Account(Currency.BTC, "Empty", "", 0);
 }
 
@@ -640,6 +653,24 @@ export class TokenAccount extends Account {
     TokenType.TRC20,
     Account.TRX_1,
   );
+
+  static readonly SUI_USDC_1 = new TokenAccount(
+    Currency.SUI_USDC,
+    "SUI USDC 1",
+    Account.SUI_1.address,
+    0,
+    TokenType.ERC20,
+    Account.SUI_1,
+  );
+
+  static readonly SUI_USDC_2 = new TokenAccount(
+    Currency.SUI_USDC,
+    "SUI USDC 2",
+    Account.SUI_2.address,
+    1,
+    TokenType.ERC20,
+    Account.SUI_2,
+  );
 }
 
 export type AccountType = Account | TokenAccount;

package/src/e2e/enum/AppInfos.ts

@@ -64,4 +64,6 @@ export class AppInfos {
   static readonly KASPA = new AppInfos("Kaspa");
 
   static readonly HEDERA = new AppInfos("Hedera");
+
+  static readonly SUI = new AppInfos("Sui");
 }

package/src/e2e/enum/Currency.ts

@@ -207,4 +207,15 @@ export class Currency {
   static readonly OP = new Currency("OP Mainnet", "OP", "optimism", AppInfos.ETHEREUM, [
     Network.OPTIMISM,
   ]);
+
+  static readonly SUI = new Currency("Sui", "SUI", "sui", AppInfos.SUI, [Network.SUI]);
+
+  static readonly SUI_USDC = new Currency(
+    "USDC",
+    "USDC",
+    "sui/coin/usdc_0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::usdc",
+    AppInfos.SUI,
+    [Network.SUI],
+    "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7",
+  );
 }

package/src/e2e/enum/Device.ts

@@ -1,7 +1,10 @@
 export class Device {
-  constructor(public readonly name: string) {}
+  constructor(
+    public readonly name: string,
+    public readonly targetId: number,
+  ) {}
 
-  static readonly LNS = "nanoS";
-  static readonly LNX = "nanoX";
-  static readonly LNSP = "nanoSP";
+  static readonly LNS = new Device("nanoS", 823132164);
+  static readonly LNX = new Device("nanoX", 855638020);
+  static readonly LNSP = new Device("nanoSP", 856686596);
 }

package/src/e2e/enum/DeviceLabels.ts

@@ -12,6 +12,8 @@ export enum DeviceLabels {
   CONFIRM = "Confirm",
   CONNECT = "Connect",
   CONNECT_TO = "Connect to",
+  CONNECT_WITH = "Connect with",
+  CONNECT_WITH_LEDGER_SYNC = "Connect with Ledger Sync",
   CONTINUE = "Continue",
   CONTINUE_TO_ACTION = "Continue to actions",
   CONTRACT_DATA = "Contract data",
@@ -33,8 +35,8 @@ export enum DeviceLabels {
   REGISTER = "Register",
   REJECT = "Reject",
   REMOVE = "Remove",
-  REMOVE_FROM_LEDGER_SYNC = "Remove from",
   REVIEW_OPERATION = "Review",
+  REMOVE_PHONE_OR_COMPUTER = "Remove phone or computer",
   REVIEW_TRANSACTION = "Review transaction",
   SEND = "Send",
   SEND_TO_ADDRESS = "Send to address",
@@ -48,7 +50,6 @@ export enum DeviceLabels {
   TRANSACTION_SIGNED = "Transaction Signed",
   TRANSFER = "Transfer",
   TURN_ON_SYNC = "Turn on sync",
-  TURN_ON_SYNC2 = "Turn On sync",
   TYPE_DELEGATE = "Type Delegate",
   VALUE = "Value",
   VERIFY_ADDRESS = "Verify address",

package/src/e2e/enum/Network.ts

@@ -33,4 +33,5 @@ export enum Network {
   LITECOIN = "Litecoin",
   KASPA = "Kaspa",
   HEDERA = "Hedera",
+  SUI = "Sui",
 }

package/src/e2e/enum/TokenType.ts

@@ -2,4 +2,5 @@ export enum TokenType {
   ERC20 = "erc20",
   TRC20 = "trc20",
   SPL = "spl",
+  SUI = "sui",
 }

package/src/e2e/enum/TransactionStatus.ts

@@ -3,7 +3,10 @@ export enum TransactionStatus {
   DELEGATED = "Delegated",
   NFT_RECEIVED = "NFT Received",
   SENT = "Sent",
+  SEND = "Send",
   FEES = "Fees",
   STAKED = "Staked",
   SENDING = "Sending",
+  TRANSACTION_SENT = "Transaction sent",
+  CONFIRMED = "Confirmed",
 }

package/src/e2e/families/bitcoin.ts

@@ -1,12 +1,7 @@
 import expect from "expect";
 import { Transaction } from "../models/Transaction";
-import {
-  pressBoth,
-  pressUntilTextFound,
-  waitFor,
-  containsSubstringInEvent,
-  getSpeculosModel,
-} from "../speculos";
+import { pressBoth, pressUntilTextFound, waitFor, containsSubstringInEvent } from "../speculos";
+import { getSpeculosModel } from "../speculosAppVersion";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import invariant from "invariant";
@@ -27,7 +22,7 @@ export async function sendBTC(tx: Transaction) {
   const speculosDevice = getSpeculosModel();
   try {
     const events =
-      speculosDevice === Device.LNS
+      speculosDevice === Device.LNS.name
         ? await pressUntilTextFound(DeviceLabels.CONTINUE)
         : await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
     const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
@@ -35,7 +30,7 @@ export async function sendBTC(tx: Transaction) {
     const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
     expect(isAddressCorrect).toBeTruthy();
     await pressBoth();
-    if (speculosDevice === Device.LNS) {
+    if (speculosDevice === Device.LNS.name) {
       await pressUntilTextFound(DeviceLabels.SIGN);
       await pressBoth();
       await waitFor(DeviceLabels.BITCOIN_IS_READY);