Merge branch 'develop' into mv3_test_build

MetaMask · Jul 4, 2022 · 6b3344f · 6b3344f
2 parents 62883bf + e8ea973
commit 6b3344f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.metamaskrc.dist b/.metamaskrc.dist
@@ -6,6 +6,7 @@ ONBOARDING_V2=
 SWAPS_USE_DEV_APIS=
 COLLECTIBLES_V1=
 TOKEN_DETECTION_V2=
+ADD_POPULAR_NETWORKS=
 
 ; Set this to test changes to the phishing warning page.
 PHISHING_WARNING_PAGE_URL=
diff --git a/development/build/scripts.js b/development/build/scripts.js
@@ -36,6 +36,7 @@ const metamaskrc = require('rc')('metamask', {
   COLLECTIBLES_V1: process.env.COLLECTIBLES_V1,
   PHISHING_WARNING_PAGE_URL: process.env.PHISHING_WARNING_PAGE_URL,
   TOKEN_DETECTION_V2: process.env.TOKEN_DETECTION_V2,
+  ADD_POPULAR_NETWORKS: process.env.ADD_POPULAR_NETWORKS,
   SEGMENT_HOST: process.env.SEGMENT_HOST,
   SEGMENT_WRITE_KEY: process.env.SEGMENT_WRITE_KEY,
   SEGMENT_BETA_WRITE_KEY: process.env.SEGMENT_BETA_WRITE_KEY,
@@ -940,6 +941,7 @@ function getEnvironmentVariables({ buildType, devMode, testing, version }) {
     ONBOARDING_V2: metamaskrc.ONBOARDING_V2 === '1',
     COLLECTIBLES_V1: metamaskrc.COLLECTIBLES_V1 === '1',
     TOKEN_DETECTION_V2: metamaskrc.TOKEN_DETECTION_V2 === '1',
+    ADD_POPULAR_NETWORKS: metamaskrc.ADD_POPULAR_NETWORKS === '1',
   };
 }
 

diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js
@@ -336,7 +336,8 @@ export default class ExperimentalTab extends PureComponent {
         {this.renderCollectibleDetectionToggle()}
         {this.renderEIP1559V2EnabledToggle()}
         {this.renderTheme()}
-        {this.renderCustomNetworkListToggle()}
+        {process.env.ADD_POPULAR_NETWORKS &&
+          this.renderCustomNetworkListToggle()}
       </div>
     );
   }