import on splash

This commit is contained in:
Matias Alejo Garcia 2015-05-13 11:58:19 -03:00
commit 51ad7d83dc
12 changed files with 28 additions and 52 deletions

View file

@ -721,7 +721,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.noFocusedWallet = true;
self.isComplete = null;
self.walletName = null;
go.addWallet();
go.path('import');
});
});

View file

@ -14,17 +14,20 @@ Profile.create = function(opts) {
var x = new Profile();
x.createdOn = Date.now();
x.credentials = opts.credentials;
x.credentials = opts.credentials || [];
return x;
};
Profile.fromObj = function(obj) {
var x = new Profile();
x.createdOn = obj.createdOn;
x.credentials = obj.credentials;
if (x.credentials[0] && typeof x.credentials[0] != 'object')
throw ("credentials should be an object");
return x;
};

View file

@ -68,23 +68,23 @@ angular
needProfile: false,
views: {
'main': {
templateUrl: 'views/splash/1.html',
templateUrl: 'views/splash.html',
controller: function($scope, $timeout, $log, profileService, go) {
if (profileService.profile) {
go.walletHome();
}
$scope.create = function() {
$scope.create = function(noWallet) {
$scope.creatingProfile = true;
profileService.create(function(err) {
profileService.create({noWallet: noWallet}, function(err) {
if (err) {
$scope.creatingProfile = false;
$log.warn(err);
$scope.error = err;
$scope.$apply();
$timeout(function() {
$scope.create();
$scope.create(noWallet);
}, 3000);
}
});
@ -384,7 +384,7 @@ angular
create: 12,
join: 12,
import: 12,
importLegacy: 12
importLegacy: 13
};

View file

@ -157,9 +157,13 @@ angular.module('copayApp.services')
});
};
root._createNewProfile = function(cb) {
var walletClient = bwcService.getClient();
root._createNewProfile = function(opts, cb) {
if (opts.noWallet) {
return cb(null, Profile.create());
}
var walletClient = bwcService.getClient();
walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
network: 'livenet'
}, function(err) {
@ -276,13 +280,11 @@ angular.module('copayApp.services')
});
};
root.create = function(cb) {
root.create = function(opts, cb) {
$log.info('Creating profile');
configService.get(function(err) {
root.applyConfig();
root._createNewProfile(function(err, p) {
root._createNewProfile(opts, function(err, p) {
if (err) return cb(err);
root.bindProfile(p, function(err) {