From 00dba11d4bed2721656aa74baeb70bc2f13f4729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 15 Jun 2016 10:24:46 -0300 Subject: [PATCH] add a testnet switch when importing mnemonics --- public/views/import.html | 8 ++++++++ src/js/controllers/import.js | 7 +++++++ src/js/services/derivationPathHelper.js | 4 +++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/public/views/import.html b/public/views/import.html index 3b293b44c..8bca7f724 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -82,6 +82,14 @@ Wallet Service URL + +
+ +
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index c1e518e34..9ff8defdf 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -125,6 +125,13 @@ angular.module('copayApp.controllers').controller('importController', }, 100); }; + $scope.setDerivationPath = function() { + if ($scope.testnetEnabled) + $scope.derivationPath = derivationPathHelper.defaultTestnet; + else + $scope.derivationPath = derivationPathHelper.default; + } + $scope.getFile = function() { // If we use onloadend, we need to check the readyState. reader.onloadend = function(evt) { diff --git a/src/js/services/derivationPathHelper.js b/src/js/services/derivationPathHelper.js index ad2d8e397..8e9b7151c 100644 --- a/src/js/services/derivationPathHelper.js +++ b/src/js/services/derivationPathHelper.js @@ -3,7 +3,9 @@ angular.module('copayApp.services').factory('derivationPathHelper', function(lodash) { var root = {}; - root.default = "m/44'/0'/0'" + root.default = "m/44'/0'/0'"; + root.defaultTestnet = "m/44'/1'/0'"; + root.parse = function(str) { var arr = str.split('/');