diff --git a/CHANGELOG.md b/CHANGELOG.md index 359ddc742f..3f1ed622ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ### 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) diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js index 8821029666..b72dd34b72 100644 --- a/app/scripts/controllers/decryptWalletCtrl.js +++ b/app/scripts/controllers/decryptWalletCtrl.js @@ -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;