From 19554b94b6cd77ae4688cc1599b6071c04555066 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 2 Nov 2016 17:01:32 -0400 Subject: [PATCH] mark the current month as recent --- src/js/controllers/walletDetails.js | 16 ++++++++++++---- www/views/walletDetails.html | 9 ++++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index af297c720..bb2506ff4 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -153,7 +153,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }; $scope.getDate = function(txCreated) { - return new Date(txCreated * 1000); + var date = new Date(txCreated * 1000); + return date; }; $scope.showGroupHeader = function(index) { @@ -168,9 +169,16 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun function createdDuringSameMonth(tx1, tx2) { var date1 = new Date(tx1.time * 1000); var date2 = new Date(tx2.time * 1000); - var date1MonthYear = date1.getMonth() + date1.getFullYear(); - var date2MonthYear = date2.getMonth() + date2.getFullYear(); - return date1MonthYear === date2MonthYear; + return getMonthYear(date1) === getMonthYear(date2); + } + + $scope.isDateInCurrentMonth = function(date) { + var now = new Date(); + return getMonthYear(now) === getMonthYear(date); + }; + + function getMonthYear(date) { + return date.getMonth() + date.getFullYear(); } $scope.showMore = function() { diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 1b8530518..278e10c68 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -176,7 +176,14 @@
-
{{getDate(btx.time) | date:'MMMM'}}
+
+ + Recent + + + {{getDate(btx.time) | date:'MMMM'}} + +