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

Merge branch 'ref/design' of github.com:matiu/copay into ref/design

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-18 10:13:00 -03:00
commit 1f5e55efae
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
12 changed files with 149 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/services/go.js
View file

@ -32,13 +32,17 @@ angular.module('copayApp.services').factory('go', function($window, $ionicSideMe
root.walletHome = function() {
var fc = profileService.focusedClient;
if (fc && !fc.isComplete()) {
$log.debug("Wallet not complete at startup... redirecting")
root.path('copayers');
$log.debug("Wallet not complete at startup... redirecting");
$state.transitionTo('wallet.details', {walletId: fc.credentials.walletId})
} else {
root.path('tabs.home');
}
};
root.confirm = function(params) {
$state.transitionTo('confirm', params)
};
root.send = function() {
root.path('tabs.send');
};

2
src/js/services/profileService.js
View file

@ -540,7 +540,7 @@ angular.module('copayApp.services')
var config = configService.getSync();
if (config.pushNotifications.enabled)
pushNotificationsService.enableNotifications(root.wallet);
return cb(err, walletClient);
return cb(err, client);
});
});
});