mirror of https://github.com/BTCPrivate/copay.git
fixes error when mnemonic is empty
This commit is contained in:
parent
0a8f1acbe2
commit
70eb80aae8
|
@ -15,6 +15,7 @@ var templates = {
|
|||
'.desktop': 'webkitbuilds/',
|
||||
'setup-win.iss': 'webkitbuilds/',
|
||||
'build-macos.sh': 'webkitbuilds/',
|
||||
'manifest.json': 'chrome-app/',
|
||||
// 'bower.json': '/',
|
||||
};
|
||||
var configDir = process.argv[2] || 'copay';
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"manifest_version": 2,
|
||||
"name": "*PACKAGENAME*",
|
||||
"description": "*PACKAGEDESCRIPTION*",
|
||||
"description": "*DESCRIPTION*",
|
||||
"version": "*VERSION*",
|
||||
"permissions": [
|
||||
"storage",
|
||||
|
|
|
@ -24,14 +24,12 @@ angular.module('copayApp.controllers').controller('importController',
|
|||
|
||||
$scope.seedOptions = [];
|
||||
|
||||
if (isChromeApp) {
|
||||
if (isChromeApp || isDevel) {
|
||||
$scope.seedOptions.push({
|
||||
id: 'ledger',
|
||||
label: 'Ledger Hardware Wallet',
|
||||
});
|
||||
}
|
||||
|
||||
if (isChromeApp || isDevel) {
|
||||
$scope.seedOptions.push({
|
||||
id: 'trezor',
|
||||
label: 'Trezor Hardware Wallet',
|
||||
|
@ -281,14 +279,14 @@ angular.module('copayApp.controllers').controller('importController',
|
|||
};
|
||||
|
||||
$scope.importHW = function(form) {
|
||||
if (form.$invalid || $scope.formData.ccount < 0) {
|
||||
if (form.$invalid || $scope.formData.account < 0) {
|
||||
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('There is an error in the form'));
|
||||
return;
|
||||
}
|
||||
|
||||
$scope.importErr = false;
|
||||
|
||||
var account = $scope.formData.ccount;
|
||||
var account = $scope.formData.account;
|
||||
|
||||
if ($scope.seedSource.id == 'trezor') {
|
||||
if (account < 1) {
|
||||
|
|
|
@ -636,6 +636,7 @@ angular.module('copayApp.services')
|
|||
};
|
||||
|
||||
root._normalizeMnemonic = function(words) {
|
||||
if (!words || !words.indexOf) return words;
|
||||
var isJA = words.indexOf('\u3000') > -1;
|
||||
var wordList = words.split(/[\u3000\s]+/);
|
||||
|
||||
|
|
Loading…
Reference in New Issue