diff --git a/src/app/core/services/personal-cards.service.spec.ts b/src/app/core/services/personal-cards.service.spec.ts index 3ffe42f79f..050fcf4141 100644 --- a/src/app/core/services/personal-cards.service.spec.ts +++ b/src/app/core/services/personal-cards.service.spec.ts @@ -139,6 +139,7 @@ describe('PersonalCardsService', () => { limit: platformTxnsConfig.limit, offset: platformTxnsConfig.offset, ...platformTxnsConfig.queryParams, + order: 'spent_at.desc,id.desc', }, }); done(); diff --git a/src/app/core/services/personal-cards.service.ts b/src/app/core/services/personal-cards.service.ts index 4acda66dd4..fa60bc9156 100644 --- a/src/app/core/services/personal-cards.service.ts +++ b/src/app/core/services/personal-cards.service.ts @@ -142,6 +142,7 @@ export class PersonalCardsService { limit: config.limit, offset: config.offset, ...config.queryParams, + order: 'spent_at.desc,id.desc', }, }) .pipe( diff --git a/src/app/fyle/add-edit-expense/add-edit-expense-4.spec.ts b/src/app/fyle/add-edit-expense/add-edit-expense-4.spec.ts index 361961ba06..7507ca75ea 100644 --- a/src/app/fyle/add-edit-expense/add-edit-expense-4.spec.ts +++ b/src/app/fyle/add-edit-expense/add-edit-expense-4.spec.ts @@ -641,7 +641,9 @@ export function TestCases4(getTestBed) { 'success', ['msb-success'] ); - expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'personal_cards']); + expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'personal_cards'], { + queryParams: { refresh: true }, + }); expect(trackingService.newExpenseCreatedFromPersonalCard).toHaveBeenCalledOnceWith(); }); @@ -695,7 +697,9 @@ export function TestCases4(getTestBed) { 'success', ['msb-success'] ); - expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'personal_cards']); + expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'personal_cards'], { + queryParams: { refresh: true }, + }); expect(trackingService.newExpenseCreatedFromPersonalCard).toHaveBeenCalledOnceWith(); }); @@ -751,7 +755,9 @@ export function TestCases4(getTestBed) { 'success', ['msb-success'] ); - expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'personal_cards']); + expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'personal_cards'], { + queryParams: { refresh: true }, + }); expect(trackingService.newExpenseCreatedFromPersonalCard).toHaveBeenCalledOnceWith(); }); @@ -798,7 +804,9 @@ export function TestCases4(getTestBed) { 'success', ['msb-success'] ); - expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'personal_cards']); + expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'personal_cards'], { + queryParams: { refresh: true }, + }); expect(trackingService.newExpenseCreatedFromPersonalCard).toHaveBeenCalledOnceWith(); }); @@ -845,7 +853,9 @@ export function TestCases4(getTestBed) { 'success', ['msb-success'] ); - expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'personal_cards']); + expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'personal_cards'], { + queryParams: { refresh: true }, + }); expect(trackingService.newExpenseCreatedFromPersonalCard).toHaveBeenCalledOnceWith(); }); }); diff --git a/src/app/fyle/add-edit-expense/add-edit-expense.page.ts b/src/app/fyle/add-edit-expense/add-edit-expense.page.ts index b7efac3e5d..26cf084052 100644 --- a/src/app/fyle/add-edit-expense/add-edit-expense.page.ts +++ b/src/app/fyle/add-edit-expense/add-edit-expense.page.ts @@ -5088,7 +5088,7 @@ export class AddEditExpensePage implements OnInit { ) .subscribe(() => { this.showSnackBarToast({ message: 'Expense created successfully.' }, 'success', ['msb-success']); - this.router.navigate(['/', 'enterprise', 'personal_cards']); + this.router.navigate(['/', 'enterprise', 'personal_cards'], { queryParams: { refresh: true } }); this.trackingService.newExpenseCreatedFromPersonalCard(); }); } diff --git a/src/app/fyle/personal-cards-matched-expenses/expense-preview/expense-preview.component.spec.ts b/src/app/fyle/personal-cards-matched-expenses/expense-preview/expense-preview.component.spec.ts index 090446d690..d5334805e4 100644 --- a/src/app/fyle/personal-cards-matched-expenses/expense-preview/expense-preview.component.spec.ts +++ b/src/app/fyle/personal-cards-matched-expenses/expense-preview/expense-preview.component.spec.ts @@ -128,7 +128,9 @@ describe('ExpensePreviewComponent', () => { expect(personalCardsService.matchExpense).toHaveBeenCalledWith('testExpenseId', 'testCardTxnId'); expect(modalController.dismiss).toHaveBeenCalledTimes(1); - expect(router.navigate).toHaveBeenCalledWith(['/', 'enterprise', 'personal_cards']); + expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'personal_cards'], { + queryParams: { refresh: true }, + }); expect(trackingService.oldExpensematchedFromPersonalCard).toHaveBeenCalledTimes(1); }); }); diff --git a/src/app/fyle/personal-cards-matched-expenses/expense-preview/expense-preview.component.ts b/src/app/fyle/personal-cards-matched-expenses/expense-preview/expense-preview.component.ts index 750d9c62b4..68483a5980 100644 --- a/src/app/fyle/personal-cards-matched-expenses/expense-preview/expense-preview.component.ts +++ b/src/app/fyle/personal-cards-matched-expenses/expense-preview/expense-preview.component.ts @@ -69,7 +69,7 @@ export class ExpensePreviewComponent implements OnInit { ...this.snackbarProperties.setSnackbarProperties('success', { message: 'Successfully matched the expense.' }), panelClass: ['msb-success'], }); - this.router.navigate(['/', 'enterprise', 'personal_cards']); + this.router.navigate(['/', 'enterprise', 'personal_cards'], { queryParams: { refresh: true } }); this.trackingService.oldExpensematchedFromPersonalCard(); }); } diff --git a/src/app/fyle/personal-cards/personal-cards.page.html b/src/app/fyle/personal-cards/personal-cards.page.html index 1b56ab8eeb..bc1032da2b 100644 --- a/src/app/fyle/personal-cards/personal-cards.page.html +++ b/src/app/fyle/personal-cards/personal-cards.page.html @@ -193,7 +193,7 @@ (click)="createExpense(transaction)" *ngIf="!isTransactionsLoading" [transaction]="transaction" - [previousTxnDate]="transactions[i-1]?.btxn_transaction_dt" + [previousTxnDate]="transactions[i-1]?.spent_at" [isMatchedCountLoading]="transaction.id === loadingTxnId" [status]="selectedTransactionType" [isSelectionModeEnabled]="selectionMode" diff --git a/src/app/fyle/personal-cards/personal-cards.page.spec.ts b/src/app/fyle/personal-cards/personal-cards.page.spec.ts index 0427768648..646ee250ac 100644 --- a/src/app/fyle/personal-cards/personal-cards.page.spec.ts +++ b/src/app/fyle/personal-cards/personal-cards.page.spec.ts @@ -790,9 +790,7 @@ describe('PersonalCardsPage', () => { modalController.create.and.resolveTo(modalSpy); personalCardsService.generateDateParams.and.returnValue({ queryParams: { - or: [ - '(and(btxn_transaction_dt.gte.2023-02-28T18:30:00.000Z,btxn_transaction_dt.lt.2023-03-31T18:29:00.000Z))', - ], + or: ['(and(spent_at.gte.2023-02-28T18:30:00.000Z,spent_at.lt.2023-03-31T18:29:00.000Z))'], state: 'in.(INITIALIZED)', personal_card_id: 'eq.baccLesaRlyvLY', }, diff --git a/src/app/fyle/personal-cards/personal-cards.page.ts b/src/app/fyle/personal-cards/personal-cards.page.ts index a7adc2e357..17bca5cc8e 100644 --- a/src/app/fyle/personal-cards/personal-cards.page.ts +++ b/src/app/fyle/personal-cards/personal-cards.page.ts @@ -170,6 +170,17 @@ export class PersonalCardsPage implements OnInit, AfterViewInit { } } + ionViewWillEnter(): void { + this.activatedRoute.queryParams.subscribe((params) => { + if (params?.refresh) { + const currentParams = this.loadData$.getValue(); + this.currentPageNumber = 1; + currentParams.pageNumber = this.currentPageNumber; + this.loadData$.next(currentParams); + } + }); + } + loadLinkedAccounts(): void { this.linkedAccounts$ = this.loadCardData$.pipe( tap(() => (this.isLoading = true)),