diff --git a/src/js/controllers/proposals.js b/src/js/controllers/proposals.js index 2fa6193a0..1e0e65030 100644 --- a/src/js/controllers/proposals.js +++ b/src/js/controllers/proposals.js @@ -1,24 +1,34 @@ - 'use strict'; angular.module('copayApp.controllers').controller('proposalsController', - function($timeout, $scope, profileService, $log, txpModalService) { + function($timeout, $scope, profileService, $log, txpModalService, addressbookService) { $scope.fetchingProposals = true; - $scope.$on("$ionicView.enter", function(event, data){ - profileService.getTxps(50, function(err, txps) { - $scope.fetchingProposals = false; - if (err) { - $log.error(err); - return; - } - $scope.txps = txps; - $timeout(function() { - $scope.$apply(); - }, 1); + $scope.$on("$ionicView.enter", function(event, data) { + addressbookService.list(function(err, ab) { + if (err) $log.error(err); + $scope.addressbook = ab || {}; + + profileService.getTxps(50, function(err, txps) { + $scope.fetchingProposals = false; + if (err) { + $log.error(err); + return; + } + $scope.txps = txps; + $timeout(function() { + $scope.$apply(); + }); + }); }); }); $scope.openTxpModal = txpModalService.open; + + $scope.createdWithinPastDay = function(time) { + var now = new Date(); + var date = new Date(time * 1000); + return (now.getTime() - date.getTime()) < (1000 * 60 * 60 * 24); + }; }); diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index a2ca1950d..195ac752b 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -126,6 +126,12 @@ angular.module('copayApp.controllers').controller('tabHomeController', }); }); + $scope.createdWithinPastDay = function(time) { + var now = new Date(); + var date = new Date(time * 1000); + return (now.getTime() - date.getTime()) < (1000 * 60 * 60 * 24); + }; + $scope.openExternalLink = function() { var url = 'https://github.com/bitpay/copay/releases/latest'; var optIn = true;