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

fix received

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-09-09 15:40:12 -03:00
commit 255affe382
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.html
View file

@ -15,7 +15,7 @@
<div class="inner-wrap"> <div class="inner-wrap">
<span class="status" ng-if="$root.reconnecting"> <span class="status" ng-if="$root.reconnecting">
<i class="fi-loop icon-rotate m15r"></i> <i class="fi-loop icon-rotate m15r"></i>
Attempting to reconnect... <span translate> Network Error. Attempting to reconnect...</span>
</span> </span>
<nav class="tab-bar" ng-class="{'hide-tab-bar' : !$root.wallet || <nav class="tab-bar" ng-class="{'hide-tab-bar' : !$root.wallet ||
!$root.wallet.isReady() || $root.wallet.isLocked}"> !$root.wallet.isReady() || $root.wallet.isLocked}">

1
js/models/core/Wallet.js
View file

@ -653,6 +653,7 @@ Wallet.prototype._setBlockchainListeners = function() {
this.blockchain.on('disconnect', self.emit.bind(self,'networkError')); this.blockchain.on('disconnect', self.emit.bind(self,'networkError'));
this.blockchain.on('tx', function(tx) { this.blockchain.on('tx', function(tx) {
console.log('[Wallet.js.655:tx:]',tx); //TODO
self.emit('tx', tx.address); self.emit('tx', tx.address);
}); });

4
js/services/controllerUtils.js
View file

@ -70,8 +70,8 @@ angular.module('copayApp.services')
} }
}); });
w.on('tx', function() { w.on('tx', function(address) {
notification.funds('Funds received!', tx.address); notification.funds('Funds received!', address);
root.updateBalance(function() { root.updateBalance(function() {
$rootScope.$digest(); $rootScope.$digest();
}); });