Merge branch 'develop' into MMI-2119-env-name-as-key

Author: bergarces

app/scripts/controllers/metametrics.js

@@ -804,6 +804,8 @@ export default class MetaMetricsController {
       [MetaMetricsUserTrait.Theme]: metamaskState.theme || 'default',
       [MetaMetricsUserTrait.TokenDetectionEnabled]:
         metamaskState.useTokenDetection,
+      [MetaMetricsUserTrait.UseNativeCurrencyAsPrimaryCurrency]:
+        metamaskState.useNativeCurrencyAsPrimaryCurrency,
       ///: BEGIN:ONLY_INCLUDE_IF(desktop)
       [MetaMetricsUserTrait.DesktopEnabled]:
         metamaskState.desktopEnabled || false,

app/scripts/controllers/metametrics.test.js

@@ -1031,6 +1031,7 @@ describe('MetaMetricsController', function () {
         securityAlertsEnabled: true,
         theme: 'default',
         useTokenDetection: true,
+        useNativeCurrencyAsPrimaryCurrency: true,
         desktopEnabled: false,
         security_providers: [],
         names: {
@@ -1086,6 +1087,7 @@ describe('MetaMetricsController', function () {
         [MetaMetricsUserTrait.ThreeBoxEnabled]: false,
         [MetaMetricsUserTrait.Theme]: 'default',
         [MetaMetricsUserTrait.TokenDetectionEnabled]: true,
+        [MetaMetricsUserTrait.UseNativeCurrencyAsPrimaryCurrency]: true,
         [MetaMetricsUserTrait.DesktopEnabled]: false,
         [MetaMetricsUserTrait.SecurityProviders]: ['blockaid'],
         ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
@@ -1117,6 +1119,7 @@ describe('MetaMetricsController', function () {
         useNftDetection: false,
         theme: 'default',
         useTokenDetection: true,
+        useNativeCurrencyAsPrimaryCurrency: true,
         desktopEnabled: false,
       });
 
@@ -1140,6 +1143,7 @@ describe('MetaMetricsController', function () {
         useNftDetection: false,
         theme: 'default',
         useTokenDetection: true,
+        useNativeCurrencyAsPrimaryCurrency: false,
         desktopEnabled: false,
       });
 
@@ -1148,6 +1152,7 @@ describe('MetaMetricsController', function () {
         [MetaMetricsUserTrait.NumberOfAccounts]: 3,
         [MetaMetricsUserTrait.NumberOfTokens]: 1,
         [MetaMetricsUserTrait.OpenseaApiEnabled]: false,
+        [MetaMetricsUserTrait.UseNativeCurrencyAsPrimaryCurrency]: false,
       });
     });
 
@@ -1169,6 +1174,7 @@ describe('MetaMetricsController', function () {
         useNftDetection: true,
         theme: 'default',
         useTokenDetection: true,
+        useNativeCurrencyAsPrimaryCurrency: true,
         desktopEnabled: false,
       });
 
@@ -1188,6 +1194,7 @@ describe('MetaMetricsController', function () {
         useNftDetection: true,
         theme: 'default',
         useTokenDetection: true,
+        useNativeCurrencyAsPrimaryCurrency: true,
         desktopEnabled: false,
       });
 

app/scripts/lib/ens-ipfs/resolver.js

@@ -1,6 +1,6 @@
 import namehash from 'eth-ens-namehash';
 import Eth from '@metamask/ethjs-query';
-import EthContract from 'ethjs-contract';
+import EthContract from '@metamask/ethjs-contract';
 import contentHash from '@ensdomains/content-hash';
 import registryAbi from './contracts/registry';
 import resolverAbi from './contracts/resolver';

app/scripts/ui.js

@@ -10,7 +10,7 @@ import 'react-devtools';
 import PortStream from 'extension-port-stream';
 import browser from 'webextension-polyfill';
 
-import Eth from 'ethjs';
+import Eth from '@metamask/ethjs';
 import EthQuery from '@metamask/eth-query';
 import StreamProvider from 'web3-stream-provider';
 import log from 'loglevel';