anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3865 from cmgustavo/bug/scope-vs-form

Browse source 
Replaces form values by the scope
This commit is contained in:
Matias Alejo Garcia 2016-02-12 11:08:11 -05:00
commit 9d9cd4f734
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/js/controllers/create.js
View file

@ -92,21 +92,21 @@ angular.module('copayApp.controllers').controller('createController',
var opts = { var opts = {
m: $scope.requiredCopayers, m: $scope.requiredCopayers,
n: $scope.totalCopayers, n: $scope.totalCopayers,
name: form.walletName.$modelValue, name: $scope.walletName,
myName: $scope.totalCopayers > 1 ? form.myName.$modelValue : null, myName: $scope.totalCopayers > 1 ? $scope.myName : null,
networkName: form.isTestnet.$modelValue ? 'testnet' : 'livenet', networkName: $scope.isTestnet ? 'testnet' : 'livenet',
bwsurl: $scope.bwsurl, bwsurl: $scope.bwsurl,
}; };
var setSeed = self.seedSourceId == 'set'; var setSeed = self.seedSourceId == 'set';
if (setSeed) { if (setSeed) {
var words = form.privateKey.$modelValue || ''; var words = $scope.privateKey || '';
if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) { if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) {
opts.extendedPrivateKey = words; opts.extendedPrivateKey = words;
} else { } else {
opts.mnemonic = words; opts.mnemonic = words;
} }
opts.passphrase = form.passphrase.$modelValue; opts.passphrase = $scope.passphrase;
var pathData = derivationPathHelper.parse($scope.derivationPath); var pathData = derivationPathHelper.parse($scope.derivationPath);
if (!pathData) { if (!pathData) {
@ -119,7 +119,7 @@ angular.module('copayApp.controllers').controller('createController',
opts.derivationStrategy = pathData.derivationStrategy; opts.derivationStrategy = pathData.derivationStrategy;
} else { } else {
opts.passphrase = form.createPassphrase.$modelValue; opts.passphrase = $scope.createPassphrase;
} }
if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) { if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {