From 15c40c785c774affd942a0f193dcb86b3ba4b591 Mon Sep 17 00:00:00 2001
From: francisguchie <francisguchie@gmail.com>
Date: Fri, 11 Dec 2020 15:51:42 +0000
Subject: [PATCH] undoing fix #3196

---
 app/scripts/filters/DateFormat.js                  | 10 +++++++---
 app/views/savings/view_saving_account_details.html |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/scripts/filters/DateFormat.js b/app/scripts/filters/DateFormat.js
index 6876b965..269307e5 100644
--- a/app/scripts/filters/DateFormat.js
+++ b/app/scripts/filters/DateFormat.js
@@ -3,9 +3,13 @@
         DateFormat: function (dateFilter, localStorageService) {
             return function (input) {
                 if (input) {
-                    // SAFARI is Bad We fix it
-                    remove = input.toString().split(",");
-                    var tDate = new Date(remove[0], remove[1]-1, remove[2]);
+                    // SAFARI is Bad We fix it Issue #3196
+                    // This fix affected transaction
+                    //remove = input.toString().split(",");
+                    //var tDate = new Date(remove[0], remove[1]-1, remove[2]);
+                    //return dateFilter(tDate, localStorageService.getFromLocalStorage('dateformat'));
+
+                    var tDate = new Date(input);
                     return dateFilter(tDate, localStorageService.getFromLocalStorage('dateformat'));
                 }
                 return '';
diff --git a/app/views/savings/view_saving_account_details.html b/app/views/savings/view_saving_account_details.html
index aba30874..65c35b68 100755
--- a/app/views/savings/view_saving_account_details.html
+++ b/app/views/savings/view_saving_account_details.html
@@ -467,7 +467,7 @@
                             </thead>
                             <tbody>
                             <tr class="pointer-main" ng-hide="transaction.reversed"
-                                ng-repeat="transaction in savingaccountdetails.transactions | orderBy:transactionSort.column:transactionSort.descending">
+                                ng-repeat="transaction in savingaccountdetails.transactions | orderBy:transactionSort.column[2]:transactionSort.ascending">
                                 <td class="pointer"
                                     data-ng-click="routeTo(transaction.accountId,transaction.id,transaction.transfer,transaction.transfer.id)">
                                     {{transaction.id}}