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

fix timming in modal

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-04-27 02:07:26 -03:00
commit 7028f6f1c5
4 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/index.js
View file

@ -649,7 +649,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.updateAll();
$timeout(function() {
self.updateTxHistory();
}, 5000);
}, 3000);
});
});

20
src/js/controllers/walletHome.js
View file

@ -486,10 +486,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}
self.signAndBroadcast(txp, function(err) {
profileService.lockFC();
if (err) {
if (err)
return self.setError(err);
}
self.resetForm();
});
});
@ -504,9 +503,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
profileService.lockFC();
self.setOngoingProcess();
if (err) {
if (err)
return cb(err);
}
if (signedTx.status == 'accepted') {
self.setOngoingProcess('Broadcasting transaction');
@ -515,16 +513,14 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (err) {
$scope.error = 'Transaction not broadcasted. Please try again.';
$scope.$digest();
} else {
txStatus.notify(btx);
$scope.$emit('Local/TxProposalAction');
}
return cb();
return;
}
$scope.$emit('Local/TxProposalAction');
txStatus.notify(btx, cb);
});
} else {
txStatus.notify(signedTx);
$scope.$emit('Local/TxProposalAction');
return cb();
txStatus.notify(signedTx, cb);
}
});
};