@ledgerhq/live-common 34.54.0-nightly.20251206023719 → 34.54.0-nightly.20251209140356

package/src/wallet-api/logic.ts

@@ -88,24 +88,25 @@ export async function signTransactionLogic(
     },
   ) => Promise<SignedOperation>,
   tokenCurrency?: string,
+  isEmbeddedSwap?: boolean,
 ): Promise<SignedOperation> {
-  tracking.signTransactionRequested(manifest);
+  tracking.signTransactionRequested(manifest, isEmbeddedSwap);
 
   if (!transaction) {
-    tracking.signTransactionFail(manifest);
+    tracking.signTransactionFail(manifest, isEmbeddedSwap);
     throw new Error("Transaction required");
   }
 
   const accountId = getAccountIdFromWalletAccountId(walletAccountId);
   if (!accountId) {
-    tracking.signTransactionFail(manifest);
+    tracking.signTransactionFail(manifest, isEmbeddedSwap);
     throw new Error(`accountId ${walletAccountId} unknown`);
   }
 
   const account = accounts.find(account => account.id === accountId);
 
   if (!account) {
-    tracking.signTransactionFail(manifest);
+    tracking.signTransactionFail(manifest, isEmbeddedSwap);
     throw new Error("Account required");
   }
 

package/src/wallet-api/react.ts

@@ -806,8 +806,12 @@ export function useWalletAPIServer({
 
     server.setHandler(
       "transaction.signAndBroadcast",
-      async ({ accountId, tokenCurrency, transaction, options }) => {
+      async ({ accountId, tokenCurrency, transaction, options, meta }) => {
         const sponsored = transaction.family === "ethereum" && transaction.sponsored;
+        // isEmbedded is passed via meta (not transaction) as it's a tracking param, not a tx property
+        const isEmbeddedSwap =
+          transaction.family === "ethereum" &&
+          (meta as { isEmbedded?: boolean } | undefined)?.isEmbedded;
 
         const signedTransaction = await signTransactionLogic(
           { manifest, accounts, tracking },
@@ -824,18 +828,19 @@ export function useWalletAPIServer({
                 onSuccess: signedOperation => {
                   if (done) return;
                   done = true;
-                  tracking.signTransactionSuccess(manifest);
+                  tracking.signTransactionSuccess(manifest, isEmbeddedSwap);
                   resolve(signedOperation);
                 },
                 onError: error => {
                   if (done) return;
                   done = true;
-                  tracking.signTransactionFail(manifest);
+                  tracking.signTransactionFail(manifest, isEmbeddedSwap);
                   reject(error);
                 },
               });
             }),
           tokenCurrency,
+          isEmbeddedSwap,
         );
 
         return broadcastTransactionLogic(
@@ -858,9 +863,9 @@ export function useWalletAPIServer({
                     sponsored,
                   },
                 });
-                tracking.broadcastSuccess(manifest);
+                tracking.broadcastSuccess(manifest, isEmbeddedSwap);
               } catch (error) {
-                tracking.broadcastFail(manifest);
+                tracking.broadcastFail(manifest, isEmbeddedSwap);
                 throw error;
               }
             }

package/src/wallet-api/tracking.ts

@@ -56,18 +56,30 @@ export default function trackingWrapper(trackCall: TrackWalletAPI) {
     },
 
     // Sign transaction modal open
-    signTransactionRequested: (manifest: AppManifest) => {
-      track("WalletAPI SignTransaction", getEventData(manifest));
+    signTransactionRequested: (manifest: AppManifest, isEmbeddedSwap?: boolean) => {
+      const properties = {
+        ...getEventData(manifest),
+        ...(isEmbeddedSwap !== undefined && { isEmbeddedSwap: String(isEmbeddedSwap) }),
+      };
+      track("WalletAPI SignTransaction", properties);
     },
 
     // Failed to sign transaction (cancel or error)
-    signTransactionFail: (manifest: AppManifest) => {
-      track("WalletAPI SignTransaction Fail", getEventData(manifest));
+    signTransactionFail: (manifest: AppManifest, isEmbeddedSwap?: boolean) => {
+      const properties = {
+        ...getEventData(manifest),
+        ...(isEmbeddedSwap !== undefined && { isEmbeddedSwap: String(isEmbeddedSwap) }),
+      };
+      track("WalletAPI SignTransaction Fail", properties);
     },
 
     // Successfully signed transaction
-    signTransactionSuccess: (manifest: AppManifest) => {
-      track("WalletAPI SignTransaction Success", getEventData(manifest));
+    signTransactionSuccess: (manifest: AppManifest, isEmbeddedSwap?: boolean) => {
+      const properties = {
+        ...getEventData(manifest),
+        ...(isEmbeddedSwap !== undefined && { isEmbeddedSwap: String(isEmbeddedSwap) }),
+      };
+      track("WalletAPI SignTransaction Success", properties);
     },
 
     // Sign Raw transaction modal open
@@ -116,13 +128,21 @@ export default function trackingWrapper(trackCall: TrackWalletAPI) {
     },
 
     // Failed to broadcast a signed transaction
-    broadcastFail: (manifest: AppManifest) => {
-      track("WalletAPI Broadcast Fail", getEventData(manifest));
+    broadcastFail: (manifest: AppManifest, isEmbeddedSwap?: boolean) => {
+      const properties = {
+        ...getEventData(manifest),
+        ...(isEmbeddedSwap !== undefined && { isEmbeddedSwap: String(isEmbeddedSwap) }),
+      };
+      track("WalletAPI Broadcast Fail", properties);
     },
 
     // Successfully broadcast a signed transaction
-    broadcastSuccess: (manifest: AppManifest) => {
-      track("WalletAPI Broadcast Success", getEventData(manifest));
+    broadcastSuccess: (manifest: AppManifest, isEmbeddedSwap?: boolean) => {
+      const properties = {
+        ...getEventData(manifest),
+        ...(isEmbeddedSwap !== undefined && { isEmbeddedSwap: String(isEmbeddedSwap) }),
+      };
+      track("WalletAPI Broadcast Success", properties);
     },
 
     // Successfully broadcast a signed transaction

package/src/wallet-api/useDappLogic.ts

@@ -29,15 +29,27 @@ interface JsonRpcRequestMessage<TParams = any> {
   params?: TParams;
 }
 
-const rejectedError = (message: string) => ({
-  code: 3,
+const errors = {
+  ParseError: -32700,
+  InvalidRequest: -32600,
+  MethodNotFound: -32601,
+  InvalidParams: -32602,
+  InternalError: -32603,
+  UserRejected: 4001,
+  Unauthorized: 4100,
+  UnsupportedMethod: 4200,
+  Disconnected: 4900,
+  ChainDisconnected: 4901,
+} as const;
+
+const rejectedError = (code: number, message: string, data: object = {}) => ({
+  code,
   message,
-  data: [
-    {
-      code: 104,
-      message: "Rejected",
-    },
-  ],
+  data: {
+    code,
+    message,
+    ...data,
+  },
 });
 
 // TODO remove any usage
@@ -331,7 +343,7 @@ export function useDappLogic({
           JSON.stringify({
             id: data.id,
             jsonrpc: "2.0",
-            error: rejectedError("No network selected"),
+            error: rejectedError(errors.InternalError, "No network selected"),
           }),
         );
         return;
@@ -343,7 +355,7 @@ export function useDappLogic({
           JSON.stringify({
             id: data.id,
             jsonrpc: "2.0",
-            error: rejectedError("No account selected"),
+            error: rejectedError(errors.InternalError, "No account selected"),
           }),
         );
         return;
@@ -355,7 +367,7 @@ export function useDappLogic({
           JSON.stringify({
             id: data.id,
             jsonrpc: "2.0",
-            error: rejectedError("No parent account found"),
+            error: rejectedError(errors.InternalError, "No parent account found"),
           }),
         );
         return;
@@ -410,7 +422,7 @@ export function useDappLogic({
               JSON.stringify({
                 id: data.id,
                 jsonrpc: "2.0",
-                error: rejectedError("Invalid chainId"),
+                error: rejectedError(errors.InvalidParams, "Invalid chainId"),
               }),
             );
             break;
@@ -426,7 +438,7 @@ export function useDappLogic({
               JSON.stringify({
                 id: data.id,
                 jsonrpc: "2.0",
-                error: rejectedError(`Chain ID ${chainId} is not supported`),
+                error: rejectedError(errors.InvalidParams, `Chain ID ${chainId} is not supported`),
               }),
             );
             break;
@@ -459,7 +471,7 @@ export function useDappLogic({
               JSON.stringify({
                 id: data.id,
                 jsonrpc: "2.0",
-                error: rejectedError(`error switching chain: ${error}`),
+                error: rejectedError(errors.UserRejected, `error switching chain: ${error}`),
               }),
             );
           }
@@ -555,13 +567,13 @@ export function useDappLogic({
                   result: optimisticOperation.hash,
                 }),
               );
-            } catch (error) {
+            } catch {
               tracking.dappSendTransactionFail(manifest, trackingData);
               postMessage(
                 JSON.stringify({
                   id: data.id,
                   jsonrpc: "2.0",
-                  error: rejectedError("Transaction declined"),
+                  error: rejectedError(errors.UserRejected, "Transaction declined"),
                 }),
               );
             }
@@ -609,13 +621,13 @@ export function useDappLogic({
                 result: signedMessage,
               }),
             );
-          } catch (error) {
+          } catch {
             tracking.dappPersonalSignFail(manifest);
             postMessage(
               JSON.stringify({
                 id: data.id,
                 jsonrpc: "2.0",
-                error: rejectedError("Personal message signed declined"),
+                error: rejectedError(errors.UserRejected, "Personal message signed declined"),
               }),
             );
           }
@@ -656,13 +668,13 @@ export function useDappLogic({
                 result: signedMessage,
               }),
             );
-          } catch (error) {
+          } catch {
             tracking.dappSignTypedDataFail(manifest);
             postMessage(
               JSON.stringify({
                 id: data.id,
                 jsonrpc: "2.0",
-                error: rejectedError("Typed Data message signed declined"),
+                error: rejectedError(errors.UserRejected, "Typed Data message signed declined"),
               }),
             );
           }

package/src/wallet-api/utils/extractDappURLFromManifest.ts

@@ -5,7 +5,7 @@ export function extractDappURLFromManifest(manifest: LiveAppManifest): URL | und
     try {
       const url = new URL(manifest.params.dappUrl);
       return url;
-    } catch (error) {
+    } catch {
       // Invalid URL
       return undefined;
     }
@@ -19,7 +19,7 @@ export function extractDappURLFromManifest(manifest: LiveAppManifest): URL | und
     try {
       const url = new URL(manifest.params.dappURL);
       return url;
-    } catch (error) {
+    } catch {
       // Invalid URL
       return undefined;
     }
@@ -31,7 +31,7 @@ export function extractDappURLFromManifest(manifest: LiveAppManifest): URL | und
       }
       const url = new URL(manifest.url);
       return url;
-    } catch (error) {
+    } catch {
       // Invalid URL
       return undefined;
     }

package/src/wallet-api/utils/extractURLFromManifest.ts

@@ -19,7 +19,7 @@ export function extractURLFromManifest(manifest: LiveAppManifest): URL | undefin
     }
     const url = new URL(manifest.url);
     return url;
-  } catch (error) {
+  } catch {
     // Invalid URL
     return undefined;
   }