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

Merge pull request #3234 from javierbitpay/fix/time-history

Browse source 
fix time message in proposal transaction
This commit is contained in:
Matias Alejo Garcia 2015-09-25 23:40:11 -03:00
commit 6276de1c09
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -484,10 +484,16 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setPendingTxps = function(txps) { self.setPendingTxps = function(txps) {
self.pendingTxProposalsCountForUs = 0; self.pendingTxProposalsCountForUs = 0;
var now = Math.floor(Date.now() / 1000);
lodash.each(txps, function(tx) { lodash.each(txps, function(tx) {
tx = txFormatService.processTx(tx); tx = txFormatService.processTx(tx);
// no future transactions...
if (tx.createdOn > now)
tx.createdOn = now;
var action = lodash.find(tx.actions, { var action = lodash.find(tx.actions, {
copayerId: self.copayerId copayerId: self.copayerId
}); });
@ -1158,4 +1164,4 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setFocusedWallet(); self.setFocusedWallet();
}); });
}); });
}); });