update balance later

This commit is contained in:
Matias Alejo Garcia 2015-05-08 11:38:34 -03:00
commit 73634f125f
3 changed files with 11 additions and 6 deletions

View file

@ -405,12 +405,12 @@ to prevent collapsing during animation*/
left: 0; left: 0;
right: 0; right: 0;
animation-timing-function: ease-in-out; animation-timing-function: linear;
animation-duration: .4s; animation-duration: .4s;
animation-iteration-count: 1; animation-iteration-count: 1;
animation-fill-mode: both; animation-fill-mode: both;
-webkit-animation-timing-function: ease-in-out; -webkit-animation-timing-function: linear;
-webkit-animation-duration: .4s; -webkit-animation-duration: .4s;
-webkit-animation-iteration-count: 1; -webkit-animation-iteration-count: 1;
-webkit-animation-fill-mode: both; -webkit-animation-fill-mode: both;

View file

@ -293,10 +293,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}); });
modalInstance.result.then(function(txp) { modalInstance.result.then(function(txp) {
$scope.$emit('Local/TxProposalAction');
if (txp) { if (txp) {
self.setOngoingProcess(); self.setOngoingProcess();
txStatus.notify(txp); txStatus.notify(txp, function() {
$scope.$emit('Local/TxProposalAction');
});
} }
}); });
@ -598,15 +599,15 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.$digest(); $scope.$digest();
return cb(err); return cb(err);
} }
$scope.$emit('Local/TxProposalAction');
txStatus.notify(btx, function() { txStatus.notify(btx, function() {
$scope.$emit('Local/TxProposalAction');
return cb(); return cb();
}); });
}); });
} else { } else {
self.setOngoingProcess(); self.setOngoingProcess();
$scope.$emit('Local/TxProposalAction');
txStatus.notify(signedTx, function() { txStatus.notify(signedTx, function() {
$scope.$emit('Local/TxProposalAction');
return cb(); return cb();
}); });
} }

View file

@ -411,6 +411,10 @@ angular
event.preventDefault(); event.preventDefault();
} }
/*
* --------------------
*/
function animateTransition(entering, leaving) { function animateTransition(entering, leaving) {
// Animation in progress? // Animation in progress?
var x = document.getElementById('mainSectionDup'); var x = document.getElementById('mainSectionDup');