From b712874c17165babcd4076a3e3399e793b6b6c30 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 4 Sep 2015 22:15:50 -0300
Subject: [PATCH] fix derivation index

---
 public/views/create.html     | 2 +-
 public/views/import.html     | 2 +-
 public/views/join.html       | 2 +-
 src/js/controllers/import.js | 6 +++---
 src/js/services/ledger.js    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

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 @@
  
             <label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger">
               <span translate>Wallet Seed</span>
-              <small translate>Enter the 12 words seed (BIP39)</small>
+              <small translate>Enter the seed words (BIP39)</small>
               <input id="ext-master"
               type="text"
               name="privateKey" ng-model="privateKey">
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 @@
 
             <div >
               <label for="words">
-                <span translate>Type the Wallet Seed (12 words)</span>:
+                <span translate>Type the Seed Word (usually 12 words)</span>:
               </label>
               <textarea class="form-control" name="words" ng-model="import.words" rows="2"></textarea>
             </div>
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 @@
  
             <label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger">
               <span translate>Wallet Seed</span>
-              <small translate>Enter the 12 words seed (BIP39)</small>
+              <small translate>Enter the seed words (BIP39)</small>
               <input id="ext-master"
               type="text"
               name="privateKey" ng-model="privateKey">
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) {