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

Merge pull request #3380 from gabrielbazan7/fix/txHistory

Browse source 
undefined in localtxs array
This commit is contained in:
Matias Alejo Garcia 2015-11-02 10:56:28 -03:00
commit 46812b7eef
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/walletHome.html
View file

@ -459,7 +459,7 @@
</div> </div>
<div class="row m20t text-center" ng-show="index.updatingTxHistory"> <div class="row m20t text-center" ng-show="index.updatingTxHistory">
<div class="columns large-12 medium-12 small-12"> <div class="columns large-12 medium-12 small-12">
<div class="spinner" ng-if="index.updatingTxHistory"> <div class="spinner">
<div class="rect1"></div> <div class="rect1"></div>
<div class="rect2"></div> <div class="rect2"></div>
<div class="rect3"></div> <div class="rect3"></div>

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

@ -768,8 +768,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
} catch (ex) { } catch (ex) {
$log.warn(ex); $log.warn(ex);
} }
return cb(null, lodash.compact(self.removeSoftConfirmedTx(localTxs)));
return cb(null, self.removeSoftConfirmedTx(localTxs));
}); });
} }
@ -1019,7 +1018,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
return; return;
} }
self.addressbook = ab; self.addressbook = ab;
}); });
}; };
$rootScope.$on('Local/ClearHistory', function(event) { $rootScope.$on('Local/ClearHistory', function(event) {