@zeniai/client-epic-state 4.19.89 → 4.19.90-beta0AD

package/lib/view/expenseAutomationView/selectors/missingReceiptsSelector.js

@@ -8,7 +8,10 @@ const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
+const missingReceiptsPayload_1 = require("../payload/missingReceiptsPayload");
+const missingReceiptsViewReducer_1 = require("../reducers/missingReceiptsViewReducer");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
+const missingReceiptsViewState_1 = require("../types/missingReceiptsViewState");
 function getExpenseAutomationMissingReceiptsView(state) {
     const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
@@ -53,6 +56,131 @@ function getExpenseAutomationMissingReceiptsView(state) {
     const completionStatus = missingReceiptsCompletionStatus != null
         ? missingReceiptsCompletionStatus
         : 'incomplete';
+    const { bulkUpload, pendingMissingReceiptsTabNavigation } = expenseAutomationMissingReceiptsViewState;
+    const currentBatchStatus = bulkUpload.currentBatchId != null
+        ? bulkUpload.batchStatusById[bulkUpload.currentBatchId]
+        : undefined;
+    const batchList = monthYearPeriodId != null
+        ? (bulkUpload.batchListByPeriod[monthYearPeriodId] ?? [])
+        : [];
+    /**
+     * Primary "Unmatched" batch = first completed batch in platform list order, preferring the
+     * first batch that still has possible_matches/no_match work when any completed batch has such work.
+     * Batches without details yet: wait if the list row still reports unmatched work; otherwise skip
+     * so we do not block the whole tab while other rows are not fetched yet.
+     */
+    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchList, bulkUpload.batchDetailsById, bulkUpload.failedBatchDetailIds);
+    /**
+     * During upload/matching, prefer `currentBatchId` only when its batch details are loaded,
+     * completed, and still have unmatched-tab work. Otherwise keep `primaryBatchIdFromDetailsOrder`.
+     *
+     * If we pinned to `currentBatchId` as soon as it was absent from the batch list (in-flight
+     * upload), details are often not loaded yet — `unmatchedFiles` would empty while older batches
+     * moved to "past", so the primary "Unmatched Receipts" section vanished during auto-matching.
+     */
+    const unmatchedSectionBatchId = (() => {
+        const phase = bulkUpload.phase;
+        if (phase !== 'matching' && phase !== 'uploading') {
+            return primaryBatchIdFromDetailsOrder;
+        }
+        const currentId = bulkUpload.currentBatchId;
+        if (currentId == null) {
+            return primaryBatchIdFromDetailsOrder;
+        }
+        const currentDetails = bulkUpload.batchDetailsById[currentId];
+        if (currentDetails != null &&
+            currentDetails.status === 'completed' &&
+            batchDetailsHasUnmatchedWork(currentDetails)) {
+            return currentId;
+        }
+        return primaryBatchIdFromDetailsOrder;
+    })();
+    const completedBatchesInApiOrder = batchList.filter((batchListItem) => (0, missingReceiptsPayload_1.isBatchListStatusCompleted)(batchListItem.status));
+    const currentBatchDetails = unmatchedSectionBatchId != null
+        ? bulkUpload.batchDetailsById[unmatchedSectionBatchId]
+        : undefined;
+    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, currentBatchDetails.batchId, transactionState));
+    const failedIds = new Set(bulkUpload.failedBatchDetailIds);
+    const hasMoreBatchDetails = completedBatchesInApiOrder.some((batchListItem) => bulkUpload.batchDetailsById[batchListItem.batchId] == null &&
+        !failedIds.has(batchListItem.batchId));
+    const getSortValue = (file) => {
+        const matchedTransaction = file.matchedTransaction;
+        if (matchedTransaction == null) {
+            return null;
+        }
+        switch (bulkUpload.sortKey) {
+            case 'vendor':
+                return ((matchedTransaction.vendorName ?? matchedTransaction.description)?.toLowerCase() ?? null);
+            case 'category': {
+                const line = matchedTransaction.lines?.[0];
+                return line?.account?.accountName?.toLowerCase() ?? null;
+            }
+            case 'class': {
+                const line = matchedTransaction.lines?.[0];
+                return line?.class?.className?.toLowerCase() ?? null;
+            }
+            case 'date':
+                return matchedTransaction.date.valueOf();
+            case 'amount':
+                return matchedTransaction.amount.amount;
+            default:
+                return null;
+        }
+    };
+    const bulkUploadSortDirection = bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc';
+    const matchedFiles = (0, orderBy_1.default)(resolvedFiles?.filter((resolvedFile) => resolvedFile.status === 'exact_match') ?? [], getSortValue, bulkUploadSortDirection);
+    const unmatchedFiles = (0, orderBy_1.default)(resolvedFiles?.filter((resolvedFile) => (0, missingReceiptsViewState_1.isUnmatchedTabFileStatus)(resolvedFile.status)) ?? [], getSortValue, bulkUploadSortDirection);
+    const progress = currentBatchStatus != null
+        ? {
+            ...currentBatchStatus.progress,
+            percentage: currentBatchStatus.progress.total > 0
+                ? Math.round((currentBatchStatus.progress.processed /
+                    currentBatchStatus.progress.total) *
+                    100)
+                : 0,
+        }
+        : { total: 0, processed: 0, percentage: 0 };
+    const batchListFetchState = bulkUpload.batchListFetchState;
+    /**
+     * When primary batch is not resolved yet, still aggregate unmatched files from every batch
+     * that has details loaded (otherwise past is empty and receipts vanish from the UI).
+     */
+    const pastBatches = unmatchedSectionBatchId != null
+        ? batchList.filter((batchListItem) => batchListItem.batchId !== unmatchedSectionBatchId)
+        : batchList;
+    const pastUnmatchedFiles = pastBatches.flatMap((pastBatch) => {
+        const details = bulkUpload.batchDetailsById[pastBatch.batchId];
+        if (details == null) {
+            return [];
+        }
+        return details.files
+            .filter((batchFile) => (0, missingReceiptsViewState_1.isUnmatchedTabFileStatus)(batchFile.status))
+            .map((batchFile) => resolveBatchFile(batchFile, pastBatch.batchId, transactionState));
+    });
+    const completedTransactionsCacheKey = monthYearPeriodId != null
+        ? (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(monthYearPeriodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab)
+        : undefined;
+    const completedTransactionsForPeriod = completedTransactionsCacheKey != null
+        ? bulkUpload.completedTransactionsByPeriod[completedTransactionsCacheKey]
+        : undefined;
+    const completedTransactionIds = completedTransactionsForPeriod?.transactionIds ?? [];
+    const resolvedCompletedTransactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, completedTransactionIds);
+    const resolvedBatchDetails = currentBatchDetails != null && resolvedFiles != null
+        ? {
+            batchId: currentBatchDetails.batchId,
+            createdAt: currentBatchDetails.createdAt,
+            files: resolvedFiles,
+            status: currentBatchDetails.status,
+            summary: currentBatchDetails.summary,
+        }
+        : undefined;
+    const manualSearchResults = bulkUpload.manualSearch.results.map((result) => {
+        const transaction = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, result.transactionId);
+        return {
+            ...result,
+            vendorLogo: result.vendorLogo ?? transaction?.logo?.href,
+        };
+    });
     return {
         fetchState,
         error,
@@ -61,5 +189,120 @@ function getExpenseAutomationMissingReceiptsView(state) {
         refreshStatus,
         transactions: sortedTransactions,
         completionStatus,
+        pendingMissingReceiptsTabNavigation: pendingMissingReceiptsTabNavigation ?? null,
+        bulkUpload: {
+            phase: bulkUpload.phase,
+            uploadStatus: bulkUpload.uploadStatus,
+            batchStatus: currentBatchStatus,
+            batchDetails: resolvedBatchDetails,
+            completedSubTab: bulkUpload.completedSubTab,
+            completedTransactions: {
+                fetchState: completedTransactionsForPeriod?.fetchState ?? {
+                    fetchState: 'Not-Started',
+                    error: undefined,
+                },
+                nextPageToken: completedTransactionsForPeriod?.nextPageToken ?? null,
+                totalCount: completedTransactionsForPeriod?.totalCount ?? 0,
+                transactions: resolvedCompletedTransactions,
+            },
+            matchedFiles,
+            unmatchedFiles,
+            progress,
+            currentResultsTab: bulkUpload.currentResultsTab,
+            sortKey: bulkUpload.sortKey,
+            sortOrder: bulkUpload.sortOrder,
+            batchList,
+            batchListFetchState,
+            pastBatches,
+            pastUnmatchedFiles,
+            confirmMatchStatus: bulkUpload.confirmMatchStatus,
+            manualSearchUiResetKey: bulkUpload.manualSearchUiResetKey,
+            hasMoreBatchDetails,
+            batchDetailsPaginationState: bulkUpload.batchDetailsPaginationState,
+            manualSearch: {
+                ...bulkUpload.manualSearch,
+                results: manualSearchResults,
+            },
+            uploadProgress: bulkUpload.uploadProgress,
+        },
+    };
+}
+function batchDetailsHasUnmatchedWork(details) {
+    return details.files.some((file) => (0, missingReceiptsViewState_1.isUnmatchedTabFileStatus)(file.status));
+}
+/** List row summary before batch details load — aligns with unmatched / possible-match work. */
+function batchListItemHasUnmatchedWork(batch) {
+    return batch.noMatchCount > 0 || batch.possibleMatchesCount > 0;
+}
+/**
+ * `batchList` must match platform order (same sequence as the bulk-upload batches API). Picks the
+ * primary batch for the top "Unmatched" section. Skips failed detail fetches.
+ *
+ * If details are not loaded for an earlier list row but that row reports no unmatched work, we
+ * skip it so later rows with loaded details can be primary (avoids an empty tab when the first
+ * fetch page only loaded later batches). If the list reports unmatched work but details are still
+ * loading, we wait (undefined) so primary order stays correct once details arrive.
+ */
+function getPrimaryBatchIdFromBatchListOrder(batchListInPlatformOrder, batchDetailsById, failedBatchDetailIds) {
+    const failedIds = new Set(failedBatchDetailIds);
+    const anyCompletedBatchHasUnmatchedWork = batchListInPlatformOrder.some((batch) => {
+        if (failedIds.has(batch.batchId)) {
+            return false;
+        }
+        const details = batchDetailsById[batch.batchId];
+        if (details != null &&
+            details.status === 'completed' &&
+            batchDetailsHasUnmatchedWork(details)) {
+            return true;
+        }
+        return details == null && batchListItemHasUnmatchedWork(batch);
+    });
+    for (const batch of batchListInPlatformOrder) {
+        if (failedIds.has(batch.batchId)) {
+            continue;
+        }
+        const details = batchDetailsById[batch.batchId];
+        if (details == null) {
+            if (batchListItemHasUnmatchedWork(batch)) {
+                return undefined;
+            }
+            continue;
+        }
+        if (details.status !== 'completed') {
+            continue;
+        }
+        if (anyCompletedBatchHasUnmatchedWork) {
+            if (batchDetailsHasUnmatchedWork(details)) {
+                return batch.batchId;
+            }
+            continue;
+        }
+        return batch.batchId;
+    }
+    return undefined;
+}
+function resolveBatchFile(file, batchId, transactionState) {
+    const matchedTransaction = file.matchedTransactionId != null
+        ? (0, transactionSelector_1.getSupportedTransactionById)(transactionState, file.matchedTransactionId)
+        : undefined;
+    const candidates = file.candidates
+        ?.map((ref) => {
+        const transaction = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, ref.transactionId);
+        return transaction != null
+            ? { transaction, matchScore: ref.matchScore }
+            : undefined;
+    })
+        .filter((candidate) => candidate != null);
+    return {
+        attachmentId: file.attachmentId,
+        batchId,
+        fileDownloadUrl: file.fileDownloadUrl,
+        fileId: file.fileId,
+        filename: file.filename,
+        filePreviewUrl: file.filePreviewUrl,
+        status: file.status,
+        matchedTransaction,
+        candidates: candidates != null && candidates.length > 0 ? candidates : undefined,
+        matchSource: file.matchSource,
     };
 }

package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.js

@@ -16,7 +16,7 @@ const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAu
 function getExpenseAutomationTransactionView(state) {
     const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
-    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
+    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
     const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
     const classList = (0, classListSelector_1.getClassList)(classState, classListState);
@@ -100,6 +100,7 @@ function getExpenseAutomationTransactionView(state) {
         completionStatus,
         totalCountByTab,
         fetchStateByTransactionTabs: fetchStateByTab,
+        uploadReceiptStatusById,
         selectedTransactionId,
         selectedTransactionLineId,
     };

package/lib/view/expenseAutomationView/types/missingReceiptsViewState.d.ts

@@ -12,7 +12,149 @@ export interface MissingReceiptsViewUIState {
     sortKey: MissingReceiptsSortKey;
     sortOrder: SortOrder;
 }
+/**
+ * Minimum trimmed query length before manual-match search calls the expense-automation API.
+ * Kept in sync with `ManualSearchInput` in web-components (fires search only when length ≥ this).
+ */
+export declare const MIN_MANUAL_TRANSACTION_SEARCH_LENGTH = 2;
+export declare const toBatchStatusValue: (v: string) => "pending" | "processing" | "completed";
+export type BatchStatusValue = ReturnType<typeof toBatchStatusValue>;
+/** Canonical batch file statuses (API ingress may use aliases; see `parseBatchFileStatus`). */
+export declare const BATCH_FILE_STATUSES: readonly ["exact_match", "possible_matches", "no_match", "failed"];
+export declare const toBatchFileStatus: (v: string) => "failed" | "exact_match" | "possible_matches" | "no_match";
+export type BatchFileStatus = ReturnType<typeof toBatchFileStatus>;
+/** True for files that belong in the Unmatched tab (possible matches or no match). */
+export declare function isUnmatchedTabFileStatus(status: BatchFileStatus): boolean;
+export declare const toBulkUploadPhase: (v: string) => "completed" | "idle" | "uploading" | "matching";
+export type BulkUploadPhase = ReturnType<typeof toBulkUploadPhase>;
+export declare const toBulkUploadResultsTab: (v: string) => "completed" | "unmatched";
+export type BulkUploadResultsTab = ReturnType<typeof toBulkUploadResultsTab>;
+export declare const toMissingReceiptsTab: (v: string) => "completed" | "unmatched" | "missing";
+export type MissingReceiptsTab = ReturnType<typeof toMissingReceiptsTab>;
+export declare const toCompletedSubTab: (v: string) => "all" | "manual" | "ai_accountant";
+export type CompletedSubTab = ReturnType<typeof toCompletedSubTab>;
+export declare const toMatchSource: (v: string) => "manual" | "ai";
+export type MatchSource = ReturnType<typeof toMatchSource>;
+export declare const toBulkUploadSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class";
+export type BulkUploadSortKey = ReturnType<typeof toBulkUploadSortKey>;
+export interface CandidateRef {
+    matchScore: number;
+    transactionId: ID;
+}
+export interface MatchCandidate {
+    amount: number;
+    currencyCode: string;
+    matchScore: number;
+    transactionDate: string;
+    transactionId: ID;
+    transactionType: string;
+    vendorName: string;
+    vendorLogo?: string;
+}
+export interface BatchFile {
+    attachmentId: ID;
+    fileDownloadUrl: string | null;
+    fileId: ID;
+    filename: string;
+    filePreviewUrl: string | null;
+    status: BatchFileStatus;
+    candidates?: CandidateRef[];
+    matchedTransactionId?: ID;
+    matchSource?: MatchSource;
+}
+export interface BatchSummary {
+    failed: number;
+    matched: number;
+    noMatch: number;
+    possibleMatches: number;
+    total: number;
+}
+export interface BatchStatus {
+    batchId: ID;
+    progress: {
+        processed: number;
+        total: number;
+    };
+    status: BatchStatusValue;
+}
+export interface BatchDetails {
+    batchId: ID;
+    createdAt: string;
+    files: BatchFile[];
+    status: BatchStatusValue;
+    summary: BatchSummary;
+}
+export interface BatchListItem {
+    batchId: ID;
+    createdAt: string;
+    failedCount: number;
+    matchedCount: number;
+    noMatchCount: number;
+    possibleMatchesCount: number;
+    status: string;
+    totalFiles: number;
+}
+export interface ManualSearchResult {
+    amount: number;
+    currencyCode: string;
+    entityId: string;
+    memo: string;
+    transactionDate: string;
+    transactionId: ID;
+    transactionType: string;
+    vendorName: string;
+    /** Present when API/merged transaction state supplies a logo URL. */
+    vendorLogo?: string;
+}
+export interface ManualSearchState {
+    fetchState: FetchStateAndError;
+    /** True while appending the next page (initial search uses fetchState only). */
+    isLoadingMore: boolean;
+    nextPageToken: string | null;
+    pageSize: number;
+    results: ManualSearchResult[];
+    searchQuery: string;
+    totalCount: number;
+}
+/** Same union as {@link CompletedSubTab} — used for completed-transactions API `match_type`. */
+export type CompletedTransactionsMatchType = CompletedSubTab;
+export interface CompletedTransactionsState {
+    fetchState: FetchStateAndError;
+    nextPageToken: string | null;
+    totalCount: number;
+    transactionIds: ID[];
+}
+export interface BulkUploadState {
+    batchDetailsById: Record<ID, BatchDetails>;
+    batchDetailsPaginationState: FetchStateAndError;
+    batchListByPeriod: Record<MonthYearPeriodId, BatchListItem[]>;
+    batchListFetchState: FetchStateAndError;
+    batchStatusById: Record<ID, BatchStatus>;
+    completedSubTab: CompletedSubTab;
+    completedTransactionsByPeriod: Record<string, CompletedTransactionsState>;
+    confirmMatchStatus: FetchStateAndError;
+    currentResultsTab: BulkUploadResultsTab;
+    failedBatchDetailIds: ID[];
+    /**
+     * Incremented when manual search Redux state is cleared so Unmatched `ManualSearchInput`
+     * instances remount and drop local query text.
+     */
+    manualSearch: ManualSearchState;
+    manualSearchUiResetKey: number;
+    phase: BulkUploadPhase;
+    sortKey: BulkUploadSortKey;
+    sortOrder: SortOrder;
+    uploadProgress: number;
+    uploadStatus: FetchStateAndError;
+    currentBatchId?: ID;
+}
 export interface MissingReceiptsViewState extends FetchedState {
+    bulkUpload: BulkUploadState;
+    /**
+     * When set, the app shell should switch the Missing Receipts sub-tab (e.g. to Unmatched)
+     * once, then clear via `clearMissingReceiptsTabNavigation`.
+     */
+    pendingMissingReceiptsTabNavigation: BulkUploadResultsTab | null;
     refreshStatus: FetchStateAndError;
     transactionIdsBySelectedPeriod: Record<MonthYearPeriodId, ID[]>;
     uiState: MissingReceiptsViewUIState;

package/lib/view/expenseAutomationView/types/missingReceiptsViewState.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toMissingReceiptsSortKey = void 0;
+exports.toBulkUploadSortKey = exports.toMatchSource = exports.toCompletedSubTab = exports.toMissingReceiptsTab = exports.toBulkUploadResultsTab = exports.toBulkUploadPhase = exports.toBatchFileStatus = exports.BATCH_FILE_STATUSES = exports.toBatchStatusValue = exports.MIN_MANUAL_TRANSACTION_SEARCH_LENGTH = exports.toMissingReceiptsSortKey = void 0;
+exports.isUnmatchedTabFileStatus = isUnmatchedTabFileStatus;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const MISSING_RECEIPTS_SORT_KEYS = [
     'vendor',
@@ -11,3 +12,55 @@ const MISSING_RECEIPTS_SORT_KEYS = [
 ];
 const toMissingReceiptsSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, MISSING_RECEIPTS_SORT_KEYS);
 exports.toMissingReceiptsSortKey = toMissingReceiptsSortKey;
+// -- Bulk Receipt Upload Types --
+/**
+ * Minimum trimmed query length before manual-match search calls the expense-automation API.
+ * Kept in sync with `ManualSearchInput` in web-components (fires search only when length ≥ this).
+ */
+exports.MIN_MANUAL_TRANSACTION_SEARCH_LENGTH = 2;
+const BATCH_STATUS_VALUES = ['pending', 'processing', 'completed'];
+const toBatchStatusValue = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BATCH_STATUS_VALUES);
+exports.toBatchStatusValue = toBatchStatusValue;
+/** Canonical batch file statuses (API ingress may use aliases; see `parseBatchFileStatus`). */
+exports.BATCH_FILE_STATUSES = [
+    'exact_match',
+    'possible_matches',
+    'no_match',
+    'failed',
+];
+const toBatchFileStatus = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase().replace(/-/g, '_'), exports.BATCH_FILE_STATUSES);
+exports.toBatchFileStatus = toBatchFileStatus;
+const UNMATCHED_TAB_FILE_STATUSES = ['possible_matches', 'no_match'];
+/** True for files that belong in the Unmatched tab (possible matches or no match). */
+function isUnmatchedTabFileStatus(status) {
+    return UNMATCHED_TAB_FILE_STATUSES.includes(status);
+}
+const BULK_UPLOAD_PHASES = [
+    'idle',
+    'uploading',
+    'matching',
+    'completed',
+];
+const toBulkUploadPhase = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BULK_UPLOAD_PHASES);
+exports.toBulkUploadPhase = toBulkUploadPhase;
+const BULK_UPLOAD_RESULTS_TABS = ['completed', 'unmatched'];
+const toBulkUploadResultsTab = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BULK_UPLOAD_RESULTS_TABS);
+exports.toBulkUploadResultsTab = toBulkUploadResultsTab;
+const MISSING_RECEIPTS_TABS = ['missing', 'completed', 'unmatched'];
+const toMissingReceiptsTab = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), MISSING_RECEIPTS_TABS);
+exports.toMissingReceiptsTab = toMissingReceiptsTab;
+const COMPLETED_SUB_TABS = ['all', 'ai_accountant', 'manual'];
+const toCompletedSubTab = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), COMPLETED_SUB_TABS);
+exports.toCompletedSubTab = toCompletedSubTab;
+const MATCH_SOURCES = ['ai', 'manual'];
+const toMatchSource = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), MATCH_SOURCES);
+exports.toMatchSource = toMatchSource;
+const BULK_UPLOAD_SORT_KEYS = [
+    'amount',
+    'category',
+    'class',
+    'date',
+    'vendor',
+];
+const toBulkUploadSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BULK_UPLOAD_SORT_KEYS);
+exports.toBulkUploadSortKey = toBulkUploadSortKey;

package/lib/view/expenseAutomationView/types/transactionsViewState.d.ts

@@ -15,7 +15,7 @@ import { VendorBase } from '../../../entity/vendor/vendorState';
 import { ZeniDate } from '../../../zeniDayJS';
 import { EntityRecommendationKey } from '../../recommendation/recommendationState';
 import { TransactionDetailKey } from '../../transactionDetail/transactionDetailState';
-export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class" | "memo" | "transaction_type";
+export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class" | "payment_account" | "transaction_type" | "memo_and_receipt";
 export type TransactionsSortKey = ReturnType<typeof toTransactionsSortKey>;
 export declare const TRANSACTIONS_TABS: readonly ["review", "autoCategorized"];
 export declare const toTransactionsTabKey: (v: string) => "review" | "autoCategorized";
@@ -97,6 +97,7 @@ export interface TransactionsTabViewState extends FetchedState {
     transactionIdsWithUnsavedData: ID[];
     transactionReviewLocalDataById: Record<ID | TransactionDetailKey, SupportedTransactionCategorization>;
     uiState: TransactionsViewUIState;
+    uploadReceiptStatusById: Record<ID, FetchStateAndError>;
     selectedTransactionId?: ID;
     selectedTransactionLineId?: ID;
 }

package/lib/view/expenseAutomationView/types/transactionsViewState.js

@@ -7,10 +7,11 @@ const TRANSACTIONS_SORT_KEYS = [
     'vendor',
     'amount',
     'transaction_type',
+    'payment_account',
     'date',
     'category',
     'class',
-    'memo',
+    'memo_and_receipt',
 ];
 const toTransactionsSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, TRANSACTIONS_SORT_KEYS);
 exports.toTransactionsSortKey = toTransactionsSortKey;

package/lib/view/spendManagement/billPay/billList/billListSelector.js

@@ -424,6 +424,14 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                     transactionsWithNoSortKeyValue.push(transaction);
                 }
                 break;
+            case 'invoiceNumber':
+                if (transaction.documentId != null) {
+                    transactionsWithSortKeyValue.push(transaction);
+                }
+                else {
+                    transactionsWithNoSortKeyValue.push(transaction);
+                }
+                break;
             case 'dueDate':
                 if (currentTab === 'draft') {
                     if (Boolean(transaction.dueDate) === true) {
@@ -526,6 +534,8 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                 return transaction.totalAmountInUSD?.amount ?? 0;
             case 'paymentMethod':
                 return transaction.billPayInfo.billPaymentMethodType.name;
+            case 'invoiceNumber':
+                return transaction.documentId;
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

package/lib/view/spendManagement/billPay/billList/billListState.d.ts

@@ -37,7 +37,7 @@ declare const toBillTabType: (v: string) => "paid" | "pending_approval" | "sched
 export type BillTab = ReturnType<typeof toBillTabType>;
 declare const toBillsSubTabType: (v: string) => "rejected" | "failed" | "ach" | "wire" | "cancelled" | "deleted" | "overdue" | "all" | "awaiting_approval" | "awaiting_my_approval" | "offline";
 export type BillsSubTabType = ReturnType<typeof toBillsSubTabType>;
-declare const toBillPaySortKeyType: (v: string) => "amount" | "status" | "name" | "dueDate" | "paymentMethod" | "invoiceDate";
+declare const toBillPaySortKeyType: (v: string) => "amount" | "status" | "name" | "dueDate" | "paymentMethod" | "invoiceNumber" | "invoiceDate";
 export declare type BillPayViewSortKey = ReturnType<typeof toBillPaySortKeyType>;
 export interface BillPayFilters {
     categories: BillPayFilterCategory[];

package/lib/view/spendManagement/billPay/billList/billListState.js

@@ -47,6 +47,7 @@ const ALL_BILL_PAY_SORT_KEYS = [
     'invoiceDate',
     'name',
     'paymentMethod',
+    'invoiceNumber',
 ];
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const toBillPaySortKeyType = (v) => (0, stringToUnion_1.stringToUnion)(v, ALL_BILL_PAY_SORT_KEYS);

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardList.d.ts

@@ -61,7 +61,7 @@ export declare const initialCreditAcc: CreditAccount;
 export declare const initialDebitCardSummaries: DebitCardSummaries;
 export declare const initialResendRevokeCardInvite: ResendRevokeCardInvite;
 export declare const initialCreditAccountRepayment: CreditAccountRepayment;
-export declare const toChargeCardSortKeyType: (v: string) => "status" | "owner" | "cardName" | "limit" | "department" | "cardType" | "utilisation";
+export declare const toChargeCardSortKeyType: (v: string) => "status" | "accountType" | "owner" | "cardName" | "limit" | "department" | "cardType" | "utilisation";
 export declare type ChargeCardViewSortKey = ReturnType<typeof toChargeCardSortKeyType>;
 export declare const ALL_CASHBACK_SORT_KEYS: readonly ["month", "cashback"];
 export declare const toCashbackSortKeyType: (v: string) => "month" | "cashback";

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardList.js

@@ -78,6 +78,7 @@ const ALL_CHARGE_CARD_SORT_KEYS = [
     'cardName',
     'department',
     'cardType',
+    'accountType',
     'status',
     'utilisation',
     'limit',

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListSelector.js

@@ -233,6 +233,8 @@ const getCardsBySortKey = (card, sortKey) => {
             return card.cardName.toLowerCase();
         case 'cardType':
             return card.type.code;
+        case 'accountType':
+            return card.type.code.includes('credit') ? 'credit' : 'debit';
         case 'status':
             return card.status.code;
         case 'utilisation':

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.d.ts

@@ -42,6 +42,7 @@ export interface ReimbursementView extends Reimbursement {
     approvers: Approvers;
     submittedBy: User | undefined;
     bulkSelectInfo?: RemiBulkSelectInfo;
+    createdByUser?: User;
 }
 export declare const getRemiList: (state: RootState, currentTimePeriod: TimePeriod, isBulkActionFeatureEnabled: boolean) => RemiListReport;
 export declare const getApproversOrRejectors: (reimbursement: Reimbursement, entityApprovalStatusState: EntityApprovalStatusState, userState: UserState) => Approvers;

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.js

@@ -51,6 +51,7 @@ const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled) => {
         return {
             ...reimbursement,
             submittedBy: (0, userSelector_1.getUserByUserId)(userState, reimbursement.reimburseeUserId),
+            createdByUser: (0, userSelector_1.getUserByUserId)(userState, reimbursement.createdBy),
             approvers: approvers,
         };
     });
@@ -423,6 +424,14 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
                     reimbursementsWithNoSortKeyValue.push(reimbursement);
                 }
                 break;
+            case 'createdBy':
+                if (reimbursement.createdByUser != null) {
+                    reimbursementsWithSortKeyValue.push(reimbursement);
+                }
+                else {
+                    reimbursementsWithNoSortKeyValue.push(reimbursement);
+                }
+                break;
         }
     });
     const getColumnWiseSortOrder = (sortOrder) => {
@@ -430,6 +439,7 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
             case 'reportName':
             case 'type':
             case 'status':
+            case 'createdBy':
                 return sortOrder === 'ascending' ? 'asc' : 'desc';
             default:
                 return sortOrder === 'ascending' ? 'desc' : 'asc';
@@ -449,6 +459,8 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
                 return getStatusPerTab(reimbursement);
             case 'amount':
                 return reimbursement.amount.amount ?? 0;
+            case 'createdBy':
+                return `${reimbursement.createdByUser?.firstName ?? ''} ${reimbursement.createdByUser?.lastName ?? ''}`.toLowerCase();
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

package/lib/view/spendManagement/reimbursement/remiListView/remiListState.d.ts

@@ -38,7 +38,7 @@ export declare const toRemiSubTabTypeStrict: (v: string) => "rejected" | "failed
 export type RemiSubTabType = ReturnType<typeof toRemiSubTabType>;
 export declare const toRemiSubTabUnderScoreType: (v: string) => "rejected" | "failed" | "ach" | "wire" | "cancelled" | "deleted" | "overdue" | "all" | "awaiting_approval" | "awaiting_my_approval" | "my_drafts" | "awaiting_all_approval";
 export type RemiSubTabUnderScoreType = ReturnType<typeof toRemiSubTabUnderScoreType>;
-declare const toReimbursementSortKeyType: (v: string) => "amount" | "status" | "type" | "submittedOn" | "reportName";
+declare const toReimbursementSortKeyType: (v: string) => "amount" | "status" | "type" | "createdBy" | "submittedOn" | "reportName";
 export type ReimbursementViewSortKey = ReturnType<typeof toReimbursementSortKeyType>;
 export interface ReimbursementFilters {
     categories: ReimbursementFilterCategory[];