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

package/src/wallet-api/useDappLogic.ts

@@ -8,16 +8,15 @@ import { getAccountBridge } from "../bridge";
 import { getEnv } from "@ledgerhq/live-env";
 import network from "@ledgerhq/live-network/network";
 import { getWalletAPITransactionSignFlowInfos } from "./converters";
-import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/index";
-import { getCryptoAssetsStore } from "../bridge/crypto-assets/index";
 import { prepareMessageToSign } from "../hw/signMessage/index";
-import { CurrentAccountHistDB, UiHook, usePermission } from "./react";
+import { CurrentAccountHistDB, UiHook } from "./react";
 import BigNumber from "bignumber.js";
 import { safeEncodeEIP55 } from "@ledgerhq/coin-evm/utils";
 import { SmartWebsocket } from "./SmartWebsocket";
 import { stripHexPrefix } from "./helpers";
 import { getTxType } from "./utils/txTrackingHelper";
 import { Transaction as EvmTransaction } from "@ledgerhq/coin-evm/types/transaction";
+import { getCryptoAssetsStore } from "../bridge/crypto-assets";
 
 type MessageId = number | string | null;
 
@@ -88,6 +87,8 @@ export function useDappCurrentAccount(currentAccountHistDb?: CurrentAccountHistD
   return { currentAccount, setCurrentAccount, setCurrentAccountHist };
 }
 
+const globCurrencies = ["**"];
+
 function useDappAccountLogic({
   manifest,
   accounts,
@@ -100,7 +101,7 @@ function useDappAccountLogic({
   initialAccountId?: string;
 }) {
   const [initialAccountSelected, setInitialAccountSelected] = useState(false);
-  const { currencyIds } = usePermission(manifest);
+  const currencyIds = manifest.currencies === "*" ? globCurrencies : manifest.currencies;
   const { currentAccount, setCurrentAccount, setCurrentAccountHist } =
     useDappCurrentAccount(currentAccountHistDb);
   const currentParentAccount = useMemo(() => {
@@ -434,7 +435,8 @@ export function useDappLogic({
           try {
             await new Promise<void>((resolve, reject) =>
               uiHook["account.request"]({
-                currencies: [getCryptoCurrencyById(requestedCurrency.currency)],
+                currencyIds: [requestedCurrency.currency],
+                areCurrenciesFiltered: true,
                 onSuccess: account => {
                   setCurrentAccountHist(manifest.id, account);
                   setCurrentAccount(account);
@@ -474,108 +476,95 @@ export function useDappLogic({
               : currentParentAccount.freshAddress;
 
           if (address.toLowerCase() === ethTX.from.toLowerCase()) {
-            (async () => {
-              let trackingData: DAppTrackingData | undefined;
-              try {
-                const signFlowInfos = getWalletAPITransactionSignFlowInfos({
-                  walletApiTransaction: tx,
+            let trackingData: DAppTrackingData | undefined;
+            try {
+              const signFlowInfos = getWalletAPITransactionSignFlowInfos({
+                walletApiTransaction: tx,
+                account: currentAccount,
+              });
+
+              const transactionType = getTxType(signFlowInfos.liveTx as EvmTransaction);
+
+              const accountCurrencyName =
+                currentAccount.type === "TokenAccount"
+                  ? currentAccount.token.name
+                  : currentAccount.currency.name;
+
+              const accountNetwork =
+                currentAccount.type === "TokenAccount"
+                  ? currentAccount.token.parentCurrency.id
+                  : currentAccount.currency.id;
+
+              const token = await getCryptoAssetsStore().findTokenByAddressInCurrency(
+                tx.recipient,
+                accountNetwork,
+              );
+
+              trackingData = {
+                type: transactionType,
+                currency: token ? token.name : accountCurrencyName,
+                network: token ? token.parentCurrency.id : accountNetwork,
+              };
+
+              const options = nanoApp
+                ? { hwAppId: nanoApp, dependencies: dependencies }
+                : undefined;
+              tracking.dappSendTransactionRequested(manifest, trackingData);
+
+              const signedTransaction = await new Promise<SignedOperation>((resolve, reject) =>
+                uiHook["transaction.sign"]({
                   account: currentAccount,
-                });
+                  parentAccount: undefined,
+                  signFlowInfos,
+                  options,
+                  onSuccess: signedOperation => {
+                    resolve(signedOperation);
+                  },
+                  onError: error => {
+                    reject(error);
+                  },
+                }),
+              );
+
+              const bridge = getAccountBridge(currentAccount, undefined);
+              const mainAccount = getMainAccount(currentAccount, undefined);
 
-                const transactionType = getTxType(signFlowInfos.liveTx as EvmTransaction);
-
-                const token = await getCryptoAssetsStore().findTokenByAddressInCurrency(
-                  tx.recipient,
-                  currentAccount.type === "TokenAccount"
-                    ? currentAccount.token.parentCurrency.id
-                    : currentAccount.currency.id,
-                );
-
-                const accountCurrencyName =
-                  currentAccount.type === "TokenAccount"
-                    ? currentAccount.token.name
-                    : currentAccount.currency.name;
-
-                const accountNetwork =
-                  currentAccount.type === "TokenAccount"
-                    ? currentAccount.token.parentCurrency.id
-                    : currentAccount.currency.id;
-
-                trackingData = {
-                  type: transactionType,
-                  currency: token ? token.name : accountCurrencyName,
-                  network: token ? token.parentCurrency.id : accountNetwork,
-                };
-
-                const options = nanoApp
-                  ? { hwAppId: nanoApp, dependencies: dependencies }
-                  : undefined;
-                tracking.dappSendTransactionRequested(manifest, trackingData);
-
-                const signedTransaction = await new Promise<SignedOperation>((resolve, reject) =>
-                  uiHook["transaction.sign"]({
-                    account: currentAccount,
-                    parentAccount: undefined,
-                    signFlowInfos,
-                    options,
-                    onSuccess: signedOperation => {
-                      resolve(signedOperation);
-                    },
-                    onError: error => {
-                      reject(error);
-                    },
-                  }),
-                );
-
-                const bridge = getAccountBridge(currentAccount, undefined);
-                const mainAccount = getMainAccount(currentAccount, undefined);
-
-                let optimisticOperation: Operation = signedTransaction.operation;
-
-                if (!getEnv("DISABLE_TRANSACTION_BROADCAST")) {
-                  optimisticOperation = await bridge.broadcast({
-                    account: mainAccount,
-                    signedOperation: signedTransaction,
-                    broadcastConfig: { mevProtected: !!mevProtected },
-                  });
-                }
-
-                uiHook["transaction.broadcast"](
-                  currentAccount,
-                  undefined,
-                  mainAccount,
-                  optimisticOperation,
-                );
-
-                tracking.dappSendTransactionSuccess(manifest, trackingData);
-
-                postMessage(
-                  JSON.stringify({
-                    id: data.id,
-                    jsonrpc: "2.0",
-                    result: optimisticOperation.hash,
-                  }),
-                );
-              } catch (error) {
-                tracking.dappSendTransactionFail(manifest, trackingData);
-                postMessage(
-                  JSON.stringify({
-                    id: data.id,
-                    jsonrpc: "2.0",
-                    error: rejectedError("Transaction declined"),
-                  }),
-                );
+              let optimisticOperation: Operation = signedTransaction.operation;
+
+              if (!getEnv("DISABLE_TRANSACTION_BROADCAST")) {
+                optimisticOperation = await bridge.broadcast({
+                  account: mainAccount,
+                  signedOperation: signedTransaction,
+                  broadcastConfig: { mevProtected: !!mevProtected },
+                });
               }
-            })().catch(error => {
-              console.error("Error in eth_sendTransaction handler:", error);
+
+              uiHook["transaction.broadcast"](
+                currentAccount,
+                undefined,
+                mainAccount,
+                optimisticOperation,
+              );
+
+              tracking.dappSendTransactionSuccess(manifest, trackingData);
+
               postMessage(
                 JSON.stringify({
                   id: data.id,
                   jsonrpc: "2.0",
-                  error: rejectedError("Transaction processing failed"),
+                  result: optimisticOperation.hash,
                 }),
               );
-            });
+            } catch (error) {
+              tracking.dappSendTransactionFail(manifest, trackingData);
+              postMessage(
+                JSON.stringify({
+                  id: data.id,
+                  jsonrpc: "2.0",
+                  error: rejectedError("Transaction declined"),
+                }),
+              );
+            }
           }
           break;
         }
@@ -684,17 +673,13 @@ export function useDappLogic({
           if (ws.current) {
             ws.current.send(data);
           } else if (currentNetwork.nodeURL?.startsWith("https:")) {
-            network({
+            void network({
               method: "POST",
               url: currentNetwork.nodeURL,
               data,
-            })
-              .then(res => {
-                postMessage(JSON.stringify(res.data));
-              })
-              .catch(() => {
-                // Silently ignore network errors
-              });
+            }).then(res => {
+              postMessage(JSON.stringify(res.data));
+            });
           }
           break;
         }

package/src/currencies/helpers.test.ts

@@ -1,20 +0,0 @@
-import "../__tests__/test-helpers/setup";
-import { isCryptoCurrency, isTokenCurrency, listCurrencies } from "./helpers";
-
-describe("Currencies helpers", () => {
-  test("listCurrencies without includeTokens", () => {
-    const currencies = listCurrencies(false);
-
-    currencies.forEach(currency => {
-      expect(isCryptoCurrency(currency)).toBeTruthy();
-    });
-  });
-
-  test("listCurrencies with includeTokens", () => {
-    const currencies = listCurrencies(true);
-
-    currencies.forEach(currency => {
-      expect(isCryptoCurrency(currency) || isTokenCurrency(currency)).toBeTruthy();
-    });
-  });
-});