Merge pull request #2245 from thundercore/feature/addThunderCoreSupport

Fix thundercore support.
MyEtherWallet · Mar 20, 2019 · 82547e0 · 82547e0
2 parents 385cf62 + 668afcd
commit 82547e0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/app/images/coins/thunder.svg → app/images/coins/thundercore.svg b/app/images/coins/thunder.svg → app/images/coins/thundercore.svg
diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js
@@ -49,6 +49,7 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
     tomoPath: 'm/44\'/889\'/0\'/0', // first address: m/44'/889'/0'/0/0
     hwMixPath: 'm/44\'/76\'/0\'/0', // first address: m/44'/76'/0'/0/0
     hwReoscPath: 'm/44\'/2894\'/0\'/0', // first address: m/44'/2894'/0'/0/0
+    thundercorePath: 'm/44\'/1001\'/0\'/0', // first address: m/44'/1001'/0'/0/0
   };
   $scope.canUseMewConnect = MewConnectEth.checkWebRTCAvailable();
   $scope.mewConnectMayFail = MewConnectEth.checkBrowser();
@@ -121,6 +122,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
         case nodes.nodeTypes.REOSC:
           $scope.HDWallet.dPath = $scope.HDWallet.hwReoscPath;
           break;
+        case nodes.nodeTypes.THUNDERCORE:
+          $scope.HDWallet.dPath = $scope.HDWallet.thundercorePath;
+          break;
         default:
           $scope.HDWallet.dPath = $scope.HDWallet.ledgerPath;
       }
@@ -269,6 +273,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
         case nodes.nodeTypes.REOSC:
           $scope.HDWallet.dPath = $scope.HDWallet.hwReoscPath;
           break;
+        case nodes.nodeTypes.THUNDERCORE:
+          $scope.HDWallet.dPath = $scope.HDWallet.thundercorePath;
+          break;
         default:
           $scope.HDWallet.dPath = $scope.HDWallet.defaultDPath;
       }

diff --git a/app/scripts/directives/walletDecryptDrtv.html b/app/scripts/directives/walletDecryptDrtv.html
@@ -860,7 +860,7 @@ <h4 id="modalTitle" class="modal-title" translate="ADD_Radio_5_Path" style="marg
           </h4>
 
           <p class="alert alert-danger"
-             ng-hide="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=='ELLA'||ajaxReq.type=='EGEM'||ajaxReq.type=='CLO'||ajaxReq.type=='ETSC'||ajaxReq.type=='MUSIC'||ajaxReq.type=='GO'||ajaxReq.type=='EOSC'||ajaxReq.type=='POA'||ajaxReq.type=='AKA'||ajaxReq.type=='ESN'||ajaxReq.type=='PIRL'||ajaxReq.type=='ETHO'||ajaxReq.type=='ATH'||ajaxReq.type=='MIX'||ajaxReq.type=='ILT'||ajaxReq.type=='REOSC'">
+             ng-hide="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=='ELLA'||ajaxReq.type=='EGEM'||ajaxReq.type=='CLO'||ajaxReq.type=='ETSC'||ajaxReq.type=='MUSIC'||ajaxReq.type=='GO'||ajaxReq.type=='EOSC'||ajaxReq.type=='POA'||ajaxReq.type=='AKA'||ajaxReq.type=='ESN'||ajaxReq.type=='PIRL'||ajaxReq.type=='ETHO'||ajaxReq.type=='ATH'||ajaxReq.type=='MIX'||ajaxReq.type=='ILT'||ajaxReq.type=='REOSC'||ajaxReq.type=='THUNDERCORE'">
                 We do not know the correct path for this network.
                 <a href="https://github.com/kvhnuke/etherwallet/issues"
                    target="_blank"
@@ -1204,6 +1204,20 @@ <h4 id="modalTitle" class="modal-title" translate="ADD_Radio_5_Path" style="marg
                </label>
             </div>
 
+            <div class="col-sm-4">
+              <label class="radio small">
+                <input aria-describedby="Path: Ledger (THUNDERCORE) {{HDWallet.thundercorePath}}"
+                       ng-change="onHDDPathChange()"
+                       ng-model="HDWallet.dPath"
+                       type="radio"
+                       value="{{HDWallet.thundercorePath}}"/>
+                <span ng-bind="HDWallet.thundercorePath"></span>
+                <p class="small">
+                  Network: ThunderCore (TT)
+                </p>
+              </label>
+            </div>
+
             <div class="col-sm-4">
               <label class="radio small">
                 <p class="small"><strong>

diff --git a/app/scripts/nodes.js b/app/scripts/nodes.js
@@ -29,7 +29,7 @@ nodes.nodeTypes = {
 	WEB: "WEB",
 	MIX: "MIX",
 	REOSC: "REOSC",
-	THUNDERCORE: "THUNDERCORE",
+	THUNDERCORE: "TT",
 	Custom: "CUSTOM ETH"
 };
 nodes.ensNodeTypes = [nodes.nodeTypes.ETH, nodes.nodeTypes.Ropsten];

diff --git a/app/styles/etherwallet-custom.less b/app/styles/etherwallet-custom.less
@@ -621,7 +621,7 @@ label small {
 @brand-web: #0092ee;
 @brand-reosc: #1500db;
 @brand-cust: #b50085;
-@brand-thundercore: #ffe81c;
+@brand-thundercore: #ffc000;
 
 .dropdown-node .dropdown-menu {
   li {