Merge remote-tracking branch 'origin/release-8.1' into release-8.6

lib/blockchain/install.js

@@ -23,10 +23,8 @@ const PLUGINS = {
   BTC: require('./bitcoin.js'),
   BCH: require('./bitcoincash.js'),
   DASH: require('./dash.js'),
-  ETH: require('./ethereum.js'),
   LTC: require('./litecoin.js'),
-  XMR: require('./monero.js'),
-  ZEC: require('./zcash.js')
+  XMR: require('./monero.js')
 }
 
 const BLOCKCHAIN_DIR = process.env.BLOCKCHAIN_DIR
@@ -207,10 +205,6 @@ function isInstalled (crypto) {
 
 function isDisabled (crypto) {
   switch (crypto.cryptoCode) {
-    case 'ETH':
-      return 'Use admin\'s Infura plugin'
-    case 'ZEC':
-      return 'Use admin\'s BitGo plugin'
     case 'XMR':
       return isInstalled(crypto) && 'Installed' || isInstalled(_.find(it => it.code === 'zcash', cryptos)) && 'Insufficient resources. Contact support.'
     default:
@@ -220,11 +214,10 @@ function isDisabled (crypto) {
 
 function run () {  
   const choices = _.flow([
-    _.filter(c => c.type !== 'erc-20'),
+    _.filter(c => !c.hideFromInstall),
     _.map(c => {
-      const name = c.code === 'ethereum' ? 'Ethereum and/or USDT' : c.display
       return {
-        name,
+        name: c.display,
         value: c.code,
         checked: isInstalled(c),
         disabled: isDisabled(c)