Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

Enable Ledger hardware wallet support for Ellaism #2175

Merged
merged 2 commits into from
Dec 5, 2018
Merged

Enable Ledger hardware wallet support for Ellaism #2175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b711a96
decryptWalletCtrl: add missing EGEM case
mkrufky Dec 4, 2018
0e1259f
Enable Ledger hardware wallet support for Ellaism
mkrufky Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/scripts/controllers/decryptWalletCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/directives/walletDecryptDrtv.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down