From 41b41db52a6c611a04f283f4e9336975770c0a96 Mon Sep 17 00:00:00 2001
From: jayfyle <115472256+jayfyle@users.noreply.github.com>
Date: Wed, 17 Jan 2024 19:07:04 +0530
Subject: [PATCH] fixing custom date filter (#2675)

Co-authored-by: Jay Budhadev <jaybudhadev@Jays-MacBook-Air.local>
---
 .../my-expenses-v2/my-expenses.service.ts     | 10 ++++----
 .../fyle/my-expenses/my-expenses.service.ts   | 23 ++++++++-----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/app/fyle/my-expenses-v2/my-expenses.service.ts b/src/app/fyle/my-expenses-v2/my-expenses.service.ts
index e8a2c7db41..c9a07c6be7 100644
--- a/src/app/fyle/my-expenses-v2/my-expenses.service.ts
+++ b/src/app/fyle/my-expenses-v2/my-expenses.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { cloneDeep } from 'lodash';
 import * as dayjs from 'dayjs';
 import { FilterPill } from 'src/app/shared/components/fy-filter-pills/filter-pill.interface';
 import { DateFilters } from 'src/app/shared/components/fy-filters/date-filters.enum';
@@ -167,31 +166,30 @@ export class MyExpensesService {
   }
 
   generateCustomDatePill(filter: Partial<ExpenseFilters>, filterPills: FilterPill[]): FilterPill[] {
-    const filterPillsCopy = cloneDeep(filterPills);
     const startDate = filter.customDateStart && dayjs(filter.customDateStart).format('YYYY-MM-D');
     const endDate = filter.customDateEnd && dayjs(filter.customDateEnd).format('YYYY-MM-D');
 
     if (startDate && endDate) {
-      filterPillsCopy.push({
+      filterPills.push({
         label: 'Date',
         type: 'date',
         value: `${startDate} to ${endDate}`,
       });
     } else if (startDate) {
-      filterPillsCopy.push({
+      filterPills.push({
         label: 'Date',
         type: 'date',
         value: `>= ${startDate}`,
       });
     } else if (endDate) {
-      filterPillsCopy.push({
+      filterPills.push({
         label: 'Date',
         type: 'date',
         value: `<= ${endDate}`,
       });
     }
 
-    return filterPillsCopy;
+    return filterPills;
   }
 
   generateReceiptsAttachedFilterPills(filterPills: FilterPill[], filter: Partial<ExpenseFilters>): void {
diff --git a/src/app/fyle/my-expenses/my-expenses.service.ts b/src/app/fyle/my-expenses/my-expenses.service.ts
index 0ee53c6697..c01acbd94e 100644
--- a/src/app/fyle/my-expenses/my-expenses.service.ts
+++ b/src/app/fyle/my-expenses/my-expenses.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { cloneDeep } from 'lodash';
 import * as dayjs from 'dayjs';
 import { FilterPill } from 'src/app/shared/components/fy-filter-pills/filter-pill.interface';
 import { DateFilters } from 'src/app/shared/components/fy-filters/date-filters.enum';
@@ -123,9 +122,8 @@ export class MyExpensesService {
   }
 
   generateDateFilterPills(filter: Partial<ExpenseFilters>, filterPills: FilterPill[]): FilterPill[] {
-    let filterPillsCopy = cloneDeep(filterPills);
     if (filter.date === DateFilters.thisWeek) {
-      filterPillsCopy.push({
+      filterPills.push({
         label: 'Date',
         type: 'date',
         value: 'this Week',
@@ -133,7 +131,7 @@ export class MyExpensesService {
     }
 
     if (filter.date === DateFilters.thisMonth) {
-      filterPillsCopy.push({
+      filterPills.push({
         label: 'Date',
         type: 'date',
         value: 'this Month',
@@ -141,7 +139,7 @@ export class MyExpensesService {
     }
 
     if (filter.date === DateFilters.all) {
-      filterPillsCopy.push({
+      filterPills.push({
         label: 'Date',
         type: 'date',
         value: 'All',
@@ -149,7 +147,7 @@ export class MyExpensesService {
     }
 
     if (filter.date === DateFilters.lastMonth) {
-      filterPillsCopy.push({
+      filterPills.push({
         label: 'Date',
         type: 'date',
         value: 'Last Month',
@@ -157,38 +155,37 @@ export class MyExpensesService {
     }
 
     if (filter.date === DateFilters.custom) {
-      filterPillsCopy = this.generateCustomDatePill(filter, filterPillsCopy);
+      filterPills = this.generateCustomDatePill(filter, filterPills);
     }
 
-    return filterPillsCopy;
+    return filterPills;
   }
 
   generateCustomDatePill(filter: Partial<ExpenseFilters>, filterPills: FilterPill[]): FilterPill[] {
-    const filterPillsCopy = cloneDeep(filterPills);
     const startDate = filter.customDateStart && dayjs(filter.customDateStart).format('YYYY-MM-D');
     const endDate = filter.customDateEnd && dayjs(filter.customDateEnd).format('YYYY-MM-D');
 
     if (startDate && endDate) {
-      filterPillsCopy.push({
+      filterPills.push({
         label: 'Date',
         type: 'date',
         value: `${startDate} to ${endDate}`,
       });
     } else if (startDate) {
-      filterPillsCopy.push({
+      filterPills.push({
         label: 'Date',
         type: 'date',
         value: `>= ${startDate}`,
       });
     } else if (endDate) {
-      filterPillsCopy.push({
+      filterPills.push({
         label: 'Date',
         type: 'date',
         value: `<= ${endDate}`,
       });
     }
 
-    return filterPillsCopy;
+    return filterPills;
   }
 
   generateReceiptsAttachedFilterPills(filterPills: FilterPill[], filter: Partial<ExpenseFilters>): void {