Chore/segment onboarding

app/scripts/metamask-controller.js

@@ -4085,6 +4085,20 @@ export default class MetamaskController extends EventEmitter {
       ),
       trackInsightSnapView: this.trackInsightSnapView.bind(this),
 
+      // MetaMetrics buffering for onboarding
+      addEventBeforeMetricsOptIn:
+        metaMetricsController.addEventBeforeMetricsOptIn.bind(
+          metaMetricsController,
+        ),
+      trackEventsAfterMetricsOptIn:
+        metaMetricsController.trackEventsAfterMetricsOptIn.bind(
+          metaMetricsController,
+        ),
+      clearEventsAfterMetricsOptIn:
+        metaMetricsController.clearEventsAfterMetricsOptIn.bind(
+          metaMetricsController,
+        ),
+
       // ApprovalController
       rejectAllPendingApprovals: this.rejectAllPendingApprovals.bind(this),
       rejectPendingApproval: this.rejectPendingApproval,

shared/constants/metametrics.ts

@@ -700,23 +700,21 @@ export enum MetaMetricsEventName {
   NavSwapButtonClicked = 'Swap Button Clicked',
   NavReceiveButtonClicked = 'Receive Button Clicked',
   NftAdded = 'NFT Added',
-  OnboardingWalletCreationStarted = 'Wallet Setup Selected',
-  OnboardingWalletImportStarted = 'Wallet Import Started',
-  OnboardingWalletCreationAttempted = 'Wallet Password Created',
   OnboardingWalletSecurityStarted = 'SRP Backup Selected',
   OnboardingWalletSecuritySkipInitiated = 'SRP Skip Backup Selected',
   OnboardingWalletSecuritySkipConfirmed = 'SRP Backup Skipped',
   OnboardingWalletSecuritySkipCanceled = 'SRP Skip Backup Canceled',
   OnboardingWalletSecurityPhraseRevealed = 'SRP Revealed',
   OnboardingWalletSecurityPhraseWrittenDown = 'SRP Backup Confirm Display',
   OnboardingWalletSecurityPhraseConfirmed = 'SRP Backup Confirmed',
-  OnboardingWalletCreationComplete = 'Wallet Created',
+  OnboardingWalletCreationComplete = 'Onboarding Wallet Created',
   OnboardingWalletAdvancedSettings = 'Settings Updated',
-  OnboardingWalletImportAttempted = 'Wallet Import Attempted',
   OnboardingWalletVideoPlay = 'SRP Intro Video Played',
   OnboardingTwitterClick = 'External Link Clicked',
-  OnboardingWalletSetupComplete = 'Wallet Setup Complete',
   OnrampProviderSelected = 'On-ramp Provider Selected',
+  PasswordChanged = 'Password Changed',
+  ForgotPassword = 'Forgot Password',
+  ResetWallet = 'Reset Wallet',
   PermissionsApproved = 'Permissions Approved',
   PermissionsRejected = 'Permissions Rejected',
   PermissionsRequested = 'Permissions Requested',
@@ -759,6 +757,7 @@ export enum MetaMetricsEventName {
   SrpViewSrpText = 'Views SRP',
   SrpCopiedToClipboard = 'Copies SRP to clipboard',
   SrpToConfirmBackup = 'SRP Backup Confirm Displayed',
+  SrpDefinitionClicked = 'SRP Definition Clicked',
   StakingEntryPointClicked = 'Stake Button Clicked',
   SurveyToast = 'Survey Toast',
   SupportLinkClicked = 'Support Link Clicked',
@@ -776,10 +775,19 @@ export enum MetaMetricsEventName {
   TokenImportCanceled = 'Token Import Canceled',
   TokenImportClicked = 'Token Import Clicked',
   ShowNativeTokenAsMainBalance = 'Show native token as main balance',
-  WalletSetupStarted = 'Wallet Setup Selected',
-  WalletSetupCanceled = 'Wallet Setup Canceled',
-  WalletSetupFailed = 'Wallet Setup Failed',
+  WalletSetupStarted = 'Wallet Setup Started',
+  WalletImportStarted = 'Wallet Import Started',
+  WalletImportAttempted = 'Wallet Import Attempted',
+  WalletImported = 'Wallet Imported',
+  WalletCreationAttempted = 'Wallet Creation Attempted',
   WalletCreated = 'Wallet Created',
+  WalletSetupFailure = 'Wallet Setup Failure',
+  WalletSetupCompleted = 'Wallet Setup Completed',
+  WalletRehydrationSelected = 'Wallet Rehydration Selected',
+  SocialLoginCompleted = 'Social Login Completed',
+  RehydrationPasswordAttempted = 'Rehydration Password Attempted',
+  RehydrationPasswordCompleted = 'Rehydration Password Completed',
+  RehydrationPasswordFailed = 'Rehydration Password Failed',
   // BEGIN:ONLY_INCLUDE_IF(build-flask)
   WatchEthereumAccountsToggled = 'Watch Ethereum Accounts Toggled',
   // END:ONLY_INCLUDE_IF

ui/contexts/metametrics.js

@@ -12,6 +12,7 @@ import React, {
 } from 'react';
 import PropTypes from 'prop-types';
 import { matchPath, useLocation } from 'react-router-dom';
+import { useSelector } from 'react-redux';
 import { captureException, captureMessage } from '@sentry/browser';
 
 import { omit } from 'lodash';
@@ -21,6 +22,11 @@ import { getEnvironmentType } from '../../app/scripts/lib/util';
 import { PATH_NAME_MAP } from '../helpers/constants/routes';
 import { MetaMetricsContextProp } from '../../shared/constants/metametrics';
 import { useSegmentContext } from '../hooks/useSegmentContext';
+import { getParticipateInMetaMetrics } from '../selectors';
+import {
+  generateActionId,
+  submitRequestToBackground,
+} from '../store/background-connection';
 
 import { trackMetaMetricsEvent, trackMetaMetricsPage } from '../store/actions';
 
@@ -59,6 +65,7 @@ const PATHS_TO_CHECK = Object.keys(PATH_NAME_MAP);
 export function MetaMetricsProvider({ children }) {
   const location = useLocation();
   const context = useSegmentContext();
+  const isMetricsEnabled = useSelector(getParticipateInMetaMetrics);
 
   // Sometimes we want to track context properties inside the event's "properties" object.
   const addContextPropsIntoEventProperties = useCallback(
@@ -82,18 +89,26 @@ export function MetaMetricsProvider({ children }) {
    * @type {UITrackEventMethod}
    */
   const trackEvent = useCallback(
-    (payload, options) => {
+    async (payload, options) => {
       addContextPropsIntoEventProperties(payload, options);
-      trackMetaMetricsEvent(
-        {
-          ...payload,
-          environmentType: getEnvironmentType(),
-          ...context,
-        },
-        options,
-      );
+
+      const fullPayload = {
+        ...payload,
+        environmentType: getEnvironmentType(),
+        ...context,
+      };
+
+      if (isMetricsEnabled) {
+        // If metrics are enabled, track immediately
+        trackMetaMetricsEvent(fullPayload, options);
+      } else {
+        // If metrics are not enabled, buffer the event
+        await submitRequestToBackground('addEventBeforeMetricsOptIn', [
+          { ...fullPayload, actionId: generateActionId() },
+        ]);
+      }
     },
-    [addContextPropsIntoEventProperties, context],
+    [addContextPropsIntoEventProperties, context, isMetricsEnabled],
   );
 
   // Used to prevent double tracking page calls

ui/pages/onboarding-flow/account-exist/account-exist.tsx

@@ -1,5 +1,5 @@
-import React, { useEffect } from 'react';
-import { useHistory } from 'react-router-dom';
+import React, { useContext, useEffect } from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   Button,
@@ -40,14 +40,26 @@ import {
   TraceOperation,
 } from '../../../../shared/lib/trace';
 import { useSentryTrace } from '../../../contexts/sentry-trace';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsEventAccountType,
+} from '../../../../shared/constants/metametrics';
 
 export default function AccountExist() {
   const history = useHistory();
+  const location = useLocation();
   const dispatch = useDispatch();
   const t = useI18nContext();
   const firstTimeFlowType = useSelector(getFirstTimeFlowType);
   const userSocialLoginEmail = useSelector(getSocialLoginEmail);
   const { onboardingParentContext } = useSentryTrace();
+  const trackEvent = useContext(MetaMetricsContext);
+
+  // Get socialConnectionType from query parameters
+  const urlParams = new URLSearchParams(location.search);
+  const socialConnectionType = urlParams.get('socialConnectionType') || '';
 
   const onBack = async (e: React.MouseEvent<HTMLButtonElement>) => {
     e.preventDefault();
@@ -63,6 +75,13 @@ export default function AccountExist() {
       parentContext: onboardingParentContext.current,
     });
     dispatch(setFirstTimeFlowType(FirstTimeFlowType.socialImport));
+    trackEvent({
+      category: MetaMetricsEventCategory.Onboarding,
+      event: MetaMetricsEventName.WalletImportStarted,
+      properties: {
+        account_type: `${MetaMetricsEventAccountType.Imported}_${socialConnectionType}`,
+      },
+    });
     history.push(ONBOARDING_UNLOCK_ROUTE);
   };
 

ui/pages/onboarding-flow/account-not-found/account-not-found.tsx

@@ -1,5 +1,5 @@
-import React, { useEffect } from 'react';
-import { useHistory } from 'react-router-dom';
+import React, { useContext, useEffect } from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   Button,
@@ -41,14 +41,26 @@ import {
   TraceOperation,
 } from '../../../../shared/lib/trace';
 import { useSentryTrace } from '../../../contexts/sentry-trace';
+import {
+  MetaMetricsEventAccountType,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
 
 export default function AccountNotFound() {
   const history = useHistory();
+  const location = useLocation();
   const dispatch = useDispatch();
   const t = useI18nContext();
   const firstTimeFlowType = useSelector(getFirstTimeFlowType);
   const userSocialLoginEmail = useSelector(getSocialLoginEmail);
   const { onboardingParentContext } = useSentryTrace();
+  const trackEvent = useContext(MetaMetricsContext);
+
+  // Get socialConnectionType from query parameters
+  const urlParams = new URLSearchParams(location.search);
+  const socialConnectionType = urlParams.get('socialConnectionType') || '';
 
   const onBack = async (e: React.MouseEvent<HTMLButtonElement>) => {
     e.preventDefault();
@@ -64,6 +76,13 @@ export default function AccountNotFound() {
       parentContext: onboardingParentContext.current,
     });
     dispatch(setFirstTimeFlowType(FirstTimeFlowType.socialCreate));
+    trackEvent({
+      category: MetaMetricsEventCategory.Onboarding,
+      event: MetaMetricsEventName.WalletSetupStarted,
+      properties: {
+        account_type: `${MetaMetricsEventAccountType.Default}_${socialConnectionType}`,
+      },
+    });
     history.push(ONBOARDING_CREATE_PASSWORD_ROUTE);
   };