feat: pass anon_id from dapp to wallet in SDKConnectV2 connection metadata for cross-side analytics correlation

app/components/Approvals/PermissionApproval/PermissionApproval.test.tsx

@@ -29,6 +29,9 @@ jest.mock('../../Views/AccountConnect', () => ({
 }));
 
 jest.mock('../../hooks/useOriginSource');
+jest.mock('../../hooks/useSDKV2Connection', () => ({
+  useSDKV2Connection: jest.fn(() => undefined),
+}));
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),

app/components/Approvals/PermissionApproval/PermissionApproval.tsx

@@ -14,6 +14,7 @@ import {
 import { getApiAnalyticsProperties } from '../../../util/metrics/MultichainAPI/getApiAnalyticsProperties';
 import { selectPendingApprovals } from '../../../selectors/approvalController';
 import { isEqual } from 'lodash';
+import { useSDKV2Connection } from '../../hooks/useSDKV2Connection';
 
 export interface PermissionApprovalProps {
   // TODO: Replace "any" with type
@@ -30,9 +31,12 @@ const PermissionApproval = (props: PermissionApprovalProps) => {
   // Prevents re-navigation for the same approval when pendingApprovals changes.
   const lastNavigatedApprovalIdRef = useRef<string | null>(null);
 
-  const eventSource = useOriginSource({
-    origin: approvalRequest?.requestData?.metadata?.origin,
-  });
+  const origin = approvalRequest?.requestData?.metadata?.origin;
+
+  const eventSource = useOriginSource({ origin });
+
+  const sdkV2Connection = useSDKV2Connection(origin);
+  const anonId = sdkV2Connection?.originatorInfo?.anonId;
 
   useEffect(() => {
     if (
@@ -74,6 +78,7 @@ const PermissionApproval = (props: PermissionApprovalProps) => {
           source: eventSource,
           chain_id_list: chainIds,
           ...getApiAnalyticsProperties(isMultichainRequest),
+          ...(anonId ? { remote_session_id: anonId } : {}),
         })
         .build(),
     );
@@ -91,6 +96,7 @@ const PermissionApproval = (props: PermissionApprovalProps) => {
     trackEvent,
     createEventBuilder,
     eventSource,
+    anonId,
     // Re-run when the queue changes so new approvals are picked up.
     // The ref guard above prevents re-navigation for the same approval.
     pendingApprovals,

app/components/Views/AccountConnect/AccountConnect.tsx

@@ -106,6 +106,7 @@ import { getApiAnalyticsProperties } from '../../../util/metrics/MultichainAPI/g
 import { isSnapId } from '@metamask/snaps-utils';
 import { HardwareDeviceTypes } from '../../../constants/keyringTypes';
 import { getConnectedDevicesCount } from '../../../core/HardwareWallets/analytics';
+import { useSDKV2Connection } from '../../hooks/useSDKV2Connection';
 
 const AccountConnect = (props: AccountConnectProps) => {
   const { colors } = useTheme();
@@ -161,6 +162,9 @@ const AccountConnect = (props: AccountConnectProps) => {
 
   const { origin: channelIdOrHostname, isEip1193Request } = hostInfo.metadata;
 
+  const sdkV2Connection = useSDKV2Connection(channelIdOrHostname);
+  const anonId = sdkV2Connection?.originatorInfo?.anonId;
+
   const isChannelId = isUUID(channelIdOrHostname);
 
   const sdkConnection = SDKConnect.getInstance().getConnection({
@@ -413,13 +417,15 @@ const AccountConnect = (props: AccountConnectProps) => {
             chain_id_list: chainIds,
             referrer: channelIdOrHostname,
             ...getApiAnalyticsProperties(isMultichainRequest),
+            ...(anonId ? { remote_session_id: anonId } : {}),
           })
           .build(),
       );
     },
     [
       accountsLength,
       channelIdOrHostname,
+      anonId,
       trackEvent,
       createEventBuilder,
       eventSource,
@@ -516,12 +522,12 @@ const AccountConnect = (props: AccountConnectProps) => {
           .addProperties({
             number_of_accounts: accountsLength,
             number_of_accounts_connected: connectedAccountLength,
-            // TODO: Fix this. Not accurate
             account_type: getAddressAccountType(activeAddress),
             source: eventSource,
             chain_id_list: selectedChainIds,
             referrer,
             ...getApiAnalyticsProperties(isMultichainRequest),
+            ...(anonId ? { remote_session_id: anonId } : {}),
           })
           .build(),
       );
@@ -545,6 +551,7 @@ const AccountConnect = (props: AccountConnectProps) => {
       setIsLoading(false);
     }
   }, [
+    anonId,
     eventSource,
     selectedAddresses,
     hostInfo,

app/components/Views/MultichainAccounts/MultichainAccountConnect/MultichainAccountConnect.tsx

@@ -29,6 +29,7 @@ import {
   getUrlObj,
   prefixUrlWithProtocol,
 } from '../../../../util/browser/index.ts';
+import { getAddressAccountType } from '../../../../util/address/index.ts';
 
 // Internal dependencies.
 import { PermissionsRequest } from '@metamask/permission-controller';
@@ -258,6 +259,7 @@ const MultichainAccountConnect = (props: AccountConnectProps) => {
   const { origin: channelIdOrHostname, isEip1193Request } = hostInfo.metadata;
 
   const sdkV2Connection = useSDKV2Connection(channelIdOrHostname);
+  const anonId = sdkV2Connection?.originatorInfo?.anonId;
   const isOriginMMSDKV2RemoteConn = useMemo(
     () => Boolean(sdkV2Connection?.isV2),
     [sdkV2Connection?.isV2],
@@ -601,13 +603,15 @@ const MultichainAccountConnect = (props: AccountConnectProps) => {
             chain_id_list: chainIds,
             referrer: channelIdOrHostname,
             ...getApiAnalyticsProperties(isMultichainRequest),
+            ...(anonId ? { remote_session_id: anonId } : {}),
           })
           .build(),
       );
     },
     [
       accountsLength,
       channelIdOrHostname,
+      anonId,
       trackEvent,
       createEventBuilder,
       eventSource,
@@ -694,17 +698,24 @@ const MultichainAccountConnect = (props: AccountConnectProps) => {
 
       triggerDappViewedEvent(connectedAccountLength);
 
+      let accountType: string;
+      try {
+        accountType = getAddressAccountType(selectedCaipAccountIds[0]);
+      } catch {
+        accountType = 'unknown';
+      }
+
       trackEvent(
         createEventBuilder(MetaMetricsEvents.CONNECT_REQUEST_COMPLETED)
           .addProperties({
             number_of_accounts: accountsLength,
             number_of_accounts_connected: connectedAccountLength,
-            // TODO: Fix this. Not accurate
-            account_type: 'multichain',
+            account_type: accountType,
             source: eventSource,
             chain_id_list: selectedChainIds,
             referrer,
             ...getApiAnalyticsProperties(isMultichainRequest),
+            ...(anonId ? { remote_session_id: anonId } : {}),
           })
           .build(),
       );
@@ -728,6 +739,7 @@ const MultichainAccountConnect = (props: AccountConnectProps) => {
       setIsLoading(false);
     }
   }, [
+    anonId,
     hostInfo,
     channelIdOrHostname,
     requestedRequestWithExistingPermissions,

app/core/SDKConnectV2/adapters/host-application-adapter.test.ts

@@ -277,6 +277,7 @@ describe('HostApplicationAdapter', () => {
             dappId: mockConnectionInfo.metadata.dapp.name,
             apiVersion: mockConnectionInfo.metadata.sdk.version,
             platform: mockConnectionInfo.metadata.sdk.platform,
+            anonId: undefined,
           },
           isV2: true,
         },
@@ -324,6 +325,7 @@ describe('HostApplicationAdapter', () => {
             dappId: mockConnectionInfo1.metadata.dapp.name,
             apiVersion: mockConnectionInfo1.metadata.sdk.version,
             platform: mockConnectionInfo1.metadata.sdk.platform,
+            anonId: undefined,
           },
           isV2: true,
         },
@@ -338,6 +340,7 @@ describe('HostApplicationAdapter', () => {
             dappId: mockConnectionInfo2.metadata.dapp.name,
             apiVersion: mockConnectionInfo2.metadata.sdk.version,
             platform: mockConnectionInfo2.metadata.sdk.platform,
+            anonId: undefined,
           },
           isV2: true,
         },
@@ -346,6 +349,43 @@ describe('HostApplicationAdapter', () => {
       expect(store.dispatch).toHaveBeenCalledTimes(1);
       expect(setSdkV2Connections).toHaveBeenCalledWith(expectedSessions);
     });
+
+    it('includes anonId in originatorInfo when analytics.remote_session_id is present', () => {
+      const connInfoWithAnon: ConnectionInfo = {
+        ...createMockConnectionInfo('conn-anon', 'AnonTest'),
+        metadata: {
+          ...createMockConnectionInfo('conn-anon', 'AnonTest').metadata,
+          analytics: {
+            remote_session_id: 'aabbccdd-1122-3344-5566-778899aabbcc',
+          },
+        },
+      };
+      const connections = [
+        { id: connInfoWithAnon.id, info: connInfoWithAnon },
+      ] as unknown as Connection[];
+
+      adapter.syncConnectionList(connections);
+
+      const expectedSessions = {
+        [connInfoWithAnon.id]: {
+          id: connInfoWithAnon.id,
+          otherPublicKey: '',
+          origin: connInfoWithAnon.metadata.dapp.url,
+          originatorInfo: {
+            title: connInfoWithAnon.metadata.dapp.name,
+            url: connInfoWithAnon.metadata.dapp.url,
+            icon: connInfoWithAnon.metadata.dapp.icon,
+            dappId: connInfoWithAnon.metadata.dapp.name,
+            apiVersion: connInfoWithAnon.metadata.sdk.version,
+            platform: connInfoWithAnon.metadata.sdk.platform,
+            anonId: 'aabbccdd-1122-3344-5566-778899aabbcc',
+          },
+          isV2: true,
+        },
+      } as unknown as SDKSessions;
+
+      expect(setSdkV2Connections).toHaveBeenCalledWith(expectedSessions);
+    });
   });
 
   describe('revokePermissions', () => {

app/core/SDKConnectV2/adapters/host-application-adapter.ts

@@ -118,6 +118,7 @@ export class HostApplicationAdapter implements IHostApplicationAdapter {
           dappId: conn.info.metadata.dapp.name,
           apiVersion: conn.info.metadata.sdk.version,
           platform: conn.info.metadata.sdk.platform,
+          anonId: conn.info.metadata.analytics?.remote_session_id,
         },
         isV2: true, // Flag to identify this as a V2 connection
       };

app/core/SDKConnectV2/types/connection-request.test.ts

@@ -334,4 +334,63 @@ describe('isConnectionRequest', () => {
     (req.metadata.sdk as Record<string, unknown>).platform = 'p'.repeat(65);
     expect(isConnectionRequest(req)).toBe(false);
   });
+
+  // ──────────────────────────────────────────
+  // metadata.analytics (optional)
+  // ──────────────────────────────────────────
+  it('accepts a request without metadata.analytics', () => {
+    const req = validRequest();
+    delete (req.metadata as unknown as Record<string, unknown>).analytics;
+    expect(isConnectionRequest(req)).toBe(true);
+  });
+
+  it('preserves valid metadata.analytics.remote_session_id (UUID)', () => {
+    const req = validRequest();
+    (req.metadata as unknown as Record<string, unknown>).analytics = {
+      remote_session_id: 'aabbccdd-1122-3344-5566-778899aabbcc',
+    };
+    expect(isConnectionRequest(req)).toBe(true);
+    expect(req.metadata.analytics).toEqual({
+      remote_session_id: 'aabbccdd-1122-3344-5566-778899aabbcc',
+    });
+  });
+
+  it('strips analytics when it is not an object', () => {
+    const req = validRequest();
+    (req.metadata as unknown as Record<string, unknown>).analytics = 'bad';
+    expect(isConnectionRequest(req)).toBe(true);
+    expect(req.metadata.analytics).toBeUndefined();
+  });
+
+  it('strips analytics when it is null', () => {
+    const req = validRequest();
+    (req.metadata as unknown as Record<string, unknown>).analytics = null;
+    expect(isConnectionRequest(req)).toBe(true);
+    expect(req.metadata.analytics).toBeUndefined();
+  });
+
+  it('strips analytics when remote_session_id is missing', () => {
+    const req = validRequest();
+    (req.metadata as unknown as Record<string, unknown>).analytics = {};
+    expect(isConnectionRequest(req)).toBe(true);
+    expect(req.metadata.analytics).toBeUndefined();
+  });
+
+  it('strips analytics when remote_session_id is not a string', () => {
+    const req = validRequest();
+    (req.metadata as unknown as Record<string, unknown>).analytics = {
+      remote_session_id: 42,
+    };
+    expect(isConnectionRequest(req)).toBe(true);
+    expect(req.metadata.analytics).toBeUndefined();
+  });
+
+  it('strips analytics when remote_session_id is not a valid UUID', () => {
+    const req = validRequest();
+    (req.metadata as unknown as Record<string, unknown>).analytics = {
+      remote_session_id: 'not-a-uuid',
+    };
+    expect(isConnectionRequest(req)).toBe(true);
+    expect(req.metadata.analytics).toBeUndefined();
+  });
 });

app/core/SDKConnectV2/types/connection-request.ts

@@ -148,5 +148,18 @@ export function isConnectionRequest(data: unknown): data is ConnectionRequest {
     return false;
   }
 
+  // analytics is purely telemetry — strip it when malformed rather than
+  // rejecting the connection, so a dapp-side bug can't break connectivity.
+  if (metadata.analytics !== undefined) {
+    if (
+      typeof metadata.analytics !== 'object' ||
+      metadata.analytics === null ||
+      typeof metadata.analytics.remote_session_id !== 'string' ||
+      !isUUID(metadata.analytics.remote_session_id)
+    ) {
+      delete (metadata as unknown as Record<string, unknown>).analytics;
+    }
+  }
+
   return true;
 }

app/core/SDKConnectV2/types/metadata.ts

@@ -11,4 +11,7 @@ export interface Metadata {
     version: string;
     platform: string;
   };
+  analytics?: {
+    remote_session_id: string;
+  };
 }