From ccdad2c6e44d84430cd913e90575f7bbb2bb0793 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 4 Nov 2016 13:29:19 -0400 Subject: [PATCH] hide border for last tx in group --- src/js/controllers/walletDetails.js | 9 ++++++++- src/sass/views/walletDetails.scss | 4 ++++ www/views/walletDetails.html | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 64c5b2c35..a8ecb9087 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -157,7 +157,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun return date; }; - $scope.showGroupHeader = function(index) { + $scope.isFirstInGroup = function(index) { if(index === 0) { return true; } @@ -166,6 +166,13 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun return !createdDuringSameMonth(curTx, prevTx); }; + $scope.isLastInGroup = function(index) { + if(index === $scope.txHistory.length - 1) { + return true; + } + return $scope.isFirstInGroup(index + 1); + }; + function createdDuringSameMonth(tx1, tx2) { var date1 = new Date(tx1.time * 1000); var date2 = new Date(tx2.time * 1000); diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index f5bf701fc..9ef5291d7 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -61,6 +61,10 @@ padding-right: 1rem; border-bottom: 1px solid rgb(245, 245, 245); overflow: hidden; + + &.no-border { + border: 0; + } } &__tx-amount { diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index a93092a32..879544e13 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -180,7 +180,7 @@
-
+
Recent @@ -197,7 +197,7 @@ -
+