@zeniai/client-epic-state 4.19.90-beta3ND → 4.19.90-betaML1

package/lib/view/financeStatement/financeStatementReducer.js

@@ -48,20 +48,19 @@ const financeStatement = (0, toolkit_1.createSlice)({
         updateFinanceStatementThisPeriod(draft, action) {
             const { firstMonthOfFY, coaBalances, maxNumOfPeriodsToHighlight } = action.payload;
             const { timeframe, selectedCOABalancesRange } = draft;
-            const safeCoaBalances = coaBalances ?? [];
-            if (safeCoaBalances.length > 0) {
-                const prevThisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
+            if (coaBalances.length > 0) {
+                const prevThisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
                 if (prevThisPeriod != null) {
                     const selectedCoaBalancesRangeWithThisPeriod = {
                         ...selectedCOABalancesRange,
                         thisPeriod: prevThisPeriod,
                     };
-                    const newThisPeriod = (0, thisPeriodHelpers_1.getMatchingThisPeriod)(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, safeCoaBalances);
+                    const newThisPeriod = (0, thisPeriodHelpers_1.getMatchingThisPeriod)(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, coaBalances);
                     if (newThisPeriod != null) {
                         const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getSelectedAndHighlightedRangesForThisPeriod)({
                             firstMonthOfFY,
                             thisPeriod: newThisPeriod,
-                            coaBalances: safeCoaBalances,
+                            coaBalances,
                             timeframe,
                             maxNumOfPeriodsToSelect: maxNumOfPeriodsToHighlight,
                             currentSelection: {
@@ -80,9 +79,7 @@ const financeStatement = (0, toolkit_1.createSlice)({
             draft.selectedReportId = action.payload;
         },
         updateFinanceStatementAdditionalBalancesSelection(draft, action) {
-            const { firstMonthOfFY, additionalBalances: additionalBalancesPayload, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
-            const safeCoaBalances = coaBalances ?? [];
-            const additionalBalances = additionalBalancesPayload ?? [];
+            const { firstMonthOfFY, additionalBalances, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
             let tempAdditionalBalances = [...additionalBalances];
             if (additionalBalances.includes('this_period_vs_last_period') ||
                 additionalBalances.includes('this_period_vs_last_period_percent')) {
@@ -98,8 +95,8 @@ const financeStatement = (0, toolkit_1.createSlice)({
             draft.isAdditionalBalancesShown =
                 additionalBalances.length != 0 ? true : false;
             const { timeframe, selectedCOABalancesRange } = draft;
-            if (safeCoaBalances.length > 0) {
-                const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
+            if (coaBalances.length > 0) {
+                const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
                 if (thisPeriod != null) {
                     const selectedCoaBalancesRangeWithThisPeriod = {
                         ...selectedCOABalancesRange,
@@ -108,7 +105,7 @@ const financeStatement = (0, toolkit_1.createSlice)({
                     const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getSelectedAndHighlightedRangesForThisPeriod)({
                         firstMonthOfFY,
                         thisPeriod: thisPeriod,
-                        coaBalances: safeCoaBalances,
+                        coaBalances,
                         timeframe,
                         maxNumOfPeriodsToHighlight: maxNumOfPeriodsToHighlight,
                         currentSelection: {

package/lib/view/financeStatement/financeStatementSelector.d.ts

@@ -8,7 +8,6 @@ import { RootState } from '../../reducer';
 import { BalanceSheetReport } from '../balanceSheet/balanceSheetSelectorTypes';
 import { CashFlowReport } from '../cashFlow/cashFlowSelectorTypes';
 import { ProfitAndLossReport } from '../profitAndLoss/profitAndLossSelector';
-import { ProfitAndLossByClassHorizontalReport } from '../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelectorTypes';
 import { ProfitAndLossClassesViewReport } from '../profitAndLossClassesView/profitAndLossClassesViewSelectorTypes';
 export interface FinanceStatementReport extends SelectorReport {
     allTimeframeTicks: TimeframeTickWithMetaData[];
@@ -19,7 +18,6 @@ export interface FinanceStatementReport extends SelectorReport {
     downloadState: FetchState;
     filter: COABalancesFilter;
     isCompareModeOn: boolean;
-    profitAndLossByClassHorizontalReport: ProfitAndLossByClassHorizontalReport;
     profitAndLossByClassReport: ProfitAndLossClassesViewReport;
     profitAndLossReport: ProfitAndLossReport;
     reportFormat: ReportFormat;

package/lib/view/financeStatement/financeStatementSelector.js

@@ -11,7 +11,6 @@ const thisPeriodHelpers_1 = require("../../commonStateTypes/viewAndReport/thisPe
 const balanceSheetSelector_1 = require("../balanceSheet/balanceSheetSelector");
 const cashFlowSelector_1 = require("../cashFlow/cashFlowSelector");
 const profitAndLossSelector_1 = require("../profitAndLoss/profitAndLossSelector");
-const profitAndLossClassesByClassHorizontalSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector");
 const profitAndLossClassesViewSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesViewSelector");
 function getDateRangeForFinanceReports(profitAndLossState, balanceSheetState, cashFlowState) {
     const datesSorted = [
@@ -46,15 +45,11 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
     if (dataAvailable != null) {
         const noFilter = (0, coaBalancesFilter_1.newBalancesFilterForDateRange)(firstMonthOfFY, financeStatementState.timeframe, dataAvailable, 'ascending_date', []);
         const profitAndLossForTimeframeTicks = (0, profitAndLossSelector_1.getProfitAndLossReport)(noFilter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
-        const expensesSection = profitAndLossForTimeframeTicks.sections.expenses;
-        const incomeSection = profitAndLossForTimeframeTicks.sections.income;
-        const expensesBalances = expensesSection?.balances;
-        const incomeBalances = incomeSection?.balances;
-        if (expensesSection != null) {
+        if (profitAndLossForTimeframeTicks.sections.expenses != null) {
             balancesInTimeframe =
-                (expensesBalances?.length ?? 0) > 0
-                    ? expensesBalances ?? []
-                    : incomeBalances ?? [];
+                profitAndLossForTimeframeTicks.sections.expenses.balances.length > 0
+                    ? profitAndLossForTimeframeTicks.sections['expenses'].balances
+                    : profitAndLossForTimeframeTicks.sections['income'].balances;
             allTimeframeTicks = balancesInTimeframe.map((balance) => (0, timeframeTick_1.toTimeframeTick)(balance));
         }
     }
@@ -68,9 +63,6 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
     const profitAndLossReport = (0, profitAndLossSelector_1.getProfitAndLossReport)(filter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
     const classFilter = (0, coaBalancesFilterClassesView_1.newBalancesFilterClassesView)(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, profitAndLossClassesViewState.uiState.classesToFilterOut);
     const profitAndLossByClassReport = (0, profitAndLossClassesViewSelector_1.getProfitAndLossClassesView)(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState);
-    const profitAndLossByClassHorizontalReport = profitAndLossClassesViewState.uiState.classViewLayout === 'horizontal'
-        ? (0, profitAndLossClassesByClassHorizontalSelector_1.getProfitAndLossClassesHorizontalView)(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState, thisPeriod)
-        : (0, profitAndLossClassesByClassHorizontalSelector_1.getProfitAndLossClassesHorizontalView)(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState, undefined);
     const balanceSheetReport = (0, balanceSheetSelector_1.getBalanceSheet)(filter, accountState, accountGroupState, sectionAccountsViewState, balanceSheetState);
     const cashFlowReport = (0, cashFlowSelector_1.getCashFlow)(filter, accountState, accountGroupState, sectionAccountsViewState, cashFlowState);
     const allReports = [
@@ -118,7 +110,6 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
         dataAvailable,
         profitAndLossReport,
         profitAndLossByClassReport,
-        profitAndLossByClassHorizontalReport,
         balanceSheetReport,
         cashFlowReport,
         filter,

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewReducer.d.ts

@@ -2,7 +2,7 @@ import { NestedClassID } from '../../commonStateTypes/classesView/nestedClassID'
 import { AccountViewMode, ID } from '../../commonStateTypes/common';
 import { ZeniAPIStatus, ZeniReportData } from '../../responsePayload';
 import { ProfitAndLossClassesViewPayload } from './profitAndLossClassesViewPayload';
-import { ClassViewLayout, ProfitAndLossClassesViewState } from './profitAndLossClassesViewState';
+import { ProfitAndLossClassesViewState } from './profitAndLossClassesViewState';
 export declare const initialState: ProfitAndLossClassesViewState;
 export declare const fetchProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
     cacheOverride: boolean;
@@ -30,8 +30,6 @@ export declare const fetchProfitAndLossClassesView: import("@reduxjs/toolkit").A
     };
 }, "profitAndLossClassesView/updateProfitAndLossClassesViewUIState">, updateAccountViewMode: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     viewMode: AccountViewMode;
-}, "profitAndLossClassesView/updateAccountViewMode">, updateClassViewLayout: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    classViewLayout: ClassViewLayout;
-}, "profitAndLossClassesView/updateClassViewLayout">, resetProfitAndLossClassesNodeCollapseState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/resetProfitAndLossClassesNodeCollapseState">, clearProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/clearProfitAndLossClassesView">;
+}, "profitAndLossClassesView/updateAccountViewMode">, resetProfitAndLossClassesNodeCollapseState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/resetProfitAndLossClassesNodeCollapseState">, clearProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/clearProfitAndLossClassesView">;
 declare const _default: import("redux").Reducer<ProfitAndLossClassesViewState>;
 export default _default;

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearProfitAndLossClassesView = exports.resetProfitAndLossClassesNodeCollapseState = exports.updateClassViewLayout = exports.updateAccountViewMode = exports.updateProfitAndLossClassesViewUIState = exports.updateClassesToFilterOut = exports.updateProfitAndLossForTimeframeClassesViewFailure = exports.updateProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossClassesView = exports.initialState = void 0;
+exports.clearProfitAndLossClassesView = exports.resetProfitAndLossClassesNodeCollapseState = exports.updateAccountViewMode = exports.updateProfitAndLossClassesViewUIState = exports.updateClassesToFilterOut = exports.updateProfitAndLossForTimeframeClassesViewFailure = exports.updateProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossClassesView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
 const getNestedClassIDHierarchyForReport_1 = require("../../commonStateTypes/classesView/getNestedClassIDHierarchyForReport");
@@ -27,7 +27,6 @@ exports.initialState = {
         nodeCollapseState: {},
         scrollPosition: undefined,
         accountViewMode: 'account_group',
-        classViewLayout: 'vertical',
         classesToFilterOut: [],
     },
     firstMonthOfFY: 1,
@@ -99,9 +98,6 @@ const profitAndLossClassesView = (0, toolkit_1.createSlice)({
         updateAccountViewMode(draft, action) {
             draft.uiState.accountViewMode = action.payload.viewMode;
         },
-        updateClassViewLayout(draft, action) {
-            draft.uiState.classViewLayout = action.payload.classViewLayout;
-        },
         resetProfitAndLossClassesNodeCollapseState(draft) {
             draft.uiState.nodeCollapseState = {};
         },
@@ -110,7 +106,7 @@ const profitAndLossClassesView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = profitAndLossClassesView.actions, exports.fetchProfitAndLossClassesView = _a.fetchProfitAndLossClassesView, exports.fetchProfitAndLossForTimeframeClassesView = _a.fetchProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesView = _a.updateProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesViewFailure = _a.updateProfitAndLossForTimeframeClassesViewFailure, exports.updateClassesToFilterOut = _a.updateClassesToFilterOut, exports.updateProfitAndLossClassesViewUIState = _a.updateProfitAndLossClassesViewUIState, exports.updateAccountViewMode = _a.updateAccountViewMode, exports.updateClassViewLayout = _a.updateClassViewLayout, exports.resetProfitAndLossClassesNodeCollapseState = _a.resetProfitAndLossClassesNodeCollapseState, exports.clearProfitAndLossClassesView = _a.clearProfitAndLossClassesView;
+_a = profitAndLossClassesView.actions, exports.fetchProfitAndLossClassesView = _a.fetchProfitAndLossClassesView, exports.fetchProfitAndLossForTimeframeClassesView = _a.fetchProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesView = _a.updateProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesViewFailure = _a.updateProfitAndLossForTimeframeClassesViewFailure, exports.updateClassesToFilterOut = _a.updateClassesToFilterOut, exports.updateProfitAndLossClassesViewUIState = _a.updateProfitAndLossClassesViewUIState, exports.updateAccountViewMode = _a.updateAccountViewMode, exports.resetProfitAndLossClassesNodeCollapseState = _a.resetProfitAndLossClassesNodeCollapseState, exports.clearProfitAndLossClassesView = _a.clearProfitAndLossClassesView;
 exports.default = profitAndLossClassesView.reducer;
 const doUpdatedProfitAndLossClassesView = (draft, timeframe, pandLReport) => {
     const report = (0, viewAndReportPayloadv2_1.mapReportPayloadV2ToReportV2)(pandLReport.report);

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewState.d.ts

@@ -1,11 +1,9 @@
 import { NestedClassHierarchyForReport, NestedClassID } from '../../commonStateTypes/classesView/nestedClassID';
 import { AccountViewMode, FetchStateAndError, ID } from '../../commonStateTypes/common';
 import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
-export type ClassViewLayout = 'vertical' | 'horizontal';
 export interface ProfitAndLossClassesViewUIState {
     accountViewMode: AccountViewMode;
     classesToFilterOut: NestedClassID[];
-    classViewLayout: ClassViewLayout;
     nodeCollapseState: Record<ID, boolean>;
     scrollPosition: {
         scrollTop: number;

package/lib/view/reportUIOptions/updateReportUIOptionCOABalancesRangeEpic.js

@@ -11,7 +11,8 @@ const opExReducer_1 = require("../opEx/opExReducer");
 const revenueReducer_1 = require("../revenue/revenueReducer");
 const reportUIOptionsReducer_1 = require("./reportUIOptionsReducer");
 const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(reportUIOptionsReducer_1.updateReportUIOptionCOABalancesRange.match), (0, operators_1.switchMap)((action) => {
-    const { thisPeriod, orderBy, numberOfPeriods: selectedNumberOfPeriods, } = action.payload.selectedCOABalancesRange;
+    const thisPeriod = action.payload.selectedCOABalancesRange.thisPeriod;
+    const orderBy = action.payload.selectedCOABalancesRange.orderBy;
     const highlightedNoOfPeriods = state$.value.reportUIOptionsState.isCompareModeOn === true ? 4 : 1;
     const highlightedCOABalancesRange = action.payload.highlightedCOABalancesRange == null && thisPeriod != null
         ? {
@@ -65,8 +66,8 @@ const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => actions$.
             ? action.payload.highlightedCOABalancesRange.thisPeriod
             : thisPeriod,
         numberOfPeriods: state$.value.reportUIOptionsState.isCompareModeOn === true
-            ? Math.max(4, selectedNumberOfPeriods)
-            : selectedNumberOfPeriods,
+            ? 4
+            : financeStatementReducer_1.initialFinanceStatementState.maxNumOfPeriodsToHighlight,
         orderBy,
     }));
 }));

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[];

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

@@ -64,6 +64,7 @@ exports.toRemiSubTabUnderScoreType = toRemiSubTabUnderScoreType;
 const ALL_REIMBURSEMENT_SORT_KEYS = [
     'reportName',
     'submittedOn',
+    'createdBy',
     'type',
     'status',
     'amount',

package/lib/view/taskManager/taskDetailView/taskDetailSelector.js

@@ -98,11 +98,11 @@ exports.allTaskStatus = [
     },
     {
         code: 'done',
-        name: 'Done',
+        name: 'In Review',
     },
     {
         code: 'resolved',
-        name: 'Resolved',
+        name: 'Complete',
     },
 ];
 exports.allTaskPriority = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.19.90-beta3ND",
+  "version": "4.19.90-betaML1",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",