feat: removed old my-expenses page (deprecation) - Part 4 (#2817)

* feat: removed old my-expenses page (deprecation) - Part 4 * fix: correction in card filters logic (#2818)
fylein · Mar 11, 2024 · b93bf88 · b93bf88
1 parent 8f6d6a5
commit b93bf88
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/src/app/core/services/platform/v1/shared/expenses.service.spec.ts b/src/app/core/services/platform/v1/shared/expenses.service.spec.ts
@@ -9,7 +9,7 @@ import { PaymentModeSummary } from 'src/app/core/models/payment-mode-summary.mod
 import { AccountType } from 'src/app/core/models/platform/v1/account.model';
 import { Expense } from 'src/app/core/models/platform/v1/expense.model';
 import { GetExpenseQueryParam } from 'src/app/core/models/platform/v1/get-expenses-query.model';
-import { ExpenseFilters } from 'src/app/fyle/my-expenses/expense-filters.model';
+import { ExpenseFilters } from 'src/app/fyle/my-expenses/my-expenses-filters.model';
 import { DateFilters } from 'src/app/shared/components/fy-filters/date-filters.enum';
 import { DateService } from '../../../date.service';
 

diff --git a/src/app/core/services/platform/v1/shared/expenses.service.ts b/src/app/core/services/platform/v1/shared/expenses.service.ts
@@ -200,11 +200,8 @@ export class ExpensesService {
   ): Record<string, string | string[] | boolean> {
     const newQueryParamsCopy = cloneDeep(newQueryParams);
     if (filters.cardNumbers?.length > 0) {
-      let cardNumberString = '';
-      cardNumberString = filters.cardNumbers.join(',');
-      cardNumberString = cardNumberString.slice(0, cardNumberString.length);
-      newQueryParamsCopy['matched_corporate_card_transactions->0->corporate_card_number'] =
-        'in.(' + cardNumberString + ')';
+      const cardNumberString = filters.cardNumbers.map((cardNumber) => `"${cardNumber}"`).join(',');
+      newQueryParamsCopy['matched_corporate_card_transactions->0->corporate_card_number'] = `in.(${cardNumberString})`;
     }
 
     return newQueryParamsCopy;

diff --git a/src/app/shared/components/spent-cards/card-detail/card-detail.component.spec.ts b/src/app/shared/components/spent-cards/card-detail/card-detail.component.spec.ts
@@ -75,13 +75,6 @@ describe('CardDetailComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('ngOnInit():should set redirection flag', () => {
-    orgSettingService.get.and.returnValue(of(orgSettingsWithV2ExpensesPage));
-
-    expect(component.redirectToNewPage).toBeTrue();
-    expect(orgSettingService.get).toHaveBeenCalledTimes(1);
-  });
-
   it('should display the card correctly', () => {
     const card = fixture.debugElement.query(By.directive(MockCorporateCardComponent));
     expect(card).toBeTruthy();