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

fix conflics

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-05-01 09:41:18 -03:00
commit 1e8895f4b8
10 changed files with 144 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/controllers/setup.js
View file

@ -31,13 +31,15 @@ angular.module('copay.setup').controller('SetupController',
updateRCSelect(tc);
});
$scope.create = function(totalCopayers, requiredCopayers, walletName) {
$scope.create = function(totalCopayers, requiredCopayers, walletName, myNickname) {
$scope.loading = true;
var opts = {
requiredCopayers: requiredCopayers,
totalCopayers: totalCopayers,
name: walletName,
nickname: myNickname,
};
console.log('[setup.js.31:opts:]',opts); //TODO
var w = walletFactory.create(opts);
controllerUtils.startNetwork(w);
};