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 Akroma (AKA) #1992

Merged
merged 4 commits into from
Aug 6, 2018
Merged

Enable Ledger Hardware Wallet support for Akroma (AKA) #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79ff401
Enable Ledger Hardware Wallet support for Akroma (AKA)
mkrufky Aug 3, 2018
c28661c
decryptWalletCtrl: fix missing `break` in Akroma case
mkrufky Aug 3, 2018
b2d5fa3
decryptWalletCtrl: select Akroma's HD Derivation path
mkrufky Aug 3, 2018
967cbd3
Fix Akroma brand style color: #AA0087
mkrufky Aug 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: 8 additions & 1 deletion app/scripts/controllers/decryptWalletCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
case nodes.nodeTypes.POA:
$scope.HDWallet.dPath = $scope.HDWallet.ledgerPath;
break;
case nodes.nodeTypes.AKROMA:
$scope.HDWallet.dPath = $scope.HDWallet.hwAkromaPath;
break;
default:
$scope.HDWallet.dPath = $scope.HDWallet.ledgerPath;
}
Expand Down Expand Up @@ -110,8 +113,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
case nodes.nodeTypes.EOSC:
$scope.HDWallet.dPath = $scope.HDWallet.hwEOSClassicPath;
break;
case nodes.nodeTypes.Akroma:
case nodes.nodeTypes.AKROMA:
$scope.HDWallet.dPath = $scope.HDWallet.hwAkromaPath;
break;
case nodes.nodeTypes.ESN:
$scope.HDWallet.dPath = $scope.HDWallet.hwESNetworkPath;
break;
Expand Down Expand Up @@ -156,6 +160,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
case nodes.nodeTypes.EOSC:
$scope.HDWallet.dPath = $scope.HDWallet.hwEOSClassicPath;
break;
case nodes.nodeTypes.AKROMA:
$scope.HDWallet.dPath = $scope.HDWallet.hwAkromaPath;
break;
case nodes.nodeTypes.ESN:
$scope.HDWallet.dPath = $scope.HDWallet.hwESNetworkPath;
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 @@ -35,7 +35,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'">
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=='AKROMA'">
<input aria-flowto="aria3"
type="radio"
aria-label="Ledger Hardware Wallet"
Expand Down
2 changes: 1 addition & 1 deletion app/styles/etherwallet-custom.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ label small {
@brand-music: #fece00;
@brand-go: #27223d;
@brand-eosc: #926565;
@brand-akroma: #F10000;
@brand-akroma: #AA0087;
@brand-esn: #a16bff;
@brand-cust: #b50085;

Expand Down