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

fix conflics

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-06-13 19:45:00 -03:00
commit 194e5fed54
7 changed files with 55 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/services/controllerUtils.js
View file

@ -108,6 +108,8 @@ angular.module('copayApp.services')
root.updateTxs({onlyPending:true});
// give sometime to the tx to propagate.
$timeout(function() {
console.log('[controllerUtils.js.111] UPDATE BALANCE'); //TODO
root.updateBalance(function(){
if (!dontDigest) {
$rootScope.$digest();
@ -142,7 +144,11 @@ angular.module('copayApp.services')
$rootScope.balanceByAddr = {};
$rootScope.updatingBalance = true;
console.log('[controllerUtils.js.147] GET'); //TODO
w.getBalance(function(err, balance, balanceByAddr, safeBalance) {
console.log('[controllerUtils.js.150]', err, balance); //TODO
if (err) {
console.error('Error: ' + err.message); //TODO
root._setCommError();