@zeniai/client-epic-state 4.19.88-betaSS1 → 4.19.88-betaVR2

package/lib/entity/chargeCardTransaction/chargeCardTransaction.d.ts

@@ -36,6 +36,6 @@ export interface ChargeCardTransactionState {
 }
 export declare const toCardTransactionTypeCode: (v: string) => "expense" | "credit_card_credit" | "transfer" | "purchase";
 export type ChargeCardTransactionTypeCode = ReturnType<typeof toCardTransactionTypeCode>;
-export declare const toCardTransactionStatusCode: (v: string) => "paid" | "canceled" | "authorized" | "declined";
+export declare const toCardTransactionStatusCode: (v: string) => "paid" | "authorized" | "canceled" | "declined";
 export type ChargeCardTransactionStatusCode = ReturnType<typeof toCardTransactionStatusCode>;
 export {};

package/lib/entity/jeSchedules/jeSchedulesPayload.d.ts

@@ -71,7 +71,7 @@ export declare function toScheduledJournalEntryState(payload: ScheduledJournalEn
 export declare function toJEAccountPayload(payload: JEScheduledTransactionPayload | JEAccruedScheduledTransactionPayload, type: TransactionCategory): AccountPayload | undefined;
 export declare function toJEAccruedAccountPayload(payload: JEScheduledTransactionPayload | JEAccruedScheduledTransactionPayload, type: TransactionCategory): AccountPayload | undefined;
 export declare function toJEClassPayload(payload: JEScheduledTransactionPayload | JEAccruedScheduledTransactionPayload, type: TransactionCategory): ClassBasePayload | undefined;
-export declare function getJEScheduleTransactionDetailKeyPayload(payload: ScheduleTransactionPayload): JEScheduleTransactionKey;
+export declare function getTransactionDetailKeyPayload(payload: ScheduleTransactionPayload): JEScheduleTransactionKey;
 export declare function getJEScheduleKey(payload: JEAccruedScheduledTransactionPayload): JEScheduleKey;
 export declare function toJEScheduledTransaction(payload: JEScheduledTransactionPayload): JEScheduledTransactionState;
 export declare function toJEAccruedScheduledTransaction(payload: JEAccruedScheduledTransactionPayload): JEAccruedScheduledTransactionState;

package/lib/entity/jeSchedules/jeSchedulesPayload.js

@@ -4,12 +4,13 @@ exports.toScheduledJournalEntryState = toScheduledJournalEntryState;
 exports.toJEAccountPayload = toJEAccountPayload;
 exports.toJEAccruedAccountPayload = toJEAccruedAccountPayload;
 exports.toJEClassPayload = toJEClassPayload;
-exports.getJEScheduleTransactionDetailKeyPayload = getJEScheduleTransactionDetailKeyPayload;
+exports.getTransactionDetailKeyPayload = getTransactionDetailKeyPayload;
 exports.getJEScheduleKey = getJEScheduleKey;
 exports.toJEScheduledTransaction = toJEScheduledTransaction;
 exports.toJEAccruedScheduledTransaction = toJEAccruedScheduledTransaction;
 const amount_1 = require("../../commonStateTypes/amount");
 const timePeriod_1 = require("../../commonStateTypes/timePeriod");
+const transactionDetailState_1 = require("../../view/transactionDetail/transactionDetailState");
 const zeniDayJS_1 = require("../../zeniDayJS");
 const transactionIDPayload_1 = require("../transaction/payloadTypes/transactionIDPayload");
 const jeScheduleHelper_1 = require("./jeScheduleHelper");
@@ -131,12 +132,9 @@ function toJEClassPayload(payload, type) {
             : undefined;
     }
 }
-function getJEScheduleTransactionDetailKeyPayload(payload) {
+function getTransactionDetailKeyPayload(payload) {
     const transactionId = (0, transactionIDPayload_1.toTransactionID)(payload);
-    return (0, jeSchedulesTypes_1.getJEScheduleTransactionKey)({
-        ...transactionId,
-        lineId: payload.line_id,
-    });
+    return (0, transactionDetailState_1.getZeniTransactionDetailKey)(transactionId);
 }
 function getJEScheduleKey(payload) {
     return (0, jeScheduleHelper_1.generateJEScheduleKey)(payload);
@@ -157,10 +155,7 @@ function toJEScheduledTransaction(payload) {
             label: payload.status.label,
         },
         vendorId: payload.vendor.vendor_id,
-        baseTransaction: (0, jeSchedulesTypes_1.getJEScheduleTransactionKey)({
-            ...(0, transactionIDPayload_1.toTransactionID)(payload.base_transaction),
-            lineId: payload.base_transaction.line_id,
-        }),
+        baseTransaction: getTransactionDetailKeyPayload(payload.base_transaction),
         startDate: payload.start_date != null ? (0, zeniDayJS_1.date)(payload.start_date) : undefined,
         endDate: payload.end_date != null ? (0, zeniDayJS_1.date)(payload.end_date) : undefined,
         period: payload.period != null ? Number(payload.period) : undefined,

package/lib/entity/jeSchedules/jeSchedulesReducer.d.ts

@@ -18,8 +18,8 @@ export declare const updateJESchedules: import("@reduxjs/toolkit").ActionCreator
     jeSchedulesPayload: JEAccruedScheduledTransactionPayload[];
     scheduledJEntriesPayload: ScheduledJournalEntryPayload[] | undefined;
     updateType: UpdateType;
-}, "jeSchedules/updateAccruedJESchedulesDetails", never, never>, deleteJESchedulesDetails: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[jeScheduleTransactionKey: `${string}_bill_${string}` | `${string}_expense_${string}` | `${string}_check_${string}` | `${string}_refund_${string}` | `${string}_invoice_${string}` | `${string}_payment_${string}` | `${string}_credit_memo_${string}` | `${string}_sales_receipt_${string}` | `${string}_delayed_credit_${string}` | `${string}_delayed_charge_${string}` | `${string}_bill_payment_${string}` | `${string}_bill_payment_check_${string}` | `${string}_bill_payment_credit_card_${string}` | `${string}_vendor_credit_${string}` | `${string}_credit_card_credit_${string}` | `${string}_transfer_${string}` | `${string}_credit_card_payment_${string}` | `${string}_deposit_${string}` | `${string}_journal_entry_${string}`], {
-    jeScheduleTransactionKey: `${string}_bill_${string}` | `${string}_expense_${string}` | `${string}_check_${string}` | `${string}_refund_${string}` | `${string}_invoice_${string}` | `${string}_payment_${string}` | `${string}_credit_memo_${string}` | `${string}_sales_receipt_${string}` | `${string}_delayed_credit_${string}` | `${string}_delayed_charge_${string}` | `${string}_bill_payment_${string}` | `${string}_bill_payment_check_${string}` | `${string}_bill_payment_credit_card_${string}` | `${string}_vendor_credit_${string}` | `${string}_credit_card_credit_${string}` | `${string}_transfer_${string}` | `${string}_credit_card_payment_${string}` | `${string}_deposit_${string}` | `${string}_journal_entry_${string}`;
+}, "jeSchedules/updateAccruedJESchedulesDetails", never, never>, deleteJESchedulesDetails: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[jeScheduleTransactionKey: `${string}_bill` | `${string}_expense` | `${string}_check` | `${string}_refund` | `${string}_invoice` | `${string}_payment` | `${string}_credit_memo` | `${string}_sales_receipt` | `${string}_delayed_credit` | `${string}_delayed_charge` | `${string}_bill_payment` | `${string}_bill_payment_check` | `${string}_bill_payment_credit_card` | `${string}_vendor_credit` | `${string}_credit_card_credit` | `${string}_transfer` | `${string}_credit_card_payment` | `${string}_deposit` | `${string}_journal_entry`], {
+    jeScheduleTransactionKey: `${string}_bill` | `${string}_expense` | `${string}_check` | `${string}_refund` | `${string}_invoice` | `${string}_payment` | `${string}_credit_memo` | `${string}_sales_receipt` | `${string}_delayed_credit` | `${string}_delayed_charge` | `${string}_bill_payment` | `${string}_bill_payment_check` | `${string}_bill_payment_credit_card` | `${string}_vendor_credit` | `${string}_credit_card_credit` | `${string}_transfer` | `${string}_credit_card_payment` | `${string}_deposit` | `${string}_journal_entry`;
 }, "jeSchedules/deleteJESchedulesDetails", never, never>, deleteAccruedJESchedulesDetails: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[JEScheduleKey: `${string}_${string}`], {
     JEScheduleKey: `${string}_${string}`;
 }, "jeSchedules/deleteAccruedJESchedulesDetails", never, never>, clearAllAccruedJESchedules: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"jeSchedules/clearAllAccruedJESchedules">, clearAllJEScheduleTransactions: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"jeSchedules/clearAllJEScheduleTransactions">;

package/lib/entity/jeSchedules/jeSchedulesReducer.js

@@ -42,7 +42,7 @@ const jeSchedules = (0, toolkit_1.createSlice)({
         },
         updateJEScheduledTransaction: (draft, action) => {
             action.payload.jeSchedulesTransactionsPayload.forEach((schedule) => {
-                doUpdateJEScheduledTransaction(draft.schedulesByTransactionKey, (0, jeSchedulesPayload_1.getJEScheduleTransactionDetailKeyPayload)(schedule.base_transaction), schedule, 'merge');
+                doUpdateJEScheduledTransaction(draft.schedulesByTransactionKey, (0, jeSchedulesPayload_1.getTransactionDetailKeyPayload)(schedule.base_transaction), schedule, 'merge');
             });
         },
         updateAccruedJEScheduledTransaction: (draft, action) => {
@@ -84,7 +84,7 @@ const jeSchedules = (0, toolkit_1.createSlice)({
                 if (jeSchedulesPayload.length > 0) {
                     jeSchedulesPayload.forEach((jeSchedulePayload) => {
                         const transactionKey = jeSchedulePayload.base_transaction;
-                        doUpdateScheduledDetailTransaction(draft.schedulesByTransactionKey, (0, jeSchedulesPayload_1.getJEScheduleTransactionDetailKeyPayload)(transactionKey), jeSchedulePayload, action.payload.scheduledJEntriesPayload ?? [], updateType);
+                        doUpdateScheduledDetailTransaction(draft.schedulesByTransactionKey, (0, jeSchedulesPayload_1.getTransactionDetailKeyPayload)(transactionKey), jeSchedulePayload, action.payload.scheduledJEntriesPayload ?? [], updateType);
                     });
                 }
             },

package/lib/entity/jeSchedules/jeSchedulesState.d.ts

@@ -1,6 +1,7 @@
 import { Amount } from '../../commonStateTypes/amount';
 import { ID } from '../../commonStateTypes/common';
 import { ScheduleDaysOfMonth } from '../../commonStateTypes/timePeriod';
+import { TransactionDetailKey } from '../../view/transactionDetail/transactionDetailState';
 import { ZeniDate } from '../../zeniDayJS';
 import { TransactionID } from '../transaction/stateTypes/transaction';
 import { JEScheduleKey, JEScheduleTransactionKey, JournalEntryErrorCodeType, ScheduleJournalEntryStatusCodeType, ScheduleStatusCodeType, ScheduleTypes } from './jeSchedulesTypes';
@@ -41,7 +42,7 @@ export interface ScheduledJournalEntryState {
     updateTime?: ZeniDate;
 }
 export interface JEScheduledTransactionState {
-    baseTransaction: JEScheduleTransactionKey;
+    baseTransaction: TransactionDetailKey;
     currencyCode: string;
     currencySymbol: string;
     jeCredit: {

package/lib/entity/jeSchedules/jeSchedulesTypes.d.ts

@@ -1,16 +1,12 @@
-import { TransactionID } from '../transaction/stateTypes/transaction';
+import { getZeniTransactionDetailKey } from '../../view/transactionDetail/transactionDetailState';
 import { generateJEScheduleKey } from './jeScheduleHelper';
-export interface ScheduleTransactionID extends TransactionID {
-    lineId: string;
-}
-export declare const getJEScheduleTransactionKey: (scheduleTransactionId: ScheduleTransactionID) => `${string}_bill_${string}` | `${string}_expense_${string}` | `${string}_check_${string}` | `${string}_refund_${string}` | `${string}_invoice_${string}` | `${string}_payment_${string}` | `${string}_credit_memo_${string}` | `${string}_sales_receipt_${string}` | `${string}_delayed_credit_${string}` | `${string}_delayed_charge_${string}` | `${string}_bill_payment_${string}` | `${string}_bill_payment_check_${string}` | `${string}_bill_payment_credit_card_${string}` | `${string}_vendor_credit_${string}` | `${string}_credit_card_credit_${string}` | `${string}_transfer_${string}` | `${string}_credit_card_payment_${string}` | `${string}_deposit_${string}` | `${string}_journal_entry_${string}`;
-export type JEScheduleTransactionKey = ReturnType<typeof getJEScheduleTransactionKey>;
+export type JEScheduleTransactionKey = ReturnType<typeof getZeniTransactionDetailKey>;
 export type JEScheduleKey = ReturnType<typeof generateJEScheduleKey>;
 export declare const ALL_SCHEDULES_TYPES: readonly ["prepaid_expenses", "fixed_assets", "accrued_expenses", "deferred_revenue"];
 export declare const toScheduleTypesType: (v: string) => "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
 export type ScheduleTypes = ReturnType<typeof toScheduleTypesType>;
 export declare const toScheduleTypesTypeStrict: (v?: string) => "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue" | undefined;
-export declare const toScheduleJournalEntryStatusCodeType: (v: string) => "pending" | "posted" | "unknown" | "canceled" | "recorded";
+export declare const toScheduleJournalEntryStatusCodeType: (v: string) => "pending" | "posted" | "canceled" | "unknown" | "recorded";
 export type ScheduleJournalEntryStatusCodeType = ReturnType<typeof toScheduleJournalEntryStatusCodeType>;
 export declare const toScheduleStatusCodeType: (v: string) => "draft" | "completed" | "new" | "ongoing" | "marked_as_completed";
 export type ScheduleStatusCodeType = ReturnType<typeof toScheduleStatusCodeType>;

package/lib/entity/jeSchedules/jeSchedulesTypes.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toJournalEntryErrorCodeType = exports.toScheduleStatusCodeType = exports.toScheduleJournalEntryStatusCodeType = exports.toScheduleTypesTypeStrict = exports.toScheduleTypesType = exports.ALL_SCHEDULES_TYPES = exports.getJEScheduleTransactionKey = void 0;
+exports.toJournalEntryErrorCodeType = exports.toScheduleStatusCodeType = exports.toScheduleJournalEntryStatusCodeType = exports.toScheduleTypesTypeStrict = exports.toScheduleTypesType = exports.ALL_SCHEDULES_TYPES = void 0;
 const stringToUnion_1 = require("../../commonStateTypes/stringToUnion");
-const getJEScheduleTransactionKey = (scheduleTransactionId) => `${scheduleTransactionId.id}_${scheduleTransactionId.type}_${scheduleTransactionId.lineId}`;
-exports.getJEScheduleTransactionKey = getJEScheduleTransactionKey;
 exports.ALL_SCHEDULES_TYPES = [
     'prepaid_expenses',
     'fixed_assets',

package/lib/entity/transaction/payloadTypes/transactionPayload.d.ts

@@ -33,6 +33,9 @@ export interface TransactionPayload extends TransactionIDPayload, AccountBasePay
     recipient_total_amount?: number;
     recommendations?: RecommendationPayload[];
     sync_token?: string;
+    target_account_id?: string | null;
+    target_account_integration_id?: string | null;
+    target_account_name?: string | null;
     total_amount?: number;
     transaction_type_name?: string;
     transaction_update_time?: string;

package/lib/entity/transaction/payloadTypes/transactionPayload.js

@@ -65,6 +65,17 @@ const toTransaction = (payload) => {
         ...(payload.customer_name !== null && payload.customer_name !== ''
             ? { customerName: payload.customer_name }
             : {}),
+        ...(payload.target_account_id !== null && payload.target_account_id !== ''
+            ? { targetAccountId: payload.target_account_id }
+            : {}),
+        ...(payload.target_account_integration_id !== null &&
+            payload.target_account_integration_id !== ''
+            ? { targetAccountIntegrationId: payload.target_account_integration_id }
+            : {}),
+        ...(payload.target_account_name !== null &&
+            payload.target_account_name !== ''
+            ? { targetAccountName: payload.target_account_name }
+            : {}),
         linkedTransactions: payload.linked_transactions?.map((transactionIDPayload) => (0, transactionIDPayload_1.toTransactionID)(transactionIDPayload)),
         lines: payload?.lines?.map((linePayload) => (0, transactionLinePayload_1.toLine)(linePayload, amount, recipientAmount)),
         account: payloadHasAccountInfo(payload)

package/lib/entity/transaction/stateTypes/transaction.d.ts

@@ -40,6 +40,9 @@ export interface Transaction extends BaseTransaction {
     qboId?: string;
     recommendations?: RecommendationByLineId;
     syncToken?: string;
+    targetAccountId?: ID;
+    targetAccountIntegrationId?: string;
+    targetAccountName?: string;
     updateTime?: ZeniDate;
     vendorId?: ID;
     vendorName?: string;

package/lib/entity/transaction/transactionReducer.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearAllTransactions = exports.updateTransactionIsMiscategorized = exports.removeTransactionAttachment = exports.removeTransactionCategorization = exports.removeTransaction = exports.updateMultipleReconcileTransactions = exports.updateReconcileTransactions = exports.updateScheduleTransactions = exports.updateTransaction = exports.updateTransactions = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const assignWith_1 = __importDefault(require("lodash/assignWith"));
-const jeSchedulesTypes_1 = require("../jeSchedules/jeSchedulesTypes");
+const transactionDetailState_1 = require("../../view/transactionDetail/transactionDetailState");
 const reconciliationTransactionPayloads_1 = require("./payloadTypes/reconciliationTransactionPayloads");
 const scheduleTransactionPayload_1 = require("./payloadTypes/scheduleTransactionPayload");
 const transactionType_1 = require("./stateTypes/transactionType");
@@ -75,10 +75,9 @@ const transaction = (0, toolkit_1.createSlice)({
         updateScheduleTransactions: {
             reducer(draft, action) {
                 action.payload.transactionsPayload.forEach((value) => {
-                    const id = (0, jeSchedulesTypes_1.getJEScheduleTransactionKey)({
+                    const id = (0, transactionDetailState_1.getZeniTransactionDetailKey)({
                         id: value.transaction_id,
                         type: (0, transactionType_1.toTransactionType)(value.transaction_type),
-                        lineId: value.line_id,
                     });
                     doUpdateScheduleTransaction(draft.scheduleTransactionById, id, value, action.payload.currencyCode, action.payload.currencySymbol, action.meta.updateType);
                 });

package/lib/entity/transaction/transactionSelector.d.ts

@@ -1,9 +1,9 @@
 import { ID } from '../../commonStateTypes/common';
-import { JEScheduleTransactionKey } from '../jeSchedules/jeSchedulesTypes';
+import { TransactionDetailKey } from '../../view/transactionDetail/transactionDetailState';
 import { MatchedTransaction } from './stateTypes/reconciliationTransaction';
 import { ScheduleTransaction } from './stateTypes/scheduleTransaction';
 import { SupportedTransaction, TransactionState } from './transactionState';
-export declare function getScheduleTransactionById(transactionState: TransactionState, transactionId: JEScheduleTransactionKey): ScheduleTransaction | undefined;
+export declare function getScheduleTransactionById(transactionState: TransactionState, transactionId: TransactionDetailKey): ScheduleTransaction | undefined;
 export declare function getSupportedTransactionById(transactionState: TransactionState, transactionId: ID): SupportedTransaction | undefined;
 export declare function getSupportedTransactionsByIds(transactionState: TransactionState, transactionIds: ID[]): SupportedTransaction[];
 export declare function getMatchedTransactionById(transactionState: TransactionState, transactionId: ID): MatchedTransaction | undefined;

package/lib/entity/transaction/transactionState.d.ts

@@ -1,6 +1,5 @@
 import { ID } from '../../commonStateTypes/common';
-import { TransactionDetailKey } from '../../view/transactionDetail/transactionDetailState';
-import { JEScheduleTransactionKey } from '../jeSchedules/jeSchedulesTypes';
+import { TransactionDetailKey, ZeniTransactionDetailKey } from '../../view/transactionDetail/transactionDetailState';
 import { CustomerTransactionPayload } from './payloadTypes/customerTransactionPayload';
 import { TransactionPayload } from './payloadTypes/transactionPayload';
 import { VendorTransactionPayload, VendorTransactionWithCustomerPayload } from './payloadTypes/vendorTransactionPayload';
@@ -15,6 +14,6 @@ export type SupportedTransactionPayload = TransactionPayload | CustomerTransacti
 export type AllSupportedTransactions = SupportedTransaction | undefined;
 export interface TransactionState {
     reconcileTransactionById: Record<ID, MatchedTransaction>;
-    scheduleTransactionById: Record<JEScheduleTransactionKey, ScheduleTransaction>;
+    scheduleTransactionById: Record<ZeniTransactionDetailKey, ScheduleTransaction>;
     transactionById: Record<ID | TransactionDetailKey, SupportedTransaction | undefined>;
 }

package/lib/esm/entity/jeSchedules/jeSchedulesPayload.js

@@ -1,9 +1,10 @@
 import { toAmount } from '../../commonStateTypes/amount';
 import { LAST_SCHEDULE_DAY_OF_MONTH, MAX_SCHEDULE_DAY_OF_MONTH, MIN_SCHEDULE_DAY_OF_MONTH, toScheduleDaysOfMonth, } from '../../commonStateTypes/timePeriod';
+import { getZeniTransactionDetailKey } from '../../view/transactionDetail/transactionDetailState';
 import { date } from '../../zeniDayJS';
 import { toTransactionID, } from '../transaction/payloadTypes/transactionIDPayload';
 import { generateJEScheduleKey } from './jeScheduleHelper';
-import { getJEScheduleTransactionKey, toJournalEntryErrorCodeType, toScheduleJournalEntryStatusCodeType, toScheduleStatusCodeType, toScheduleTypesTypeStrict, } from './jeSchedulesTypes';
+import { toJournalEntryErrorCodeType, toScheduleJournalEntryStatusCodeType, toScheduleStatusCodeType, toScheduleTypesTypeStrict, } from './jeSchedulesTypes';
 export function toScheduledJournalEntryState(payload, currency_code, currency_symbol) {
     return {
         status: {
@@ -121,12 +122,9 @@ export function toJEClassPayload(payload, type) {
             : undefined;
     }
 }
-export function getJEScheduleTransactionDetailKeyPayload(payload) {
+export function getTransactionDetailKeyPayload(payload) {
     const transactionId = toTransactionID(payload);
-    return getJEScheduleTransactionKey({
-        ...transactionId,
-        lineId: payload.line_id,
-    });
+    return getZeniTransactionDetailKey(transactionId);
 }
 export function getJEScheduleKey(payload) {
     return generateJEScheduleKey(payload);
@@ -147,10 +145,7 @@ export function toJEScheduledTransaction(payload) {
             label: payload.status.label,
         },
         vendorId: payload.vendor.vendor_id,
-        baseTransaction: getJEScheduleTransactionKey({
-            ...toTransactionID(payload.base_transaction),
-            lineId: payload.base_transaction.line_id,
-        }),
+        baseTransaction: getTransactionDetailKeyPayload(payload.base_transaction),
         startDate: payload.start_date != null ? date(payload.start_date) : undefined,
         endDate: payload.end_date != null ? date(payload.end_date) : undefined,
         period: payload.period != null ? Number(payload.period) : undefined,

package/lib/esm/entity/jeSchedules/jeSchedulesReducer.js

@@ -1,6 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import assignWith from 'lodash/assignWith';
-import { getJEScheduleKey, getJEScheduleTransactionDetailKeyPayload, toJEAccruedScheduledTransaction, toJEScheduledTransaction, toScheduledJournalEntryState, } from './jeSchedulesPayload';
+import { getJEScheduleKey, getTransactionDetailKeyPayload, toJEAccruedScheduledTransaction, toJEScheduledTransaction, toScheduledJournalEntryState, } from './jeSchedulesPayload';
 export const initialState = {
     schedulesByTransactionKey: {},
     schedulesByAccruedJEScheduleKey: {},
@@ -35,7 +35,7 @@ const jeSchedules = createSlice({
         },
         updateJEScheduledTransaction: (draft, action) => {
             action.payload.jeSchedulesTransactionsPayload.forEach((schedule) => {
-                doUpdateJEScheduledTransaction(draft.schedulesByTransactionKey, getJEScheduleTransactionDetailKeyPayload(schedule.base_transaction), schedule, 'merge');
+                doUpdateJEScheduledTransaction(draft.schedulesByTransactionKey, getTransactionDetailKeyPayload(schedule.base_transaction), schedule, 'merge');
             });
         },
         updateAccruedJEScheduledTransaction: (draft, action) => {
@@ -77,7 +77,7 @@ const jeSchedules = createSlice({
                 if (jeSchedulesPayload.length > 0) {
                     jeSchedulesPayload.forEach((jeSchedulePayload) => {
                         const transactionKey = jeSchedulePayload.base_transaction;
-                        doUpdateScheduledDetailTransaction(draft.schedulesByTransactionKey, getJEScheduleTransactionDetailKeyPayload(transactionKey), jeSchedulePayload, action.payload.scheduledJEntriesPayload ?? [], updateType);
+                        doUpdateScheduledDetailTransaction(draft.schedulesByTransactionKey, getTransactionDetailKeyPayload(transactionKey), jeSchedulePayload, action.payload.scheduledJEntriesPayload ?? [], updateType);
                     });
                 }
             },

package/lib/esm/entity/jeSchedules/jeSchedulesTypes.js

@@ -1,5 +1,4 @@
 import { stringToUnion, stringToUnionStrict, } from '../../commonStateTypes/stringToUnion';
-export const getJEScheduleTransactionKey = (scheduleTransactionId) => `${scheduleTransactionId.id}_${scheduleTransactionId.type}_${scheduleTransactionId.lineId}`;
 export const ALL_SCHEDULES_TYPES = [
     'prepaid_expenses',
     'fixed_assets',

package/lib/esm/entity/transaction/payloadTypes/transactionPayload.js

@@ -61,6 +61,17 @@ export const toTransaction = (payload) => {
         ...(payload.customer_name !== null && payload.customer_name !== ''
             ? { customerName: payload.customer_name }
             : {}),
+        ...(payload.target_account_id !== null && payload.target_account_id !== ''
+            ? { targetAccountId: payload.target_account_id }
+            : {}),
+        ...(payload.target_account_integration_id !== null &&
+            payload.target_account_integration_id !== ''
+            ? { targetAccountIntegrationId: payload.target_account_integration_id }
+            : {}),
+        ...(payload.target_account_name !== null &&
+            payload.target_account_name !== ''
+            ? { targetAccountName: payload.target_account_name }
+            : {}),
         linkedTransactions: payload.linked_transactions?.map((transactionIDPayload) => toTransactionID(transactionIDPayload)),
         lines: payload?.lines?.map((linePayload) => toLine(linePayload, amount, recipientAmount)),
         account: payloadHasAccountInfo(payload)

package/lib/esm/entity/transaction/transactionReducer.js

@@ -1,6 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import assignWith from 'lodash/assignWith';
-import { getJEScheduleTransactionKey, } from '../jeSchedules/jeSchedulesTypes';
+import { getZeniTransactionDetailKey, } from '../../view/transactionDetail/transactionDetailState';
 import { toMatchedTransaction, } from './payloadTypes/reconciliationTransactionPayloads';
 import { toScheduleTransaction, } from './payloadTypes/scheduleTransactionPayload';
 import { toTransactionType } from './stateTypes/transactionType';
@@ -68,10 +68,9 @@ const transaction = createSlice({
         updateScheduleTransactions: {
             reducer(draft, action) {
                 action.payload.transactionsPayload.forEach((value) => {
-                    const id = getJEScheduleTransactionKey({
+                    const id = getZeniTransactionDetailKey({
                         id: value.transaction_id,
                         type: toTransactionType(value.transaction_type),
-                        lineId: value.line_id,
                     });
                     doUpdateScheduleTransaction(draft.scheduleTransactionById, id, value, action.payload.currencyCode, action.payload.currencySymbol, action.meta.updateType);
                 });

package/lib/esm/index.js

@@ -50,7 +50,7 @@ import { getForecast } from './entity/forecast/forecastSelector';
 import { toEntityType, } from './entity/genericEntity/entity';
 import { clearAllEntities, updateEntities, } from './entity/genericEntity/entityReducer';
 import { getEntityByEntityIDs } from './entity/genericEntity/entitySelector';
-import { ALL_SCHEDULES_TYPES, getJEScheduleTransactionKey, toScheduleTypesType, toScheduleTypesTypeStrict, } from './entity/jeSchedules/jeSchedulesTypes';
+import { ALL_SCHEDULES_TYPES, toScheduleTypesType, toScheduleTypesTypeStrict, } from './entity/jeSchedules/jeSchedulesTypes';
 import { ALL_MONTH_END_CLOSE_CHECKS_FREQUENCY, } from './entity/monthEndCloseChecks/monthEndCloseChecksState';
 import { updateCommentsNotifications, updateCommentsNotificationsStatuses, } from './entity/notification/notificationReducer';
 import { toNotificationModeStrict, } from './entity/notification/types/notificationTypes';
@@ -578,7 +578,7 @@ export { fetchApAging, getApAgingReport, updateApAgingUIState, };
 export { fetchApAgingDetail, getApAgingDetailForVendor, updateApAgingDetailUIState, };
 export { clearExpenseAutomationJEScheduleLocalData, clearExpenseAutomationJESchedulesView, fetchExpenseAutomationJESchedulesPage, ignoreExpenseAutomationJESchedule, initializeJeAccountSettingsView, initializeJeScheduleLocalData, removeJeScheduleTransactionKey, retryExpenseAutomationJESchedule, updateJeScheduleLocalDataById, updateJeScheduleTransactionKeys, };
 export { createNewSchedulesAccrued, deleteScheduleAccruedDetail, cancelScheduleAccruedJournalEntry, fetchScheduleAccruedDetails, fetchScheduleAccruedDetailsPage, resetJEAccruedLinkInLocalData, saveScheduleAccruedDetails, updateAmountsInScheduleAccruedDetail, updatedJEAccruedLinkWithRecommendedLocalData, updatedJELinkInLocalDataAccruedExpenses, fetchRecommendedTransactionRowIndex, clearSelectedJELinkRowIndex, updateLinkBillExpenseLocalData, updateScheduleAccruedDetailsLocalData, updateSelectedJEAccruedScheduleKey, resetSelectedJEAccruedScheduleKey, resetAccruedDetailNewScheduleState, };
-export { getJEScheduleTransactionKey, ALL_SCHEDULES_TYPES, getScheduleListReport, getAccruedScheduleListReport, fetchScheduleList, fetchAccruedScheduleList, fetchDownloadSchedules, fetchSchedulesAccount, updateScheduleListLocalData, getFetchStateForScheduleAccountList, toScheduleTypesType, toScheduleTypesTypeStrict, toScheduleListTabsFileTypeStrict, toScheduleSubTabType, updateScheduleListSubTab, updateScheduleListSearchText, updateScheduleListScrollState, updateScheduleListSortState, updateSelectedJEScheduleKey, fetchScheduleDetails, getScheduleDetailsView, getAccruedScheduleDetailsView, fetchScheduleDetailsPage, saveScheduleDetails, deleteScheduleDetail, createNewSchedules, updateScheduleDetailsLocalData, updateScheduleListDownloadState, updateAccruedJEScheduleAccruedByListKey, updatedSelectedJELinkRowIndex, getQBOUrlForLink, getThirdPartyIDFromQBOURL, updatedJELinkInLocalData, updateAmountsInScheduleDetail, resetJELinkInLocalData, updatedJELinkWithRecommendedLocalData, getFetchStateForScheduleListByType, getDefaultSelectedTimeframeForScheduleType, markAsCompleteScheduleDetail, resetMarkAsCompleteStatus, fetchVendorTabView, updateVendorTabViewTab, getVendorTabView, };
+export { ALL_SCHEDULES_TYPES, getScheduleListReport, getAccruedScheduleListReport, fetchScheduleList, fetchAccruedScheduleList, fetchDownloadSchedules, fetchSchedulesAccount, updateScheduleListLocalData, getFetchStateForScheduleAccountList, toScheduleTypesType, toScheduleTypesTypeStrict, toScheduleListTabsFileTypeStrict, toScheduleSubTabType, updateScheduleListSubTab, updateScheduleListSearchText, updateScheduleListScrollState, updateScheduleListSortState, updateSelectedJEScheduleKey, fetchScheduleDetails, getScheduleDetailsView, getAccruedScheduleDetailsView, fetchScheduleDetailsPage, saveScheduleDetails, deleteScheduleDetail, createNewSchedules, updateScheduleDetailsLocalData, updateScheduleListDownloadState, updateAccruedJEScheduleAccruedByListKey, updatedSelectedJELinkRowIndex, getQBOUrlForLink, getThirdPartyIDFromQBOURL, updatedJELinkInLocalData, updateAmountsInScheduleDetail, resetJELinkInLocalData, updatedJELinkWithRecommendedLocalData, getFetchStateForScheduleListByType, getDefaultSelectedTimeframeForScheduleType, markAsCompleteScheduleDetail, resetMarkAsCompleteStatus, fetchVendorTabView, updateVendorTabViewTab, getVendorTabView, };
 export { toVendorFirstReviewViewColumnKeyType, getGlobalMerchantAutoCompleteResults, getVendorFirstReviewView, getVendorFirstReviewAttachmentView, fetchVendorFirstReviewView, fetchVendorFirstReviewAttachments, updateVendorFirstReviewViewScrollYOffset, resetVendorFirstReviewLocalData, updateVendorFirstReviewViewPageToken, clearRecentlySavedErroredVendorData, saveVendorFirstReviewView, updateVendorFirstReviewViewLocalData, updateVendorFirstReviewSortUiState, fetchGlobalMerchantAutoCompleteView, clearGlobalMerchantAutoCompleteResults, updateReviewVendorDetailLocalData, saveVendorDetailsView, getVendorDetailSelectorView, };
 export { fetchGlobalMerchantRecommendation, createGlobalMerchant, updateCreateGlobalMerchantLocalData, clearGlobalMerchantView, getGlobalMerchantView, };
 export { approveVendorGlobalReview, rejectVendorGlobalReview, fetchVendorGlobalReviewView, updateSelectedGlobalMerchant, updateVendorGlobalReviewViewUIState, getVendorGlobalReviewView, getTenantMerchantByMerchantId, toVendorGlobalReviewColumnSortKeyType, updateVendorGlobalReviewViewLocalData, };

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

@@ -2,8 +2,10 @@ import { createSlice } from '@reduxjs/toolkit';
 import { geNestedAccountIDHierarchyForReport } from '../../../commonStateTypes/accountView/getNestedAccountIDHierarchyForReport';
 import { toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { mapAccountBasePayloadToAccountBase, mapAccountMetadataPayloadToAccountMetadata, } from '../../../entity/account/accountPayload';
-import { getJEScheduleTransactionDetailKeyPayload, } from '../../../entity/jeSchedules/jeSchedulesPayload';
+import { getTransactionDetailKeyPayload, } from '../../../entity/jeSchedules/jeSchedulesPayload';
+import { toTransactionID } from '../../../entity/transaction/payloadTypes/transactionIDPayload';
 import { mapAccountTypeRecommendationPayloadToAccountRecommendationByType, } from '../../accountMappingView/accountTypeRecommendation/accountTypeRecommendationPayload';
+import { getZeniTransactionDetailKey } from '../../transactionDetail/transactionDetailState';
 export const accountSettingsInitialState = {
     localData: {
         selectedPrepaidExpensesAccountIds: [],
@@ -97,8 +99,14 @@ const expenseAutomationJESchedulesView = createSlice({
         },
         fetchJeSchedulesSuccess(draft, action) {
             const { jeSchedules, selectedPeriod, failedJeSchedules, refreshViewInBackground, } = action.payload;
-            const jeScheduleTransactionKeys = jeSchedules.map((schedules) => getJEScheduleTransactionDetailKeyPayload(schedules.base_transaction));
-            const failedJeScheduleTransactionKeys = failedJeSchedules.map((schedules) => getJEScheduleTransactionDetailKeyPayload(schedules.base_transaction));
+            const jeScheduleTransactionKeys = jeSchedules.map((schedules) => {
+                const transactionID = toTransactionID(schedules.base_transaction);
+                return getZeniTransactionDetailKey(transactionID);
+            });
+            const failedJeScheduleTransactionKeys = failedJeSchedules.map((schedules) => {
+                const transactionID = toTransactionID(schedules.base_transaction);
+                return getZeniTransactionDetailKey(transactionID);
+            });
             if (refreshViewInBackground === true &&
                 draft.refreshStatus.fetchState === 'In-Progress') {
                 draft.refreshStatus = { fetchState: 'Completed', error: undefined };
@@ -264,7 +272,7 @@ const expenseAutomationJESchedulesView = createSlice({
                 return {
                     payload: {
                         jeScheduleTransactionKeys: [
-                            ...jeSchedules.map((jeSchedule) => getJEScheduleTransactionDetailKeyPayload(jeSchedule.base_transaction)),
+                            ...jeSchedules.map((jeSchedule) => getTransactionDetailKeyPayload(jeSchedule.base_transaction)),
                         ],
                     },
                 };

package/lib/esm/view/scheduleView/scheduleDetailView/epics/fetchScheduleDetailsEpic.js

@@ -1,8 +1,9 @@
 import { from, of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { getJEScheduleTransactionDetailKeyPayload, } from '../../../../entity/jeSchedules/jeSchedulesPayload';
 import { updateJESchedules, updateJESchedulesDetails, } from '../../../../entity/jeSchedules/jeSchedulesReducer';
+import { toTransactionType } from '../../../../entity/transaction/stateTypes/transactionType';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { getZeniTransactionDetailKey } from '../../../transactionDetail/transactionDetailState';
 import { createNewSchedules, fetchScheduleDetails, initializeScheduleDetailLocalData, saveScheduleDetailsSuccessOrFailure, updateScheduleDetailsFailure, updateScheduleDetailsSuccess, updateSelectedJEScheduleKey, } from '../scheduleDetailReducer';
 export const fetchScheduleDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchScheduleDetails.match), mergeMap((action) => {
     const updateActions = [];
@@ -23,7 +24,11 @@ export const fetchScheduleDetailsEpic = (actions$, state$, zeniAPI) => actions$.
             .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules/${selectedJeScheduleDetailId}?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
             .pipe(mergeMap((response) => {
             if (isSuccessResponse(response) && response.data != null) {
-                const selectedJEScheduleKey = getJEScheduleTransactionDetailKeyPayload(response.data.je_schedules[0].base_transaction);
+                const transactionData = response.data.je_schedules[0].base_transaction;
+                const selectedJEScheduleKey = getZeniTransactionDetailKey({
+                    id: transactionData.transaction_id,
+                    type: toTransactionType(transactionData.transaction_type),
+                });
                 updateActions.push(updateJESchedules(response.data.je_schedules), updateSelectedJEScheduleKey({ selectedJEScheduleKey }), updateJESchedulesDetails(response.data.je_schedules, response.data.scheduled_journal_entries), saveScheduleDetailsSuccessOrFailure('Not-Started'), initializeScheduleDetailLocalData(scheduleType, selectedJEScheduleKey, selectedJeScheduleDetailId), updateScheduleDetailsSuccess());
                 if (response.data.je_schedules[0].status.code === 'draft' &&
                     isCompleteJEScheduleFormDataPresent(response.data.je_schedules[0])) {

package/lib/esm/view/scheduleView/scheduleListView/scheduleListReducer.js

@@ -1,5 +1,7 @@
 import { createSlice } from '@reduxjs/toolkit';
-import { getJEScheduleKey, getJEScheduleTransactionDetailKeyPayload, } from '../../../entity/jeSchedules/jeSchedulesPayload';
+import { getJEScheduleKey, } from '../../../entity/jeSchedules/jeSchedulesPayload';
+import { toTransactionID } from '../../../entity/transaction/payloadTypes/transactionIDPayload';
+import { getZeniTransactionDetailKey } from '../../transactionDetail/transactionDetailState';
 import { getDefaultSelectedTimeframeForScheduleType } from './scheduleListHelper';
 import { getScheduleListKey, } from './scheduleListTypes';
 export const initialUIState = {
@@ -377,7 +379,10 @@ export default scheduleListView.reducer;
 function doUpdateScheduleList(draft, payload, scheduleType, selectedTimeframe, selectedCategoryId) {
     if (scheduleType !== 'accrued_expenses') {
         const state = getState(draft, scheduleType);
-        const jeScheduleTransactionKeys = payload.map((schedules) => getJEScheduleTransactionDetailKeyPayload(schedules.base_transaction));
+        const jeScheduleTransactionKeys = payload.map((schedules) => {
+            const transactionID = toTransactionID(schedules.base_transaction);
+            return getZeniTransactionDetailKey(transactionID);
+        });
         state.selectedCategoryId = selectedCategoryId;
         state.selectedTimeframe = selectedTimeframe;
         const key = getScheduleListKey(selectedCategoryId, selectedTimeframe);

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

@@ -416,6 +416,14 @@ export 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) {
@@ -518,6 +526,8 @@ export 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/esm/view/spendManagement/billPay/billList/billListState.js

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

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

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

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

@@ -219,6 +219,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/esm/view/spendManagement/reimbursement/remiListView/remiListSelector.js

@@ -45,6 +45,7 @@ export const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled
         return {
             ...reimbursement,
             submittedBy: getUserByUserId(userState, reimbursement.reimburseeUserId),
+            createdByUser: getUserByUserId(userState, reimbursement.createdBy),
             approvers: approvers,
         };
     });
@@ -415,6 +416,14 @@ export 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) => {
@@ -422,6 +431,7 @@ export 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';
@@ -441,6 +451,8 @@ export 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/esm/view/spendManagement/reimbursement/remiListView/remiListState.js

@@ -55,6 +55,7 @@ export const toRemiSubTabUnderScoreType = (v) => stringToUnion(v, REMI_SUB_TAB_U
 const ALL_REIMBURSEMENT_SORT_KEYS = [
     'reportName',
     'submittedOn',
+    'createdBy',
     'type',
     'status',
     'amount',

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

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