@ledgerhq/live-common 34.49.0-nightly.6 → 34.49.0

package/src/bridge/react/BridgeSync.tsx

@@ -12,7 +12,6 @@ import type { SyncAction, SyncState, BridgeSyncState } from "./types";
 import { BridgeSyncContext, BridgeSyncStateContext } from "./context";
 import type { Account, TokenAccount } from "@ledgerhq/types-live";
 import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
-import { createSyncSessionManager } from "../syncSessionManager";
 
 export type Props = {
   // this is a wrapping component that you need to put in your tree
@@ -53,7 +52,6 @@ export const BridgeSync = ({
     accounts,
     hydrateCurrency,
   });
-  const sessionManager = useRef(createSyncSessionManager(trackAnalytics)).current;
   const [syncQueue, syncState] = useSyncQueue({
     accounts,
     prepareCurrency,
@@ -61,12 +59,10 @@ export const BridgeSync = ({
     trackAnalytics,
     updateAccountWithUpdater,
     blacklistedTokenIds,
-    sessionManager,
   });
   const sync = useSync({
     syncQueue,
     accounts,
-    sessionManager,
   });
   useSyncBackground({
     sync,
@@ -115,7 +111,6 @@ function useSyncQueue({
   trackAnalytics,
   updateAccountWithUpdater,
   blacklistedTokenIds,
-  sessionManager,
 }) {
   const [bridgeSyncState, setBridgeSyncState]: [BridgeSyncState, any] = useState({});
   const setAccountSyncState = useCallback((accountId: string, s: SyncState) => {
@@ -209,7 +204,6 @@ function useSyncQueue({
               pending: false,
               error: null,
             });
-            sessionManager.onAccountSyncDone(accountId, accounts);
             next();
           },
           error: (raw: Error) => {
@@ -221,7 +215,6 @@ function useSyncQueue({
                 pending: false,
                 error: null,
               });
-              sessionManager.onAccountSyncDone(accountId, accounts);
               next();
               return;
             }
@@ -230,7 +223,6 @@ function useSyncQueue({
               pending: false,
               error,
             });
-            sessionManager.onAccountSyncDone(accountId, accounts, true);
             next();
           },
         });
@@ -239,7 +231,6 @@ function useSyncQueue({
           pending: false,
           error,
         });
-        sessionManager.onAccountSyncDone(accountId, accounts, true);
         next();
       }
     },
@@ -252,7 +243,6 @@ function useSyncQueue({
       trackAnalytics,
       updateAccountWithUpdater,
       blacklistedTokenIds,
-      sessionManager,
     ],
   );
   const synchronizeRef = useRef(synchronize);
@@ -269,7 +259,7 @@ function useSyncQueue({
 }
 
 // useSync: returns a sync function with the syncQueue
-function useSync({ syncQueue, accounts, sessionManager }) {
+function useSync({ syncQueue, accounts }) {
   const skipUnderPriority = useRef(-1);
   const sync = useMemo(() => {
     const schedule = (ids: string[], priority: number, reason: string) => {
@@ -277,10 +267,6 @@ function useSync({ syncQueue, accounts, sessionManager }) {
       // by convention we remove concurrent tasks with same priority
       // FIXME this is somehow a hack. ideally we should just dedup the account ids in the pending queue...
       syncQueue.remove(o => priority === o.priority);
-      // start a global session only if initial + all accounts
-      if (reason === "initial" && ids.length === accounts.length) {
-        sessionManager.start(ids, reason);
-      }
       log("bridge", "schedule " + ids.join(", "));
       syncQueue.push(
         ids.map(accountId => ({
@@ -303,7 +289,7 @@ function useSync({ syncQueue, accounts, sessionManager }) {
       SET_SKIP_UNDER_PRIORITY: ({ priority }: { priority: number }) => {
         if (priority === skipUnderPriority.current) return;
         skipUnderPriority.current = priority;
-        syncQueue.remove(({ priority }) => priority < skipUnderPriority.current);
+        syncQueue.remove(({ priority }) => priority < skipUnderPriority);
 
         if (priority === -1 && !accounts.every(isUpToDateAccount)) {
           // going back to -1 priority => retriggering a background sync if it is "Paused"
@@ -352,7 +338,7 @@ function useSync({ syncQueue, accounts, sessionManager }) {
         });
       }
     };
-  }, [accounts, syncQueue, sessionManager]);
+  }, [accounts, syncQueue]);
   const ref = useRef(sync);
   useEffect(() => {
     ref.current = sync;

package/src/deposit/deposit.integration.test.ts

@@ -4,49 +4,10 @@
 import "../__tests__/test-helpers/setup";
 import { renderHook, waitFor } from "@testing-library/react";
 import { useGroupedCurrenciesByProvider } from ".";
-import { GroupedCurrencies, LoadingBasedGroupedCurrencies, MappedAsset } from "./type";
-import * as api from "./api";
-
-// Mock the API module
-jest.mock("./api");
-const mockGetMappedAssets = api.getMappedAssets as jest.MockedFunction<typeof api.getMappedAssets>;
-
-// Create mock data for testing
-const mockMappedAssets: MappedAsset[] = [
-  {
-    $type: "Coin",
-    ledgerId: "bitcoin",
-    providerId: "coingecko",
-    name: "Bitcoin",
-    ticker: "BTC",
-    status: "active",
-    reason: null,
-    data: {
-      img: "https://crypto-icons.example.com/bitcoin.png",
-      marketCapRank: 1,
-    },
-  },
-  {
-    $type: "Coin",
-    ledgerId: "ethereum",
-    providerId: "coingecko",
-    name: "Ethereum",
-    ticker: "ETH",
-    status: "active",
-    reason: null,
-    data: {
-      img: "https://crypto-icons.example.com/ethereum.png",
-      marketCapRank: 2,
-    },
-  },
-];
+import { GroupedCurrencies, LoadingBasedGroupedCurrencies } from "./type";
+// Explicitly mock the featureFlags module
 
 describe("useGroupedCurrenciesByProvider", () => {
-  beforeEach(() => {
-    // Mock the API call to return our test data
-    mockGetMappedAssets.mockResolvedValue(mockMappedAssets);
-  });
-
   afterEach(() => {
     jest.clearAllMocks();
   });

package/src/e2e/data/deviceLabelsData.ts

@@ -54,7 +54,7 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.MULTIVERS_X.name]: DeviceLabels.SIGN,
       [AppInfos.NEAR.name]: DeviceLabels.CONTINUE_TO_ACTION,
       [AppInfos.SOLANA.name]: DeviceLabels.APPROVE,
-      [AppInfos.TEZOS.name]: DeviceLabels.ACCEPT_RISK,
+      [AppInfos.TEZOS.name]: DeviceLabels.ACCEPT_AND_SEND,
       default: DeviceLabels.CAPS_APPROVE,
     },
   },
@@ -87,12 +87,12 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
     },
     delegateConfirm: {
       [AppInfos.CELO.name]: DeviceLabels.ACCEPT,
-      [AppInfos.TEZOS.name]: DeviceLabels.ACCEPT_AND_SEND,
       [AppInfos.COSMOS.name]: DeviceLabels.CAPS_APPROVE,
       [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.TEZOS.name]: DeviceLabels.ACCEPT_RISK,
       [AppInfos.OSMOSIS.name]: DeviceLabels.CAPS_APPROVE,
       default: DeviceLabels.APPROVE,
     },

package/src/e2e/enum/Account.ts

@@ -248,13 +248,6 @@ export class Account {
     "0xa1baa625c5E6A9304cB7AcD86d2fee6B710eC3eB",
     1,
     undefined,
-  );
-  static readonly ETH_2_WITH_ENS = new Account(
-    Currency.ETH,
-    "Ethereum 2",
-    "0xa1baa625c5E6A9304cB7AcD86d2fee6B710eC3eB",
-    1,
-    undefined,
     "speculos.eth",
   );
   static readonly ETH_2_LOWER_CASE = new Account(
@@ -392,12 +385,6 @@ export class Account {
     "JC2dR4QRMt68r2h7Sjs5wshx1RdmDVrSbdL2jWBuVf2t",
     2,
   );
-  static readonly SOL_4 = new Account(
-    Currency.SOL,
-    "Solana 4",
-    "FKFMRmTEJ6wHMWviuDocuhsZoTi3DnypoPQXBUjCCTXM",
-    3,
-  );
 
   static readonly tBTC_1 = new Account(
     Currency.tBTC,

package/src/e2e/enum/DeviceLabels.ts

@@ -6,8 +6,9 @@ export enum DeviceLabels {
   ADDRESS = "Address",
   AMOUNT = "Amount",
   APPROVE = "Approve",
-  BITCOIN_IS_READY = "Bitcoin is ready",
+  CANCEL = "Cancel",
   CAPS_APPROVE = "APPROVE",
+  CAPS_REJECT = "REJECT",
   CHAIN_ID = "Chain ID",
   CONFIRM = "Confirm",
   CONNECT = "Connect",
@@ -18,14 +19,19 @@ export enum DeviceLabels {
   DELEGATE_FROM = "Delegate from",
   DELEGATE_STAKE = "Delegate stake",
   DEPOSIT = "Deposit",
+  DEST = "Dest",
+  DESTINATION = "Destination",
   EXPERT_MODE = "Expert mode",
   FEES = "Fees",
+  FINALIZE = "Finalize",
   GET = "Get",
   I_UNDERSTAND = "I understand",
   LEDGER_LIVE_WILL_BE = "Ledger Live will be",
+  METHOD_NAME = "Method name",
   NEW_ORDINARY = "New ordinary",
   PLEASE_REVIEW = "Please",
   PUBKEY = "Pubkey",
+  PUBLICKEY = "Public Key Hash",
   READY = "Ready",
   RECEIVE_ADDRESS_DOES_NOT_BELONG = "Receive address does",
   RECEIVER = "Receiver",
@@ -45,7 +51,6 @@ export enum DeviceLabels {
   STAKE_KEY = "Stake key",
   TO = "To",
   TRANSACTION_FEE = "Transaction fee",
-  TRANSACTION_SIGNED = "Transaction Signed",
   TRANSFER = "Transfer",
   TURN_ON_SYNC = "Turn on sync",
   TURN_ON_SYNC2 = "Turn On sync",
@@ -58,4 +63,5 @@ export enum DeviceLabels {
   VERIFY_SOLANA_ADDRESS = "Verify Solana address",
   VIEW_ACTION = "View action",
   VIEW_HEADER = "View Header",
+  WALLET_ID = "Wallet ID",
 }

package/src/e2e/families/bitcoin.ts

@@ -1,15 +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 { DeviceLabels } from "../enum/DeviceLabels";
-import { Device } from "../enum/Device";
-import invariant from "invariant";
 
 export async function sendBTCBasedCoin(tx: Transaction) {
   const events = await pressUntilTextFound(DeviceLabels.ACCEPT);
@@ -22,27 +14,3 @@ export async function sendBTCBasedCoin(tx: Transaction) {
   await pressUntilTextFound(DeviceLabels.ACCEPT);
   await pressBoth();
 }
-
-export async function sendBTC(tx: Transaction) {
-  const speculosDevice = getSpeculosModel();
-  try {
-    const events =
-      speculosDevice === Device.LNS
-        ? await pressUntilTextFound(DeviceLabels.CONTINUE)
-        : await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
-    const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
-    expect(isAmountCorrect).toBeTruthy();
-    const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
-    expect(isAddressCorrect).toBeTruthy();
-    await pressBoth();
-    if (speculosDevice === Device.LNS) {
-      await pressUntilTextFound(DeviceLabels.SIGN);
-      await pressBoth();
-      await waitFor(DeviceLabels.BITCOIN_IS_READY);
-    } else {
-      await waitFor(DeviceLabels.TRANSACTION_SIGNED);
-    }
-  } catch (e) {
-    invariant(false, `Error while sending BTC transaction: ${e}`);
-  }
-}

package/src/e2e/families/tezos.ts

@@ -1,23 +1,14 @@
-import {
-  getDelegateEvents,
-  getDeviceLabels,
-  getSpeculosModel,
-  pressBoth,
-  pressUntilTextFound,
-} from "../speculos";
+import { getDelegateEvents, getSpeculosModel, pressBoth, pressUntilTextFound } from "../speculos";
+import { DeviceLabels } from "../enum/DeviceLabels";
 import { Delegate } from "../models/Delegate";
 import { DeviceModelId } from "@ledgerhq/types-devices";
-import { DeviceLabels } from "../enum/DeviceLabels";
 
 export async function delegateTezos(delegatingAccount: Delegate) {
-  const { delegateConfirmLabel } = getDeviceLabels(delegatingAccount.account.currency.speculosApp);
-
   await getDelegateEvents(delegatingAccount);
-  await pressUntilTextFound(delegateConfirmLabel);
   await pressBoth();
 
-  if (getSpeculosModel() == DeviceModelId.nanoS) {
-    await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND);
+  if (getSpeculosModel() !== DeviceModelId.nanoS) {
+    await pressUntilTextFound(DeviceLabels.ACCEPT);
     await pressBoth();
   }
 }

package/src/e2e/models/Swap.ts

@@ -27,12 +27,4 @@ export class Swap extends Transaction {
   public get getAmount(): string {
     return this.amount;
   }
-
-  public get getAccountToDebit(): Account {
-    return this.accountToDebit;
-  }
-
-  public get getAccountToCredit(): Account {
-    return this.accountToCredit;
-  }
 }

package/src/e2e/speculos.ts

@@ -19,7 +19,7 @@ import { Account } from "./enum/Account";
 import { Device as CryptoWallet } from "./enum/Device";
 import { Currency } from "./enum/Currency";
 import expect from "expect";
-import { sendBTC, sendBTCBasedCoin } from "./families/bitcoin";
+import { sendBTCBasedCoin } from "./families/bitcoin";
 import { sendEVM, sendEvmNFT } from "./families/evm";
 import { sendPolkadot } from "./families/polkadot";
 import { sendAlgorand } from "./families/algorand";
@@ -630,7 +630,7 @@ type DeviceLabelsReturn = {
   receiveVerifyLabel: string;
 };
 
-export function getDeviceLabels(appInfo: AppInfos): DeviceLabelsReturn {
+function getDeviceLabels(appInfo: AppInfos): DeviceLabelsReturn {
   const deviceModel = getSpeculosModel();
   const deviceConfig = DEVICE_LABELS_CONFIG[deviceModel] ?? DEVICE_LABELS_CONFIG.default;
 
@@ -668,12 +668,6 @@ export async function signSendTransaction(tx: Transaction) {
     case Currency.ETH:
       await sendEVM(tx);
       break;
-    case Currency.BTC:
-      await sendBTC(tx);
-      break;
-    case Currency.ETH_USDT:
-      await sendEVM(tx);
-      break;
     case Currency.DOGE:
     case Currency.BCH:
       await sendBTCBasedCoin(tx);
@@ -765,7 +759,6 @@ export async function getDelegateEvents(delegatingAccount: Delegate): Promise<st
   );
 
   await waitFor(delegateVerifyLabel);
-
   return await pressUntilTextFound(delegateConfirmLabel);
 }
 
@@ -775,38 +768,54 @@ export async function verifyAmountsAndAcceptSwap(swap: Swap, amount: string) {
     getSpeculosModel() === DeviceModelId.nanoS
       ? await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND)
       : await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
-  verifySwapData(swap, events, amount);
+  await verifySwapData(swap, events, amount);
   await pressBoth();
 }
 
 export async function verifyAmountsAndAcceptSwapForDifferentSeed(swap: Swap, amount: string) {
-  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
+  await waitFor(DeviceLabels.RECEIVE_ADDRESS_DOES_NOT_BELONG);
+  await pressUntilTextFound(DeviceLabels.I_UNDERSTAND);
+  await pressBoth();
   const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
-  verifySwapData(swap, events, amount);
+  await verifySwapData(swap, events, amount);
   await pressBoth();
 }
 
 export async function verifyAmountsAndRejectSwap(swap: Swap, amount: string) {
   await waitFor(DeviceLabels.REVIEW_TRANSACTION);
   const events = await pressUntilTextFound(DeviceLabels.REJECT);
-  verifySwapData(swap, events, amount);
+  await verifySwapData(swap, events, amount);
   await pressBoth();
 }
 
-function verifySwapData(swap: Swap, events: string[], amount: string) {
-  const swapPair = `swap ${swap.getAccountToDebit.currency.ticker} to ${swap.getAccountToCredit.currency.ticker}`;
+async function verifySwapData(swap: Swap, events: string[], amount: string) {
+  const sendAmountScreen = containsSubstringInEvent(amount, events);
+  expect(sendAmountScreen).toBeTruthy();
+  verifySwapGetAmountScreen(swap, events);
+  verifySwapFeesAmountScreen(swap, events);
+}
+
+function verifySwapGetAmountScreen(swap: Swap, events: string[]) {
+  const parsedAmountToReceive = extractNumberFromString(swap.amountToReceive);
+  swap.amountToReceive =
+    parsedAmountToReceive.length < 19
+      ? parsedAmountToReceive
+      : parsedAmountToReceive.substring(0, 18);
 
-  if (getSpeculosModel() !== DeviceModelId.nanoS) {
-    expectDeviceScreenContains(swapPair, events, "Swap pair not found on the device screen");
-  }
-  expectDeviceScreenContains(amount, events, `Amount ${amount} not found on the device screen`);
+  const receivedGetAmount = containsSubstringInEvent(`${swap.amountToReceive}`, events);
+  expect(receivedGetAmount).toBeTruthy();
 }
 
-function expectDeviceScreenContains(substring: string, events: string[], message: string) {
-  const found = containsSubstringInEvent(substring, events);
-  if (!found) {
-    throw new Error(
-      `${message}. Expected events to contain "${substring}". Got: ${JSON.stringify(events)}`,
-    );
-  }
+function verifySwapFeesAmountScreen(swap: Swap, events: string[]) {
+  const parsedFeesAmount = extractNumberFromString(swap.feesAmount);
+  swap.feesAmount =
+    parsedFeesAmount.length < 19 ? parsedFeesAmount : parsedFeesAmount.substring(0, 18);
+
+  const receivedFeesAmount = containsSubstringInEvent(swap.feesAmount, events);
+  expect(receivedFeesAmount).toBeTruthy();
 }
+
+const extractNumberFromString = (input: string | undefined): string => {
+  const match = input?.match(/[\d.]+/);
+  return match ? match[0] : "";
+};

package/src/exchange/providers/swap.ts

@@ -177,9 +177,9 @@ const DEFAULT_SWAP_PROVIDERS: Record<string, ProviderConfig & Partial<Additional
     type: "CEX",
     name: "NEAR Intents",
     needsBearerToken: false,
-    termsOfUseUrl: "https://swapkit.dev/terms-of-service/",
+    termsOfUseUrl: "https://docs.thorswap.finance/thorswap/resources/terms-of-service",
     supportUrl: "https://ledgerhelp.swapkit.dev/",
-    mainUrl: "https://www.near.org/intents",
+    mainUrl: "https://www.thorswap.finance/",
     needsKYC: false,
     version: 2,
     publicKey: {