@zeniai/client-epic-state 5.0.12-betaVR1 → 5.0.12

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/fetchCompletedTransactionsEpic.js

@@ -30,15 +30,11 @@ export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => act
     const queryPayload = {
         start_date: period.start,
         end_date: period.end,
+        sort_by: sortKey,
+        sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
         page_token: action.payload.pageToken ?? null,
         page_size: 25,
     };
-    if (sortKey != null) {
-        queryPayload.sort_by = sortKey;
-    }
-    if (sortOrder != null) {
-        queryPayload.sort_order = sortOrder === 'ascending' ? 'asc' : 'desc';
-    }
     if (completedSubTab !== 'all') {
         queryPayload.match_type = completedSubTab;
     }

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/searchTransactionsForManualMatchEpic.js

@@ -32,17 +32,12 @@ export const searchTransactionsForManualMatchEpic = (actions$, state$, zeniAPI)
         const state = state$.value;
         const { expenseAutomationMissingReceiptsViewState: { bulkUpload: { manualSearch, sortKey, sortOrder }, }, } = state;
         const { end, start } = rollingCalendarDateRangeInclusive(MANUAL_SEARCH_TRANSACTION_DATE_RANGE_DAYS);
-        // Manual search is independent of the Completed tab's optional sort: when the
-        // bulk upload sort is neutral (no user-applied sort), fall back to date/desc so
-        // search results stay deterministic for the matching UX.
-        const manualSearchSortKey = sortKey ?? 'date';
-        const manualSearchSortOrder = sortOrder ?? 'descending';
         const queryParam = {
             start_date: start,
             end_date: end,
             auto_categorized: MANUAL_TRANSACTION_SEARCH_AUTO_CATEGORIZED,
-            sort_by: toTransactionsSortKey(manualSearchSortKey),
-            sort_order: manualSearchSortOrder === 'ascending' ? 'asc' : 'desc',
+            sort_by: toTransactionsSortKey(sortKey),
+            sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
             page_token: pageToken ?? null,
             page_size: manualSearch.pageSize,
             search_text: query,

package/lib/esm/view/expenseAutomationView/reducers/missingReceiptsViewReducer.js

@@ -1,11 +1,7 @@
 import { createAction, createSlice } from '@reduxjs/toolkit';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { MIN_MANUAL_TRANSACTION_SEARCH_LENGTH, } from '../types/missingReceiptsViewState';
-export const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, subTab) => {
-    const sortKeyPart = sortKey ?? 'none';
-    const sortOrderPart = sortOrder == null ? 'none' : sortOrder === 'ascending' ? 'asc' : 'desc';
-    return `completed-${subTab}-${sortKeyPart}-${sortOrderPart}-${periodId}`;
-};
+export const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, subTab) => `completed-${subTab}-${sortKey}-${sortOrder === 'ascending' ? 'asc' : 'desc'}-${periodId}`;
 export const initialBulkUploadState = {
     batchDetailsById: {},
     batchDetailsPaginationState: { fetchState: 'Not-Started', error: undefined },
@@ -29,8 +25,8 @@ export const initialBulkUploadState = {
         totalCount: 0,
     },
     phase: 'idle',
-    sortKey: undefined,
-    sortOrder: undefined,
+    sortKey: 'date',
+    sortOrder: 'descending',
     uploadedFileCount: 0,
     uploadProgress: 0,
     uploadStatus: { fetchState: 'Not-Started', error: undefined },