Commit f2b3fa84 authored by Gamaliel 'Yel' Padillo's avatar Gamaliel 'Yel' Padillo Committed by GitHub

Merge branch 'mercury' into devop/sync-repo

parents ee0a404f f2b3050f
### New
- Add LCT token [#2035](https://github.com/kvhnuke/etherwallet/pull/2035)
- BUG FIX: Fix missing break after bad merge conflict resolution [#2034](https://github.com/kvhnuke/etherwallet/pull/2034)
- Enable Ledger Hardware Wallet support for Callisto (CLO) [#2032](https://github.com/kvhnuke/etherwallet/pull/2032)
- Enable Ledger Hardware Wallet support for Atheios (ATH) [#2030](https://github.com/kvhnuke/etherwallet/pull/2030)
- Remove confusing json_relay_node folder [#2025](https://github.com/kvhnuke/etherwallet/pull/2025)
......
......@@ -80,6 +80,7 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
break;
case nodes.nodeTypes.ATH:
$scope.HDWallet.dPath = $scope.HDWallet.hwAtheiosPath;
break;
case nodes.nodeTypes.EGEM:
$scope.HDWallet.dPath = $scope.HDWallet.hwEtherGemPath;
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment