Merge pull request #2175 from mkrufky/ellaism

Enable Ledger hardware wallet support for Ellaism
MyEtherWallet · Dec 5, 2018 · abfed63 · abfed63
2 parents 3749853 + 0e1259f
commit abfed63
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js
@@ -93,6 +93,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
         case nodes.nodeTypes.ATH:
           $scope.HDWallet.dPath = $scope.HDWallet.hwAtheiosPath;
           break;
+        case nodes.nodeTypes.ELLA:
+          $scope.HDWallet.dPath = $scope.HDWallet.hwEllaismPath;
+          break;
         case nodes.nodeTypes.EGEM:
           $scope.HDWallet.dPath = $scope.HDWallet.hwEtherGemPath;
           break;
@@ -238,6 +241,12 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
         case nodes.nodeTypes.ETHO:
           $scope.HDWallet.dPath = $scope.HDWallet.hwEther1Path;
           break;
+        case nodes.nodeTypes.EGEM:
+          $scope.HDWallet.dPath = $scope.HDWallet.hwEtherGemPath;
+          break;
+        case nodes.nodeTypes.ELLA:
+          $scope.HDWallet.dPath = $scope.HDWallet.hwEllaismPath;
+          break;
         case nodes.nodeTypes.ATH:
           $scope.HDWallet.dPath = $scope.HDWallet.hwAtheiosPath;
           break;

diff --git a/app/scripts/directives/walletDecryptDrtv.html b/app/scripts/directives/walletDecryptDrtv.html
@@ -47,7 +47,7 @@ <h4 translate="decrypt_Access">
     <!-- Ledger -->
     <label aria-flowto="aria3"
            class="radio"
-           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=='ESN'||ajaxReq.type=='AKA'||ajaxReq.type=='PIRL'||ajaxReq.type=='ETHO'||ajaxReq.type=='EGEM'||ajaxReq.type=='CLO'||ajaxReq.type=='ATH'||ajaxReq.type=='MUSIC'||ajaxReq.type=='EOSC'||ajaxReq.type=='GO'||ajaxReq.type=='MIX'||ajaxReq.type=='ILT'">
+           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=='ESN'||ajaxReq.type=='AKA'||ajaxReq.type=='PIRL'||ajaxReq.type=='ETHO'||ajaxReq.type=='EGEM'||ajaxReq.type=='CLO'||ajaxReq.type=='ATH'||ajaxReq.type=='MUSIC'||ajaxReq.type=='EOSC'||ajaxReq.type=='GO'||ajaxReq.type=='MIX'||ajaxReq.type=='ILT'||ajaxReq.type=='ELLA'">
       <input aria-flowto="aria3"
              type="radio"
              aria-label="Ledger Hardware Wallet"