feat(sdk): include chainId in all events

Author: gregfromstl

packages/thirdweb/src/analytics/track/connect.ts

@@ -10,8 +10,9 @@ export async function trackConnect(args: {
   ecosystem?: Ecosystem;
   walletType: string;
   walletAddress: string;
+  chainId?: number;
 }) {
-  const { client, ecosystem, walletType, walletAddress } = args;
+  const { client, ecosystem, walletType, walletAddress, chainId } = args;
   return track({
     client,
     ecosystem,
@@ -20,6 +21,7 @@ export async function trackConnect(args: {
       action: "connect",
       walletType,
       walletAddress,
+      chainId,
     },
   });
 }

packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx

@@ -279,7 +279,7 @@ export function SwapConfirmationScreen(props: {
                   fromAmount: props.quote.swapDetails.fromAmountWei,
                   toToken: props.quote.swapDetails.toToken.tokenAddress,
                   toAmount: props.quote.swapDetails.toAmountWei,
-                  chainId: props.quote.swapDetails.toToken.chainId,
+                  chainId: props.quote.swapDetails.fromToken.chainId,
                   dstChainId: props.quote.swapDetails.toToken.chainId,
                 });
 

packages/thirdweb/src/react/web/ui/TransactionButton/TransactionModal.tsx

@@ -42,6 +42,7 @@ export function TransactionModal(props: ModalProps) {
         client: props.client,
         walletAddress: account.address,
         walletType: wallet.id,
+        dstChainId: props.tx.chain.id,
         event: "open_pay_transaction_modal",
       });
     },

packages/thirdweb/src/wallets/coinbase/coinbase-wallet.ts

@@ -81,6 +81,7 @@ export function coinbaseWalletSDK(args: {
         client: options.client,
         walletType: COINBASE,
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return account
       return account;
@@ -100,6 +101,7 @@ export function coinbaseWalletSDK(args: {
         client: options.client,
         walletType: COINBASE,
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return account
       return account;

packages/thirdweb/src/wallets/create-wallet.ts

@@ -250,6 +250,7 @@ export function createWallet<const ID extends WalletId>(
               client: options.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             // return account
             return account;
@@ -281,6 +282,7 @@ export function createWallet<const ID extends WalletId>(
               client: options.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             // return account
             return account;
@@ -314,6 +316,7 @@ export function createWallet<const ID extends WalletId>(
               client: wcOptions.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             return account;
           }
@@ -359,6 +362,7 @@ export function createWallet<const ID extends WalletId>(
               client: options.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             // return account
             return account;

packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.ts

@@ -106,6 +106,7 @@ export function createInAppWallet(args: {
         ecosystem,
         walletType: walletId,
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return only the account
       return account;
@@ -153,6 +154,7 @@ export function createInAppWallet(args: {
         ecosystem,
         walletType: walletId,
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return only the account
       return account;

packages/thirdweb/src/wallets/native/create-wallet.ts

@@ -169,6 +169,7 @@ export function createWallet<const ID extends WalletId>(
               client: options.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             // return account
             return account;
@@ -202,6 +203,7 @@ export function createWallet<const ID extends WalletId>(
               client: wcOptions.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             return account;
           }

packages/thirdweb/src/wallets/smart/smart-wallet.ts

@@ -167,6 +167,7 @@ export function smartWallet(
         client: options.client,
         walletType: "smart",
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return account
       return account;
@@ -187,6 +188,7 @@ export function smartWallet(
         client: options.client,
         walletType: "smart",
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return account
       emitter.emit("accountChanged", account);