Fix onboarding events (#15608)

app/scripts/controllers/metametrics.js

@@ -329,20 +329,22 @@ export default class MetaMetricsController {
   // It sets an uninstall URL ("Sorry to see you go!" page),
   // which is opened if a user uninstalls the extension.
   updateExtensionUninstallUrl(participateInMetaMetrics, metaMetricsId) {
-    // TODO: Change it to the right URL once it's available.
-
     const query = {};
     if (participateInMetaMetrics) {
       // We only want to track these things if a user opted into metrics.
-      query.id = metaMetricsId;
+      query.mmi = Buffer.from(metaMetricsId).toString('base64');
       query.env = this.environment;
       query.av = this.version;
     }
     const queryString = new URLSearchParams(query);
+
+    // this.extension not currently defined in tests
+    if (this.extension && this.extension.runtime) {
       this.extension.runtime.setUninstallURL(
         `${EXTENSION_UNINSTALL_URL}?${queryString}`,
       );
     }
+  }
 
   /**
    * Setter for the `participateInMetaMetrics` property
@@ -364,8 +366,8 @@ export default class MetaMetricsController {
       this.trackEventsAfterMetricsOptIn();
       this.clearEventsAfterMetricsOptIn();
     }
-    // TODO: Uncomment the line below once we have a "Sorry to see you go" page ready.
+
-    // this.updateExtensionUninstallUrl(participateInMetaMetrics, metaMetricsId);
+    this.updateExtensionUninstallUrl(participateInMetaMetrics, metaMetricsId);
     return metaMetricsId;
   }
 

shared/constants/metametrics.js

@@ -281,7 +281,7 @@ export const EVENT_NAMES = {
   ACCOUNT_ADDED: 'Account Added',
   ACCOUNT_ADD_SELECTED: 'Account Add Selected',
   ACCOUNT_ADD_FAILED: 'Account Add Failed',
-  ACCOUNT_PASSWORD_CREATED: 'Account Password Created',
+  ACCOUNT_PASSWORD_CREATED: 'Wallet Password Created',
   ACCOUNT_RESET: 'Account Reset',
   APP_INSTALLED: 'App Installed',
   APP_UNLOCKED: 'App Unlocked',
@@ -300,6 +300,8 @@ export const EVENT_NAMES = {
   KEY_EXPORT_CANCELED: 'Key Export Canceled',
   KEY_EXPORT_REVEALED: 'Key Material Revealed',
   KEY_EXPORT_COPIED: 'Key Material Copied',
+  METRICS_OPT_IN: 'Metrics Opt In',
+  METRICS_OPT_OUT: 'Metrics Opt Out',
   NAV_ACCOUNT_MENU_OPENED: 'Account Menu Opened',
   NAV_ACCOUNT_DETAILS_OPENED: 'Account Details Opened',
   NAV_CONNECTED_SITES_OPENED: 'Connected Sites Opened',
@@ -311,8 +313,11 @@ export const EVENT_NAMES = {
   NAV_BUY_BUTTON_CLICKED: 'Buy Button Clicked',
   NAV_SEND_BUTTON_CLICKED: 'Send Button Clicked',
   NAV_SWAP_BUTTON_CLICKED: 'Swap Button Clicked',
-  NEW_WALLET_CREATED: 'New Wallet Created',
+  SRP_TO_CONFIRM_BACKUP: 'SRP Backup Confirm Displayed',
-  NEW_WALLET_IMPORTED: 'New Wallet Imported',
+  WALLET_SETUP_STARTED: 'Wallet Setup Selected',
+  WALLET_SETUP_CANCELED: 'Wallet Setup Canceled',
+  WALLET_SETUP_FAILED: 'Wallet Setup Failed',
+  WALLET_CREATED: 'Wallet Created',
   NFT_ADDED: 'NFT Added',
   ONRAMP_PROVIDER_SELECTED: 'On-ramp Provider Selected',
   PERMISSIONS_APPROVED: 'Permissions Approved',

ui/components/app/create-new-vault/create-new-vault.js

@@ -1,8 +1,6 @@
-import React, { useCallback, useContext, useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import PropTypes from 'prop-types';
-import { EVENT } from '../../../../shared/constants/metametrics';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { MetaMetricsContext } from '../../../contexts/metametrics';
 import TextField from '../../ui/text-field';
 import Button from '../../ui/button';
 import CheckBox from '../../ui/check-box';
@@ -23,7 +21,6 @@ export default function CreateNewVault({
   const [termsChecked, setTermsChecked] = useState(false);
 
   const t = useI18nContext();
-  const trackEvent = useContext(MetaMetricsContext);
 
   const onPasswordChange = useCallback(
     (newPassword) => {
@@ -83,17 +80,8 @@ export default function CreateNewVault({
   );
 
   const toggleTermsCheck = useCallback(() => {
-    trackEvent({
-      category: EVENT.CATEGORIES.ONBOARDING,
-      event: 'Check ToS',
-      properties: {
-        action: 'Import Seed Phrase',
-        legacy_event: true,
-      },
-    });
-
     setTermsChecked((currentTermsChecked) => !currentTermsChecked);
-  }, [trackEvent]);
+  }, []);
 
   const termsOfUse = t('acceptTermsOfUse', [
     <a

ui/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.component.js

@@ -3,7 +3,10 @@ import PropTypes from 'prop-types';
 
 import MetaFoxLogo from '../../../ui/metafox-logo';
 import PageContainerFooter from '../../../ui/page-container/page-container-footer';
-import { EVENT } from '../../../../../shared/constants/metametrics';
+import {
+  EVENT,
+  EVENT_NAMES,
+} from '../../../../../shared/constants/metametrics';
 
 export default class MetaMetricsOptInModal extends Component {
   static propTypes = {
@@ -113,7 +116,7 @@ export default class MetaMetricsOptInModal extends Component {
                   trackEvent(
                     {
                       category: EVENT.CATEGORIES.ONBOARDING,
-                      event: 'Metrics Opt Out',
+                      event: EVENT_NAMES.METRICS_OPT_OUT,
                       properties: {
                         action: 'Metrics Option',
                         legacy_event: true,
@@ -134,7 +137,7 @@ export default class MetaMetricsOptInModal extends Component {
                   trackEvent(
                     {
                       category: EVENT.CATEGORIES.ONBOARDING,
-                      event: 'Metrics Opt In',
+                      event: EVENT_NAMES.METRICS_OPT_IN,
                       properties: {
                         action: 'Metrics Option',
                         legacy_event: true,

ui/pages/first-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js

@@ -5,7 +5,10 @@ import {
   INITIALIZE_END_OF_FLOW_ROUTE,
 } from '../../../../helpers/constants/routes';
 import CreateNewVault from '../../../../components/app/create-new-vault';
-import { EVENT } from '../../../../../shared/constants/metametrics';
+import {
+  EVENT,
+  EVENT_NAMES,
+} from '../../../../../shared/constants/metametrics';
 
 export default class ImportWithSeedPhrase extends PureComponent {
   static contextTypes = {
@@ -24,12 +27,12 @@ export default class ImportWithSeedPhrase extends PureComponent {
     this._onBeforeUnload = () =>
       this.context.trackEvent({
         category: EVENT.CATEGORIES.ONBOARDING,
-        event: 'Close window on import screen',
+        event: EVENT_NAMES.WALLET_SETUP_FAILED,
         properties: {
-          action: 'Import Seed Phrase',
+          account_type: EVENT.ACCOUNT_TYPES.IMPORTED,
-          legacy_event: true,
+          account_import_type: EVENT.ACCOUNT_IMPORT_TYPES.SRP,
-          errorLabel: 'Seed Phrase Error',
+          reason: 'Seed Phrase Error',
-          errorMessage: this.state.seedPhraseError,
+          error: this.state.seedPhraseError,
         },
       });
     window.addEventListener('beforeunload', this._onBeforeUnload);
@@ -46,10 +49,10 @@ export default class ImportWithSeedPhrase extends PureComponent {
     await onSubmit(password, seedPhrase);
     this.context.trackEvent({
       category: EVENT.CATEGORIES.ONBOARDING,
-      event: 'Import Complete',
+      event: EVENT_NAMES.WALLET_CREATED,
       properties: {
-        action: 'Import Seed Phrase',
+        account_type: EVENT.ACCOUNT_TYPES.IMPORTED,
-        legacy_event: true,
+        account_import_type: EVENT.ACCOUNT_IMPORT_TYPES.SRP,
       },
     });
 
@@ -69,10 +72,11 @@ export default class ImportWithSeedPhrase extends PureComponent {
               e.preventDefault();
               this.context.trackEvent({
                 category: EVENT.CATEGORIES.ONBOARDING,
-                event: 'Go Back from Onboarding Import',
+                event: EVENT_NAMES.WALLET_SETUP_CANCELED,
                 properties: {
-                  action: 'Import Seed Phrase',
+                  account_type: EVENT.ACCOUNT_TYPES.IMPORTED,
-                  legacy_event: true,
+                  account_import_type: EVENT.ACCOUNT_IMPORT_TYPES.SRP,
+                  text: 'Back',
                 },
               });
               this.props.history.push(INITIALIZE_SELECT_ACTION_ROUTE);

ui/pages/first-time-flow/end-of-flow/end-of-flow.component.js

@@ -20,7 +20,6 @@ export default class EndOfFlowScreen extends PureComponent {
 
   static propTypes = {
     history: PropTypes.object,
-    completionMetaMetricsName: PropTypes.string,
     setCompletedOnboarding: PropTypes.func,
     onboardingInitiator: PropTypes.exact({
       location: PropTypes.string,
@@ -37,16 +36,8 @@ export default class EndOfFlowScreen extends PureComponent {
   }
 
   async _onOnboardingComplete() {
-    const { setCompletedOnboarding, completionMetaMetricsName } = this.props;
+    const { setCompletedOnboarding } = this.props;
     await setCompletedOnboarding();
-    this.context.trackEvent({
-      category: EVENT.CATEGORIES.ONBOARDING,
-      event: completionMetaMetricsName,
-      properties: {
-        action: 'Onboarding Complete',
-        legacy_event: true,
-      },
-    });
   }
 
   onComplete = async () => {

ui/pages/first-time-flow/end-of-flow/end-of-flow.container.js

@@ -2,21 +2,10 @@ import { connect } from 'react-redux';
 
 import { getOnboardingInitiator } from '../../../selectors';
 import { setCompletedOnboarding } from '../../../store/actions';
-import { EVENT_NAMES } from '../../../../shared/constants/metametrics';
 import EndOfFlow from './end-of-flow.component';
 
-const firstTimeFlowTypeNameMap = {
-  create: EVENT_NAMES.NEW_WALLET_CREATED,
-  import: EVENT_NAMES.NEW_WALLET_IMPORTED,
-};
-
 const mapStateToProps = (state) => {
-  const {
-    metamask: { firstTimeFlowType },
-  } = state;
-
   return {
-    completionMetaMetricsName: firstTimeFlowTypeNameMap[firstTimeFlowType],
     onboardingInitiator: getOnboardingInitiator(state),
   };
 };

ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import MetaFoxLogo from '../../../components/ui/metafox-logo';
 import PageContainerFooter from '../../../components/ui/page-container/page-container-footer';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
 import { INITIALIZE_SELECT_ACTION_ROUTE } from '../../../helpers/constants/routes';
 
 export default class MetaMetricsOptIn extends Component {
@@ -113,7 +113,7 @@ export default class MetaMetricsOptIn extends Component {
                     await trackEvent(
                       {
                         category: EVENT.CATEGORIES.ONBOARDING,
-                        event: 'Metrics Opt In',
+                        event: EVENT_NAMES.METRICS_OPT_IN,
                         properties: {
                           action: 'Metrics Option',
                           legacy_event: true,

ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase-component.test.js

@@ -168,10 +168,10 @@ describe('ConfirmSeedPhrase Component', () => {
 
     expect(trackEventSpy.args[0][0]).toStrictEqual({
       category: 'Onboarding',
-      event: 'Verify Complete',
+      event: 'Wallet Created',
       properties: {
-        action: 'Seed Phrase Setup',
+        account_type: 'metamask',
-        legacy_event: true,
+        is_backup_skipped: false,
       },
     });
     expect(initialize3BoxSpy.calledOnce).toStrictEqual(true);

ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/confirm-seed-phrase.component.js

@@ -6,7 +6,10 @@ import {
   INITIALIZE_END_OF_FLOW_ROUTE,
   INITIALIZE_SEED_PHRASE_ROUTE,
 } from '../../../../helpers/constants/routes';
-import { EVENT } from '../../../../../shared/constants/metametrics';
+import {
+  EVENT,
+  EVENT_NAMES,
+} from '../../../../../shared/constants/metametrics';
 import { exportAsFile } from '../../../../../shared/modules/export-utils';
 import DraggableSeed from './draggable-seed.component';
 
@@ -78,21 +81,31 @@ export default class ConfirmSeedPhrase extends PureComponent {
     }
 
     try {
+      setSeedPhraseBackedUp(true).then(async () => {
         this.context.trackEvent({
           category: EVENT.CATEGORIES.ONBOARDING,
-        event: 'Verify Complete',
+          event: EVENT_NAMES.WALLET_CREATED,
           properties: {
-          action: 'Seed Phrase Setup',
+            account_type: EVENT.ACCOUNT_TYPES.DEFAULT,
-          legacy_event: true,
+            is_backup_skipped: false,
           },
         });
 
-      setSeedPhraseBackedUp(true).then(async () => {
         initializeThreeBox();
         history.replace(INITIALIZE_END_OF_FLOW_ROUTE);
       });
     } catch (error) {
       console.error(error.message);
+      this.context.trackEvent({
+        category: EVENT.CATEGORIES.ONBOARDING,
+        event: EVENT_NAMES.WALLET_SETUP_FAILED,
+        properties: {
+          account_type: EVENT.ACCOUNT_TYPES.DEFAULT,
+          is_backup_skipped: false,
+          reason: 'Seed Phrase Creation Error',
+          error: error.message,
+        },
+      });
     }
   };
 

ui/pages/first-time-flow/seed-phrase/reveal-seed-phrase/reveal-seed-phrase.component.js

@@ -48,11 +48,8 @@ export default class RevealSeedPhrase extends PureComponent {
 
     this.context.trackEvent({
       category: EVENT.CATEGORIES.ONBOARDING,
-      event: 'Advance to Verify',
+      event: EVENT_NAMES.SRP_TO_CONFIRM_BACKUP,
-      properties: {
+      properties: {},
-        action: 'Seed Phrase Setup',
-        legacy_event: true,
-      },
     });
 
     if (!isShowingSeedPhrase) {
@@ -70,25 +67,30 @@ export default class RevealSeedPhrase extends PureComponent {
       onboardingInitiator,
     } = this.props;
 
+    await Promise.all([setCompletedOnboarding(), setSeedPhraseBackedUp(false)])
+      .then(() => {
         this.context.trackEvent({
           category: EVENT.CATEGORIES.ONBOARDING,
-      event: 'Remind me later',
+          event: EVENT_NAMES.WALLET_CREATED,
           properties: {
-        action: 'Seed Phrase Setup',
+            account_type: EVENT.ACCOUNT_TYPES.DEFAULT,
-        legacy_event: true,
+            is_backup_skipped: true,
           },
         });
-
+      })
-    await Promise.all([setCompletedOnboarding(), setSeedPhraseBackedUp(false)]);
+      .catch((error) => {
-
+        console.error(error.message);
         this.context.trackEvent({
           category: EVENT.CATEGORIES.ONBOARDING,
-      event: EVENT_NAMES.NEW_WALLET_CREATED,
+          event: EVENT_NAMES.WALLET_SETUP_FAILED,
           properties: {
-        action: 'Onboarding Complete',
+            account_type: EVENT.ACCOUNT_TYPES.DEFAULT,
-        legacy_event: true,
+            is_backup_skipped: true,
+            reason: 'Seed Phrase Creation Error',
+            error: error.message,
           },
         });
+      });
 
     if (onboardingInitiator) {
       await returnToOnboardingInitiatorTab(onboardingInitiator);
@@ -119,11 +121,8 @@ export default class RevealSeedPhrase extends PureComponent {
             onClick={() => {
               this.context.trackEvent({
                 category: EVENT.CATEGORIES.ONBOARDING,
-                event: 'Revealed Words',
+                event: EVENT_NAMES.KEY_EXPORT_REVEALED,
-                properties: {
+                properties: {},
-                  action: 'Seed Phrase Setup',
-                  legacy_event: true,
-                },
               });
               this.setState({ isShowingSeedPhrase: true });
             }}

ui/pages/first-time-flow/select-action/select-action.component.js

@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import Button from '../../../components/ui/button';
 import MetaFoxLogo from '../../../components/ui/metafox-logo';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
 import {
   INITIALIZE_CREATE_PASSWORD_ROUTE,
   INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE,
@@ -37,10 +37,9 @@ export default class SelectAction extends PureComponent {
     trackEvent(
       {
         category: EVENT.CATEGORIES.ONBOARDING,
-        event: 'Selected Create New Wallet',
+        event: EVENT_NAMES.WALLET_SETUP_STARTED,
         properties: {
-          action: 'Import or Create',
+          account_type: EVENT.ACCOUNT_TYPES.DEFAULT,
-          legacy_event: true,
         },
       },
       {
@@ -59,10 +58,9 @@ export default class SelectAction extends PureComponent {
     trackEvent(
       {
         category: EVENT.CATEGORIES.ONBOARDING,
-        event: 'Selected Import Wallet',
+        event: EVENT_NAMES.WALLET_SETUP_STARTED,
         properties: {
-          action: 'Import or Create',
+          account_type: EVENT.ACCOUNT_TYPES.IMPORTED,
-          legacy_event: true,
         },
       },
       {

ui/pages/onboarding-flow/creation-successful/creation-successful.js

@@ -1,6 +1,6 @@
-import React, { useContext } from 'react';
+import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 
 import Box from '../../../components/ui/box';
 import Typography from '../../../components/ui/typography';
@@ -17,32 +17,14 @@ import {
   ONBOARDING_PRIVACY_SETTINGS_ROUTE,
 } from '../../../helpers/constants/routes';
 import { setCompletedOnboarding } from '../../../store/actions';
-import { getFirstTimeFlowType } from '../../../selectors';
-import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
 
 export default function CreationSuccessful() {
-  const firstTimeFlowTypeNameMap = {
-    create: EVENT_NAMES.NEW_WALLET_CREATED,
-    import: EVENT_NAMES.NEW_WALLET_IMPORTED,
-  };
   const history = useHistory();
   const t = useI18nContext();
   const dispatch = useDispatch();
-  const firstTimeFlowType = useSelector(getFirstTimeFlowType);
-
-  const trackEvent = useContext(MetaMetricsContext);
 
   const onComplete = async () => {
     await dispatch(setCompletedOnboarding());
-    trackEvent({
-      event: firstTimeFlowTypeNameMap[firstTimeFlowType],
-      category: EVENT.CATEGORIES.ONBOARDING,
-      properties: {
-        action: 'Onboarding Complete',
-        legacy_event: true,
-      },
-    });
     history.push(ONBOARDING_PIN_EXTENSION_ROUTE);
   };
   return (

ui/pages/onboarding-flow/metametrics/metametrics.js

@@ -17,15 +17,10 @@ import {
   getParticipateInMetaMetrics,
 } from '../../../selectors';
 
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
 
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 
-const firstTimeFlowTypeNameMap = {
-  create: 'Selected Create New Wallet',
-  import: 'Selected Import Wallet',
-};
-
 export default function OnboardingMetametrics() {
   const t = useI18nContext();
   const dispatch = useDispatch();
@@ -35,8 +30,6 @@ export default function OnboardingMetametrics() {
   const firstTimeFlowType = useSelector(getFirstTimeFlowType);
 
   const participateInMetaMetrics = useSelector(getParticipateInMetaMetrics);
-  const firstTimeSelectionMetaMetricsName =
-    firstTimeFlowTypeNameMap[firstTimeFlowType];
 
   const trackEvent = useContext(MetaMetricsContext);
 
@@ -50,7 +43,7 @@ export default function OnboardingMetametrics() {
         trackEvent(
           {
             category: EVENT.CATEGORIES.ONBOARDING,
-            event: 'Metrics Opt In',
+            event: EVENT_NAMES.METRICS_OPT_IN,
             properties: {
               action: 'Metrics Option',
               legacy_event: true,
@@ -65,10 +58,12 @@ export default function OnboardingMetametrics() {
       trackEvent(
         {
           category: EVENT.CATEGORIES.ONBOARDING,
-          event: firstTimeSelectionMetaMetricsName,
+          event: EVENT_NAMES.WALLET_SETUP_STARTED,
           properties: {
-            action: 'Import or Create',
+            account_type:
-            legacy_event: true,
+              firstTimeFlowType === 'create'
+                ? EVENT.ACCOUNT_TYPES.DEFAULT
+                : EVENT.ACCOUNT_TYPES.IMPORTED,
           },
         },
         {
@@ -93,7 +88,7 @@ export default function OnboardingMetametrics() {
         trackEvent(
           {
             category: EVENT.CATEGORIES.ONBOARDING,
-            event: 'Metrics Opt Out',
+            event: EVENT_NAMES.METRICS_OPT_OUT,
             properties: {
               action: 'Metrics Option',
               legacy_event: true,