devop/cleanup-nodeTypes

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Release v3.21.18
 ### New  
+- Cleanup nodeTypes [#1983](https://github.com/kvhnuke/etherwallet/pull/1983)
 - Connect Beta [#1966](https://github.com/kvhnuke/etherwallet/pull/1966)
 - Add EXY token [#1981](https://github.com/kvhnuke/etherwallet/pull/1981)
 - Add EDR token [#1977](https://github.com/kvhnuke/etherwallet/pull/1977)

app/scripts/controllers/decryptWalletCtrl.js

@@ -31,7 +31,6 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
         hwSocialPath:      "m/44'/1128'/0'/0",     // first address: m/44'/1128'/0'/0/0
         hwMusicoinPath:    "m/44'/184'/0'/0",      // first address: m/44'/184'/0'/0/0
         singularDTVPath:   "m/0'/0'/0'",           // first address: m/0'/0'/0'/0
-        hwRskPath:         "m/44'/137'/0'/0",      // first address : m/44'/137'/0'/0/0
         goPath:            "m/44'/6060'/0'/0",     // first address: m/44'/6060'/0'/0/0
         hwEOSClassicPath:  "m/44'/2018'/0'/0",     // first address: m/44'/2018'/0'/0/0
     };
@@ -88,9 +87,6 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
                 case nodes.nodeTypes.UBQ:
                     $scope.HDWallet.dPath = $scope.HDWallet.hwUbqPath;
                     break;
-                case nodes.nodeTypes.RSK:
-                    $scope.HDWallet.dPath = $scope.HDWallet.hwRskPath;
-                    break;
                 case nodes.nodeTypes.ELLA:
                     $scope.HDWallet.dPath = $scope.HDWallet.hwEllaismPath;
                     break;

app/scripts/directives/walletDecryptDrtv.html

@@ -47,7 +47,7 @@ <h4 translate="decrypt_Access">
     <!-- TREZOR -->
     <label class="radio"
            aria-flowto="aria4"
-           ng-show="ajaxReq.type=='ETH'||ajaxReq.type=='ETC'||ajaxReq.type=='ROPSTEN ETH'||ajaxReq.type=='RINKEBY ETH'||ajaxReq.type=='KOVAN ETH'||ajaxReq.type=='EXP'||ajaxReq.type=='UBQ'||ajaxReq.type=='RSK'||ajaxReq.type=='POA'||ajaxReq.type=='TOMO'||ajaxReq.type=='ELLA'||ajaxReq.type=='EGEM'||ajaxReq.type=='CLO'||ajaxReq.type=='ETSC'||ajaxReq.type=='MUSIC'||ajaxReq.type=='GO'||ajaxReq.type=='EOSC'">
+           ng-show="ajaxReq.type=='ETH'||ajaxReq.type=='ETC'||ajaxReq.type=='ROPSTEN ETH'||ajaxReq.type=='RINKEBY ETH'||ajaxReq.type=='KOVAN ETH'||ajaxReq.type=='EXP'||ajaxReq.type=='UBQ'||ajaxReq.type=='POA'||ajaxReq.type=='TOMO'||ajaxReq.type=='ELLA'||ajaxReq.type=='EGEM'||ajaxReq.type=='CLO'||ajaxReq.type=='ETSC'||ajaxReq.type=='MUSIC'||ajaxReq.type=='GO'||ajaxReq.type=='EOSC'">
       <input aria-flowto="aria4"
              type="radio"
              aria-label="Trezor Hardware Wallet"
@@ -962,7 +962,7 @@ <h4 id="modalTitle" class="modal-title" translate="ADD_Radio_5_Path" style="marg
                 </p>
               </label>
             </div>
-            
+
             <div class="col-sm-4">
               <label class="radio small">
                 <input aria-describedby="Path: TREZOR (GO) {{HDWallet.goPath}}"

app/scripts/nodes.js

@@ -6,11 +6,9 @@ nodes.metamaskNode = require('./nodeHelpers/metamask');
 nodes.nodeTypes = {
     ETH: "ETH",
     ETC: "ETC",
-    MUS: "MUSIC",
     Ropsten: "ROPSTEN ETH",
     Kovan: "KOVAN ETH",
     Rinkeby: "RINKEBY ETH",
-    RSK: "RSK",
     EXP: "EXP",
     UBQ: "UBQ",
     POA: "POA",

app/styles/etherwallet-custom.less

@@ -593,7 +593,6 @@ label small {
 @brand-eth: @brand-primary;
 @brand-etc: #009241;
 @brand-test: #adc101;
-@brand-rsk: #ff794f;
 @brand-exp: #673ab7;
 @brand-ubq: #00ad85;
 @brand-poa: #4568bb;
@@ -731,13 +730,6 @@ header.Rinkeby {
   & + .container .alert-info             { background-color:@brand-test;             }
 }
 
-header.RSK {
-  .header-branding                       { border-bottom: 0.25rem solid @brand-rsk;  }
-  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-rsk;     }
-  & + .container .modal-content          { border: 0.25rem solid @brand-rsk;         }
-  & + .container .alert-info             { background-color: @brand-rsk;             }
-}
-
 header.Custom {
   .header-branding                       { border-bottom: 0.25rem solid @brand-cust; }
   & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-cust;    }