BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2732 from cmgustavo/bug/resume-payment-intent 

Update wallet after resume app. Fix payment-intent
This commit is contained in:
Matias Alejo Garcia 2015-05-15 19:40:29 -03:00
parent 06fef225bd ece6124a6c
commit 49256ead7f
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/js/routes.js
View File

@ -340,7 +340,7 @@ angular
url: '/cordova/:status',
views: {
'main': {
controller: function($rootScope, $stateParams, go) {
controller: function($rootScope, $stateParams, $timeout, go) {
switch ($stateParams.status) {
case 'resume':
$rootScope.$emit('Local/Resume');
@ -349,6 +349,9 @@ angular
$rootScope.$emit('Local/Offline');
break;
};
$timeout(function() {
$rootScope.$emit('Local/SetTab', 'walletHome', true);
}, 100);
go.walletHome();
}
}
@ -381,6 +384,8 @@ angular
var pageWeight = {
walletHome: 0,
copayers: -1,
cordova: -1,
uri-payment: -1,
preferences: 11,
preferencesColor: 12,
@ -485,19 +490,27 @@ angular
var entering = null,
leaving = null;
// Horizontal Slide Animation?
if (fromWeight && toWeight) {
if (fromWeight > toWeight) {
leaving = 'CslideOutRight';
} else {
entering = 'CslideInRight';
}
// Vertical Slide Animation?
} else if (fromName && fromWeight >= 0 && toWeight >= 0) {
if (toWeight) {
entering = 'CslideInUp';
} else {
leaving = 'CslideOutDown';
}
// no Animation ?
} else {
return true;
}
var e = document.getElementById('mainSection');