Metametrics fixes (#6238)

* Improve opt-in opt-out event tracking after going 'back' in onboarding.

* Fix 'Switched Networks' metrics event.

* Fix custom variables ids (can only use ids 1-5)

* Fix tracking of function type custom variable for metametrics in confirm-transaction-base

* Add missing metametrics events

2 files changed, 17 insertions, 17 deletions

diff --git a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.component.js
index e76b4699b..8b101b1ba 100644
--- a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -157,7 +157,7 @@ export default class ConfirmTransactionBase extends Component {
   }
 
   handleEditGas () {
-    const { onEditGas, showCustomizeGasModal, methodData = {}, txData: { origin } } = this.props
+    const { onEditGas, showCustomizeGasModal, action, txData: { origin }, methodData = {} } = this.props
 
     this.context.metricsEvent({
       eventOpts: {
@@ -167,7 +167,7 @@ export default class ConfirmTransactionBase extends Component {
       },
       customVariables: {
         recipientKnown: null,
-        functionType: methodData.name || 'notFound',
+        functionType: action || getMethodName(methodData.name) || this.context.t('contractInteraction'),
         origin,
       },
     })
@@ -290,7 +290,7 @@ export default class ConfirmTransactionBase extends Component {
   }
 
   handleEdit () {
-    const { txData, tokenData, tokenProps, onEdit, methodData = {}, txData: { origin } } = this.props
+    const { txData, tokenData, tokenProps, onEdit, action, txData: { origin }, methodData = {} } = this.props
 
     this.context.metricsEvent({
       eventOpts: {
@@ -300,7 +300,7 @@ export default class ConfirmTransactionBase extends Component {
       },
       customVariables: {
         recipientKnown: null,
-        functionType: methodData.name || 'notFound',
+        functionType: action || getMethodName(methodData.name) || this.context.t('contractInteraction'),
         origin,
       },
     })
@@ -329,7 +329,7 @@ export default class ConfirmTransactionBase extends Component {
 
   handleCancel () {
     const { metricsEvent } = this.context
-    const { onCancel, txData, cancelTransaction, history, clearConfirmTransaction, methodData = {}, txData: { origin } } = this.props
+    const { onCancel, txData, cancelTransaction, history, clearConfirmTransaction, action, txData: { origin }, methodData = {} } = this.props
 
     if (onCancel) {
       metricsEvent({
@@ -340,7 +340,7 @@ export default class ConfirmTransactionBase extends Component {
         },
         customVariables: {
           recipientKnown: null,
-          functionType: methodData.name || 'notFound',
+          functionType: action || getMethodName(methodData.name) || this.context.t('contractInteraction'),
           origin,
         },
       })
@@ -356,7 +356,7 @@ export default class ConfirmTransactionBase extends Component {
 
   handleSubmit () {
     const { metricsEvent } = this.context
-    const { txData: { origin }, sendTransaction, clearConfirmTransaction, txData, history, onSubmit, methodData = {}, metaMetricsSendCount = 0, setMetaMetricsSendCount } = this.props
+    const { txData: { origin }, sendTransaction, clearConfirmTransaction, txData, history, onSubmit, action, metaMetricsSendCount = 0, setMetaMetricsSendCount, methodData = {} } = this.props
     const { submitting } = this.state
 
     if (submitting) {
@@ -375,7 +375,7 @@ export default class ConfirmTransactionBase extends Component {
         },
         customVariables: {
           recipientKnown: null,
-          functionType: methodData.name || 'notFound',
+          functionType: action || getMethodName(methodData.name) || this.context.t('contractInteraction'),
           origin,
         },
       })
diff --git a/ui/app/components/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js b/ui/app/components/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
index 834516f5f..58a03944e 100644
--- a/ui/app/components/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
+++ b/ui/app/components/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
@@ -98,21 +98,21 @@ export default class MetaMetricsOptIn extends Component {
               onCancel={() => {
                 setParticipateInMetaMetrics(false)
                   .then(() => {
-                    if (participateInMetaMetrics === null) {
-                      return metricsEvent({
+                    const promise = participateInMetaMetrics !== false
+                      ? metricsEvent({
                         eventOpts: {
                           category: 'Onboarding',
                           action: 'Metrics Option',
                           name: 'Metrics Opt Out',
                         },
                         isOptIn: true,
-                      }, {
-                        excludeMetaMetricsId: true,
                       })
-                    .then(() => {
-                      history.push(nextRoute)
-                    })
-                  }
+                      : Promise.resolve()
+
+                    promise
+                      .then(() => {
+                        history.push(nextRoute)
+                      })
                 })
               }}
               cancelText={'No Thanks'}
@@ -120,7 +120,7 @@ export default class MetaMetricsOptIn extends Component {
               onSubmit={() => {
                 setParticipateInMetaMetrics(true)
                   .then(([participateStatus, metaMetricsId]) => {
-                    const promise = participateInMetaMetrics === null
+                    const promise = participateInMetaMetrics !== true
                       ? metricsEvent({
                         eventOpts: {
                           category: 'Onboarding',