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

1 files changed, 2 insertions, 2 deletions

diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js
index 86a5a5268..90355a97c 100644
--- a/ui/app/components/dropdowns/network-dropdown.js
+++ b/ui/app/components/dropdowns/network-dropdown.js
@@ -254,14 +254,14 @@ NetworkDropdown.prototype.render = function () {
 }
 
 NetworkDropdown.prototype.handleClick = function (newProviderType) {
-  const { providerType, setProviderType } = this.props
+  const { provider: { type: providerType }, setProviderType } = this.props
   const { metricsEvent } = this.context
 
   metricsEvent({
     eventOpts: {
       category: 'Navigation',
       action: 'Home',
-      name: 'Opened Network Menu',
+      name: 'Switched Networks',
     },
     customVariables: {
       fromNetwork: providerType,