mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #2732 from cmgustavo/bug/resume-payment-intent
Update wallet after resume app. Fix payment-intent
This commit is contained in:
commit
49256ead7f
|
@ -340,7 +340,7 @@ angular
|
||||||
url: '/cordova/:status',
|
url: '/cordova/:status',
|
||||||
views: {
|
views: {
|
||||||
'main': {
|
'main': {
|
||||||
controller: function($rootScope, $stateParams, go) {
|
controller: function($rootScope, $stateParams, $timeout, go) {
|
||||||
switch ($stateParams.status) {
|
switch ($stateParams.status) {
|
||||||
case 'resume':
|
case 'resume':
|
||||||
$rootScope.$emit('Local/Resume');
|
$rootScope.$emit('Local/Resume');
|
||||||
|
@ -349,6 +349,9 @@ angular
|
||||||
$rootScope.$emit('Local/Offline');
|
$rootScope.$emit('Local/Offline');
|
||||||
break;
|
break;
|
||||||
};
|
};
|
||||||
|
$timeout(function() {
|
||||||
|
$rootScope.$emit('Local/SetTab', 'walletHome', true);
|
||||||
|
}, 100);
|
||||||
go.walletHome();
|
go.walletHome();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -381,6 +384,8 @@ angular
|
||||||
var pageWeight = {
|
var pageWeight = {
|
||||||
walletHome: 0,
|
walletHome: 0,
|
||||||
copayers: -1,
|
copayers: -1,
|
||||||
|
cordova: -1,
|
||||||
|
uri-payment: -1,
|
||||||
|
|
||||||
preferences: 11,
|
preferences: 11,
|
||||||
preferencesColor: 12,
|
preferencesColor: 12,
|
||||||
|
@ -485,19 +490,27 @@ angular
|
||||||
var entering = null,
|
var entering = null,
|
||||||
leaving = null;
|
leaving = null;
|
||||||
|
|
||||||
|
// Horizontal Slide Animation?
|
||||||
if (fromWeight && toWeight) {
|
if (fromWeight && toWeight) {
|
||||||
if (fromWeight > toWeight) {
|
if (fromWeight > toWeight) {
|
||||||
leaving = 'CslideOutRight';
|
leaving = 'CslideOutRight';
|
||||||
} else {
|
} else {
|
||||||
entering = 'CslideInRight';
|
entering = 'CslideInRight';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Vertical Slide Animation?
|
||||||
} else if (fromName && fromWeight >= 0 && toWeight >= 0) {
|
} else if (fromName && fromWeight >= 0 && toWeight >= 0) {
|
||||||
if (toWeight) {
|
if (toWeight) {
|
||||||
entering = 'CslideInUp';
|
entering = 'CslideInUp';
|
||||||
} else {
|
} else {
|
||||||
leaving = 'CslideOutDown';
|
leaving = 'CslideOutDown';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// no Animation ?
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
var e = document.getElementById('mainSection');
|
var e = document.getElementById('mainSection');
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue