some cleanups

src/background/Wallet/Wallet.ts

@@ -939,10 +939,6 @@ export class Wallet {
       const safeTx = removeSignature(transactionResponse);
       emitter.emit('transactionSent', {
         transaction: safeTx,
-        // initiator,
-        // feeValueCommon,
-        // addressAction,
-        // quote,
         ...transactionContextParams,
       });
       return safeTx;

src/background/events.ts

@@ -31,21 +31,13 @@ export const emitter = createNanoEvents<{
   chainsUpdated: () => void;
   chainChanged: (chain: Chain) => void;
   transactionSent: (
-    data: {
-      transaction: TransactionResponse;
-    } & TransactionContextParams
+    data: { transaction: TransactionResponse } & TransactionContextParams
   ) => void;
   typedDataSigned: (
-    data: {
-      typedData: TypedData;
-      address: string;
-    } & MessageContextParams
+    data: { typedData: TypedData; address: string } & MessageContextParams
   ) => void;
   messageSigned: (
-    data: {
-      message: string;
-      address: string;
-    } & MessageContextParams
+    data: { message: string; address: string } & MessageContextParams
   ) => void;
   userActivity: () => void;
   connectToSiteEvent: (info: { origin: string }) => void;

src/shared/analytics/analytics.background.ts

@@ -35,9 +35,9 @@ function queryWalletProvider(account: Account, address: string) {
 function trackAppEvents({ account }: { account: Account }) {
   const getProvider = (address: string) =>
     getProviderForMetabase(queryWalletProvider(account, address));
-  const getUserId = () => account.getUser()?.id;
 
   const createParams: typeof createBaseParams = (params) => {
+    const getUserId = () => account.getUser()?.id;
     return createBaseParams({ ...params, userId: getUserId() });
   };
   emitter.on('dappConnection', ({ origin, address }) => {
@@ -105,23 +105,21 @@ function trackAppEvents({ account }: { account: Account }) {
         screen_name: origin === initiator ? 'Transaction Request' : pathname,
         wallet_address: transaction.from,
         wallet_provider: getProvider(transaction.from),
-        /* @deprecated*/
+        /* @deprecated */
         context: initiatorName,
-        /* @deprecated*/
+        /* @deprecated */
         type: 'Sign',
-        clientScope: clientScope ?? initiatorName,
+        client_scope: clientScope ?? initiatorName,
         action_type: addressActionAnalytics?.action_type ?? 'Execute',
-        dapp_domain: globalThis.location.origin === origin ? null : origin,
+        dapp_domain: isInternalOrigin ? null : origin,
         chain,
         gas: transaction.gasLimit.toString(),
         hash: transaction.hash,
         asset_amount_sent: [], // TODO
         gas_price: null, // TODO
         network_fee: null, // TODO
         network_fee_value: feeValueCommon,
-        contract_type: quote?.contract_metadata
-          ? quote.contract_metadata.name
-          : null,
+        contract_type: quote?.contract_metadata?.name ?? null,
         ...addressActionAnalytics,
       });
       sendToMetabase('signed_transaction', params);
@@ -173,13 +171,12 @@ function trackAppEvents({ account }: { account: Account }) {
       type: eventToMethod[type] ?? 'unexpected type',
       /* @deprecated */
       context: initiatorName,
-      client_scope: initiatorName,
+      client_scope: clientScope ?? initiatorName,
       action_type: eventToActionType[type] ?? 'unexpected type',
       wallet_address: address,
       address,
       wallet_provider: getProvider(address),
-
-      dapp_domain: globalThis.location.origin === origin ? null : origin,
+      dapp_domain: isInternalOrigin ? null : origin,
     });
     sendToMetabase('signed_message', params);
     const mixpanelParams = omit(params, [

src/shared/analytics/mixpanel.ts

@@ -6,6 +6,7 @@ import { invariant } from '../invariant';
 import { Loglevel, logTable } from '../logger';
 import { getBaseMixpanelParams } from './shared/mixpanel-data-helpers';
 
+// TODO: move to src/env/config.ts
 const mixPanelTokenDev = 'a30959c6848ddba6ee5cb8feda61922f';
 const mixPanelTokenProd = '1713511ace475d2c78689b3d66558b62';
 const mixPanelToken =
@@ -115,6 +116,5 @@ export async function mixPanelTrack(
 ) {
   const baseParams = await getBaseMixpanelParams(account);
   const params = { ...baseParams, ...values };
-  logTable(Loglevel.info, params);
   mixpanelApi.track(event, params);
 }

src/shared/analytics/shared/mixpanel-data-helpers.ts

@@ -56,8 +56,6 @@ export async function getBaseMixpanelParams(account: Account) {
   );
   const userId = getUserId();
 
-  // // TODO: Filter out "watched" addresses once this feature is introduced
-  // const ownedAddresses = addresses;
   const portfolioStats =
     ownedAddresses && ownedAddresses.length
       ? await getPortfolioStats(ownedAddresses)

src/ui/components/SignTransactionButton/SignTransactionButton.tsx

@@ -54,7 +54,6 @@ export const SignTransactionButton = React.forwardRef(
           return walletPort.request('sendSignedTransaction', {
             serialized: signedTx,
             ...params,
-            // chain: params.chain.toString(),
           });
         } else {
           return await walletPort.request('signAndSendTransaction', [

src/ui/pages/SendTransaction/SendTransaction.tsx

@@ -220,11 +220,6 @@ function TransactionDefaultView({
         incomingTxWithGasAndFee || incomingTransaction
       );
       const feeValueCommon = feeValueCommonRef.current || null;
-      // NOTE:
-      // clientScope can also be read from searchParams if we pass it.
-      // For example, if we redirect to SendTransaction view from our own UI
-      // TODO: Pass it when completing the "Mint Zerion DNA" flow
-      // const clientScope = 'External Dapp';
       return signerSenderRef.current.sendTransaction({
         transaction: tx,
         chain: chain.toString(),