fix derivation index

This commit is contained in:
Matias Alejo Garcia 2015-09-04 22:15:50 -03:00
parent 4d9a477ae5
commit b712874c17
5 changed files with 7 additions and 7 deletions

View File

@ -131,7 +131,7 @@
<label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger"> <label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger">
<span translate>Wallet Seed</span> <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" <input id="ext-master"
type="text" type="text"
name="privateKey" ng-model="privateKey"> name="privateKey" ng-model="privateKey">

View File

@ -80,7 +80,7 @@
<div > <div >
<label for="words"> <label for="words">
<span translate>Type the Wallet Seed (12 words)</span>: <span translate>Type the Seed Word (usually 12 words)</span>:
</label> </label>
<textarea class="form-control" name="words" ng-model="import.words" rows="2"></textarea> <textarea class="form-control" name="words" ng-model="import.words" rows="2"></textarea>
</div> </div>

View File

@ -114,7 +114,7 @@
<label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger"> <label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger">
<span translate>Wallet Seed</span> <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" <input id="ext-master"
type="text" type="text"
name="privateKey" ng-model="privateKey"> name="privateKey" ng-model="privateKey">

View File

@ -139,13 +139,13 @@ angular.module('copayApp.controllers').controller('importController',
this.error = null; this.error = null;
if (!words) { if (!words) {
this.error = gettext('Please enter the backup words'); this.error = gettext('Please enter the seed words');
} else { } else {
var wordList = words.split(/ /).filter(function(v) { var wordList = words.split(/ /).filter(function(v) {
return v.length > 0; return v.length > 0;
}); });
if (wordList.length != 12) if ((wordList.length % 3) != 0)
this.error = gettext('Please enter 12 backup words'); this.error = gettext('Wrong number of seed words:') + wordList.length;
else else
words = wordList.join(' '); words = wordList.join(' ');
} }

View File

@ -143,7 +143,7 @@ angular.module('copayApp.services')
} }
root._getPath = function(index) { root._getPath = function(index) {
return bwcService.getUtils().PATHS.BASE_ADDRESS_DERIVATION + "/" + index; return "m/" + index + "'/45'";
} }
root._splitTransaction = function(transaction) { root._splitTransaction = function(transaction) {