diff --git a/public/views/create.html b/public/views/create.html index 0c495af1a..1a0985e75 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -131,7 +131,7 @@ Wallet Seed - Enter the 12 words seed (BIP39) + Enter the seed words (BIP39) diff --git a/public/views/import.html b/public/views/import.html index 927cf20c5..7cc75f7c6 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -80,7 +80,7 @@ - Type the Wallet Seed (12 words): + Type the Seed Word (usually 12 words): diff --git a/public/views/join.html b/public/views/join.html index 01ca33775..712c39251 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -114,7 +114,7 @@ Wallet Seed - Enter the 12 words seed (BIP39) + Enter the seed words (BIP39) diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index c8c95057d..8ffeff5c6 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -139,13 +139,13 @@ angular.module('copayApp.controllers').controller('importController', this.error = null; if (!words) { - this.error = gettext('Please enter the backup words'); + this.error = gettext('Please enter the seed words'); } else { var wordList = words.split(/ /).filter(function(v) { return v.length > 0; }); - if (wordList.length != 12) - this.error = gettext('Please enter 12 backup words'); + if ((wordList.length % 3) != 0) + this.error = gettext('Wrong number of seed words:') + wordList.length; else words = wordList.join(' '); } diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js index d34a5f656..b55cdb872 100644 --- a/src/js/services/ledger.js +++ b/src/js/services/ledger.js @@ -143,7 +143,7 @@ angular.module('copayApp.services') } root._getPath = function(index) { - return bwcService.getUtils().PATHS.BASE_ADDRESS_DERIVATION + "/" + index; + return "m/" + index + "'/45'"; } root._splitTransaction = function(transaction) {