diff --git a/app-template/apply.js b/app-template/apply.js index 2f0015e34..b5de33729 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -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'; diff --git a/app-template/manifest.json b/app-template/manifest.json index dca54d40b..78eabf8a9 100644 --- a/app-template/manifest.json +++ b/app-template/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "*PACKAGENAME*", - "description": "*PACKAGEDESCRIPTION*", + "description": "*DESCRIPTION*", "version": "*VERSION*", "permissions": [ "storage", diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index df1aaf62d..f669cb20c 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -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) { diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index d5de455b6..ae40986b8 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -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]+/);