From b711a96f5b942148bcd1978aba9acd166e3fffc5 Mon Sep 17 00:00:00 2001 From: Michael Ira Krufky Date: Tue, 4 Dec 2018 13:50:59 -0500 Subject: [PATCH 1/2] decryptWalletCtrl: add missing EGEM case --- app/scripts/controllers/decryptWalletCtrl.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js index a8836789fa..dea514160b 100644 --- a/app/scripts/controllers/decryptWalletCtrl.js +++ b/app/scripts/controllers/decryptWalletCtrl.js @@ -238,6 +238,9 @@ 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.ATH: $scope.HDWallet.dPath = $scope.HDWallet.hwAtheiosPath; break; From 0e1259f4bb972e7adb46f412c6ca734ba8b897f2 Mon Sep 17 00:00:00 2001 From: Michael Ira Krufky Date: Tue, 4 Dec 2018 13:55:47 -0500 Subject: [PATCH 2/2] Enable Ledger hardware wallet support for Ellaism @LedgerHQ has announced official support for Ellaism today: https://twitter.com/LedgerHQ/status/1069969935881986049 This enables Ledger hardware wallet support for Ellaism in MyEtherWallet --- app/scripts/controllers/decryptWalletCtrl.js | 6 ++++++ app/scripts/directives/walletDecryptDrtv.html | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js index dea514160b..e4ac76cb52 100644 --- 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; @@ -241,6 +244,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) { 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 index 07fb0a4375..412fec9e56 100644 --- a/app/scripts/directives/walletDecryptDrtv.html +++ b/app/scripts/directives/walletDecryptDrtv.html @@ -47,7 +47,7 @@