From 880e3ebe141f8fd0452141487ba43b5ab512aff4 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Wed, 14 Dec 2016 13:24:02 -0300
Subject: [PATCH 1/2] use contact name in proposal card

---
 src/js/controllers/proposals.js | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/js/controllers/proposals.js b/src/js/controllers/proposals.js
index 2fa6193a0..03d8492c9 100644
--- a/src/js/controllers/proposals.js
+++ b/src/js/controllers/proposals.js
@@ -1,22 +1,26 @@
-
 '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();
+          });
+        });
       });
     });
 

From faab393dc06cf846781363999be2106d82a645e0 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Wed, 14 Dec 2016 15:18:52 -0300
Subject: [PATCH 2/2] fix time format

---
 src/js/controllers/proposals.js | 6 ++++++
 src/js/controllers/tab-home.js  | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/js/controllers/proposals.js b/src/js/controllers/proposals.js
index 03d8492c9..1e0e65030 100644
--- a/src/js/controllers/proposals.js
+++ b/src/js/controllers/proposals.js
@@ -25,4 +25,10 @@ angular.module('copayApp.controllers').controller('proposalsController',
     });
 
     $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 d520ef88e..3550703ca 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;