@zeniai/client-epic-state 5.2.11-betaRD7 → 5.2.11-betaRD8

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

@@ -142,6 +142,7 @@ export interface JEOneTimeAccrualPayload {
     created_by_user?: UserPayload | null;
     currency?: string | null;
     expected_reversal_date?: string | null;
+    is_ignored?: boolean;
     je_credit_account_id?: ID | null;
     je_credit_account_name?: string | null;
     je_credit_accounting_class_id?: ID | null;

package/lib/entity/jeSchedules/jeSchedulesPayload.js

@@ -347,17 +347,20 @@ function toJEAccruedScheduledTransaction(payload) {
             label: payload.status.label,
         },
         vendorId: payload.vendor.vendor_id,
+        // The accrued payload extends JEScheduledTransactionPayload, so it carries currency_code and
+        // currency_symbol like every other schedule -- this mapper was hardcoding USD over fields it
+        // already had.
         recurringAmount: {
             amount: payload.recurring_amount,
-            currencyCode: 'USD',
-            currencySymbol: '$',
+            currencyCode: payload.currency_code,
+            currencySymbol: payload.currency_symbol,
         },
         otherAttributes: {
             startingBalance: payload.other_attributes?.starting_balance != null
                 ? {
                     amount: payload.other_attributes?.starting_balance ?? 0,
-                    currencyCode: 'USD',
-                    currencySymbol: '$',
+                    currencyCode: payload.currency_code,
+                    currencySymbol: payload.currency_symbol,
                 }
                 : undefined,
         },
@@ -466,6 +469,7 @@ function toJEOneTimeAccrual(payload) {
         estimatedAmount: toOneTimeAccrualAmount(payload.estimated_amount, payload.currency),
         memo: payload.memo ?? '',
         profileSnapshot: toJEOneTimeAccrualProfileSnapshot(payload.profile_snapshot, payload.currency),
+        isIgnored: payload.is_ignored === true,
         aiSuggestion: toJEOneTimeAccrualAiSuggestion(payload.ai_suggestion, payload.currency),
         // Exclusive by contract: a scheduled row reverses on expectedReversalDate and bills never
         // drive it, so the two never need reconciling. Defaulting to on_bill_match matches the

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

@@ -201,6 +201,11 @@ export interface JEOneTimeAccrualState {
     accrualId: ID;
     accrualStatus: OneTimeAccrualStatusCodeType;
     estimatedAmount: Amount;
+    /**
+     * Ignoring an accrual sets this flag and leaves the status on `draft`, so the status alone cannot
+     * tell an ignored row from an actionable one.
+     */
+    isIgnored: boolean;
     memo: string;
     origin: OneTimeAccrualOriginType;
     reversalPolicy: OneTimeAccrualReversalPolicyType;

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

@@ -15,7 +15,7 @@ export declare const toScheduleJournalEntryStatusCodeType: (v: string) => "unkno
 export type ScheduleJournalEntryStatusCodeType = ReturnType<typeof toScheduleJournalEntryStatusCodeType>;
 export declare const toScheduleStatusCodeType: (v: string) => "completed" | "draft" | "new" | "ongoing" | "marked_as_completed";
 export type ScheduleStatusCodeType = ReturnType<typeof toScheduleStatusCodeType>;
-export declare const toOneTimeAccrualStatusCodeType: (v: string) => "draft" | "posted" | "posting" | "posting_blocked" | "reversing" | "reversed";
+export declare const toOneTimeAccrualStatusCodeType: (v: string) => "draft" | "posted" | "posting" | "posting_blocked" | "reversing" | "reversed" | "reverted";
 export type OneTimeAccrualStatusCodeType = ReturnType<typeof toOneTimeAccrualStatusCodeType>;
 export declare const toOneTimeAccrualOriginType: (v: string) => "agent" | "human";
 export type OneTimeAccrualOriginType = ReturnType<typeof toOneTimeAccrualOriginType>;

package/lib/entity/jeSchedules/jeSchedulesTypes.js

@@ -35,6 +35,13 @@ exports.toScheduleStatusCodeType = toScheduleStatusCodeType;
 // One-time accruals come from agent-je's Mongo `accruals` collection, not the JE schedule
 // datastore, so they carry their own status vocabulary rather than SCHEDULE_STATUS_CODE.
 // `posting` and `reversing` are transient claims held while a JE posts.
+/**
+ * Mirrors agent-je's own status constants. `reverted` is the terminal state a manual revert writes
+ * alongside is_deleted; without it stringToUnion logs an error and passes the raw string through.
+ *
+ * There is deliberately no `ignored` member -- ignoring an accrual sets the `is_ignored` flag and
+ * leaves the status on `draft`.
+ */
 const ONE_TIME_ACCRUAL_STATUS_CODE = [
     'draft',
     'posting',
@@ -42,6 +49,7 @@ const ONE_TIME_ACCRUAL_STATUS_CODE = [
     'posting_blocked',
     'reversing',
     'reversed',
+    'reverted',
 ];
 const toOneTimeAccrualStatusCodeType = (v) => (0, stringToUnion_1.stringToUnion)(v, ONE_TIME_ACCRUAL_STATUS_CODE);
 exports.toOneTimeAccrualStatusCodeType = toOneTimeAccrualStatusCodeType;

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

@@ -336,17 +336,20 @@ export function toJEAccruedScheduledTransaction(payload) {
             label: payload.status.label,
         },
         vendorId: payload.vendor.vendor_id,
+        // The accrued payload extends JEScheduledTransactionPayload, so it carries currency_code and
+        // currency_symbol like every other schedule -- this mapper was hardcoding USD over fields it
+        // already had.
         recurringAmount: {
             amount: payload.recurring_amount,
-            currencyCode: 'USD',
-            currencySymbol: '$',
+            currencyCode: payload.currency_code,
+            currencySymbol: payload.currency_symbol,
         },
         otherAttributes: {
             startingBalance: payload.other_attributes?.starting_balance != null
                 ? {
                     amount: payload.other_attributes?.starting_balance ?? 0,
-                    currencyCode: 'USD',
-                    currencySymbol: '$',
+                    currencyCode: payload.currency_code,
+                    currencySymbol: payload.currency_symbol,
                 }
                 : undefined,
         },
@@ -455,6 +458,7 @@ export function toJEOneTimeAccrual(payload) {
         estimatedAmount: toOneTimeAccrualAmount(payload.estimated_amount, payload.currency),
         memo: payload.memo ?? '',
         profileSnapshot: toJEOneTimeAccrualProfileSnapshot(payload.profile_snapshot, payload.currency),
+        isIgnored: payload.is_ignored === true,
         aiSuggestion: toJEOneTimeAccrualAiSuggestion(payload.ai_suggestion, payload.currency),
         // Exclusive by contract: a scheduled row reverses on expectedReversalDate and bills never
         // drive it, so the two never need reconciling. Defaulting to on_bill_match matches the

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

@@ -27,6 +27,13 @@ export const toScheduleStatusCodeType = (v) => stringToUnion(v, SCHEDULE_STATUS_
 // One-time accruals come from agent-je's Mongo `accruals` collection, not the JE schedule
 // datastore, so they carry their own status vocabulary rather than SCHEDULE_STATUS_CODE.
 // `posting` and `reversing` are transient claims held while a JE posts.
+/**
+ * Mirrors agent-je's own status constants. `reverted` is the terminal state a manual revert writes
+ * alongside is_deleted; without it stringToUnion logs an error and passes the raw string through.
+ *
+ * There is deliberately no `ignored` member -- ignoring an accrual sets the `is_ignored` flag and
+ * leaves the status on `draft`.
+ */
 const ONE_TIME_ACCRUAL_STATUS_CODE = [
     'draft',
     'posting',
@@ -34,6 +41,7 @@ const ONE_TIME_ACCRUAL_STATUS_CODE = [
     'posting_blocked',
     'reversing',
     'reversed',
+    'reverted',
 ];
 export const toOneTimeAccrualStatusCodeType = (v) => stringToUnion(v, ONE_TIME_ACCRUAL_STATUS_CODE);
 // Who created the accrual. This — not the creator's email — is the authoritative

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/newSchedule/saveNewScheduleEpic.js

@@ -12,7 +12,9 @@ import { prepareNewSchedulePayload, } from '../../../helpers/newScheduleLocalDat
 import { fetchJeSchedules, resetNewScheduleLocalData, saveNewSchedule, saveNewScheduleFailure, saveNewScheduleSuccess, } from '../../../reducers/jeSchedulesViewReducer';
 const FAILURE_REASON_MESSAGES = {
     missing_third_party_id: 'This transaction is missing a QuickBooks reference and cannot be scheduled.',
-    missing_vendor: 'Select a vendor before saving this schedule.',
+    // The form cannot satisfy this: the vendor field is hard-disabled and inherited from the base
+    // transaction, so the fix is on the transaction, not here.
+    missing_vendor: 'This transaction has no vendor and cannot be scheduled. Add a vendor to the transaction first.',
 };
 export const saveNewScheduleEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveNewSchedule.match), mergeMap((action) => {
     const { scheduleType } = action.payload;

package/lib/esm/view/expenseAutomationView/selectors/jeSchedulesViewSelector.js

@@ -38,7 +38,14 @@ const ONE_TIME_ACCRUAL_REVIEW_STATUSES = [
  * these rows do arrive.
  */
 export function isRenderableOneTimeAccrual(accrual) {
-    return accrual.accrualStatus !== 'posting_blocked';
+    return (accrual.accrualStatus !== 'posting_blocked' &&
+        // Terminal states the user has already decided. The GET list excludes both server-side, so
+        // these only appear in the window between an ignore/revert response being written back and the
+        // background refresh landing -- during which an ignored row would otherwise sit in Pending
+        // Review offering a Post button. Dropped here rather than at render time so group counts and
+        // KPI totals do not count rows nobody can see.
+        accrual.accrualStatus !== 'reverted' &&
+        !accrual.isIgnored);
 }
 export function getJEScheduleRowType(schedule) {
     return isOneTimeAccrualRow(schedule)
@@ -89,6 +96,16 @@ export function isAccruedScheduleRow(schedule) {
 export function isOneTimeAccrualRow(schedule) {
     return 'jeOneTimeAccrualKey' in schedule;
 }
+/** The row's own Amount, so callers can read its currency and not just its value. */
+function getScheduleAmountObject(schedule) {
+    if (isOneTimeAccrualRow(schedule)) {
+        return schedule.estimatedAmount;
+    }
+    if (isAccruedScheduleRow(schedule)) {
+        return schedule.recurringAmount;
+    }
+    return schedule.baseTransaction.amount;
+}
 function getScheduleAmount(schedule) {
     if (isOneTimeAccrualRow(schedule)) {
         return schedule.estimatedAmount.amount;
@@ -307,25 +324,41 @@ export function getExpenseAutomationJESchedulesView(state) {
     const sumAmount = (schedules) => schedules.reduce((total, schedule) => total + (getScheduleAmount(schedule) ?? 0), 0);
     const pendingReviewTotal = sumAmount(pendingReviewSchedules);
     const createdTotal = sumAmount(createdSchedules);
+    /**
+     * The currency the tiles render in. Taken from the schedules themselves rather than assumed:
+     * every row on a tab shares a tenant currency, so the first one that states it is the answer.
+     */
+    const sumToAmount = (schedules) => {
+        const first = schedules[0];
+        const currency = first != null ? getScheduleAmountObject(first) : allScheduleAmountFallback;
+        return {
+            ...currency,
+            amount: sumAmount(schedules),
+        };
+    };
+    // An empty bucket still has to render a currency; borrow it from any row on the page.
+    const allScheduleAmountFallback = allScheduleRows.length > 0
+        ? getScheduleAmountObject(allScheduleRows[0])
+        : { amount: 0, currencyCode: '', currencySymbol: '' };
     const aiAccountantSchedules = allSchedules.filter(isAiAccountantSchedule);
     const manualSchedules = allSchedules.filter((schedule) => !isAiAccountantSchedule(schedule));
     const pendingUnfiltered = allSchedules.filter((schedule) => isPendingReviewRow(schedule));
     const kpiSummary = {
         aiAccountant: {
             count: aiAccountantSchedules.length,
-            amount: sumAmount(aiAccountantSchedules),
+            amount: sumToAmount(aiAccountantSchedules),
         },
         manual: {
             count: manualSchedules.length,
-            amount: sumAmount(manualSchedules),
+            amount: sumToAmount(manualSchedules),
         },
         needsReview: {
             count: pendingUnfiltered.length,
-            amount: sumAmount(pendingUnfiltered),
+            amount: sumToAmount(pendingUnfiltered),
         },
         total: {
             count: allSchedules.length,
-            amount: sumAmount(allSchedules),
+            amount: sumToAmount(allSchedules),
         },
     };
     // Each tab's badge counts from that tab's own bucket. A tab that has not been fetched yet

package/lib/view/expenseAutomationView/epics/jeSchedule/newSchedule/saveNewScheduleEpic.js

@@ -15,7 +15,9 @@ const newScheduleLocalDataHelper_1 = require("../../../helpers/newScheduleLocalD
 const jeSchedulesViewReducer_1 = require("../../../reducers/jeSchedulesViewReducer");
 const FAILURE_REASON_MESSAGES = {
     missing_third_party_id: 'This transaction is missing a QuickBooks reference and cannot be scheduled.',
-    missing_vendor: 'Select a vendor before saving this schedule.',
+    // The form cannot satisfy this: the vendor field is hard-disabled and inherited from the base
+    // transaction, so the fix is on the transaction, not here.
+    missing_vendor: 'This transaction has no vendor and cannot be scheduled. Add a vendor to the transaction first.',
 };
 const saveNewScheduleEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.saveNewSchedule.match), (0, operators_1.mergeMap)((action) => {
     const { scheduleType } = action.payload;

package/lib/view/expenseAutomationView/selectorTypes/jeSchedulesSelectorTypes.d.ts

@@ -1,3 +1,4 @@
+import { Amount } from '../../../commonStateTypes/amount';
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
 import { CompletionStatusType, FetchStateAndError, ID } from '../../../commonStateTypes/common';
@@ -11,21 +12,25 @@ import { JEScheduledTransactionWithFailedEntries } from '../selectors/jeSchedule
 import { NewScheduleView } from '../selectorTypes/jeNewScheduleViewSelectorTypes';
 import { JEScheduleRow } from '../selectors/jeSchedulesViewSelector';
 import { JEPageTab, JEScheduleLocalData, JESchedulesViewUIState } from '../types/jeSchedulesViewState';
+/**
+ * Amount rather than a bare number: the KPI strip formats these for display, and a number carries
+ * no currency, which is what made the tiles print a hardcoded dollar sign.
+ */
 export interface JEKpiSummary {
     aiAccountant: {
-        amount: number;
+        amount: Amount;
         count: number;
     };
     manual: {
-        amount: number;
+        amount: Amount;
         count: number;
     };
     needsReview: {
-        amount: number;
+        amount: Amount;
         count: number;
     };
     total: {
-        amount: number;
+        amount: Amount;
         count: number;
     };
 }

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

@@ -52,7 +52,14 @@ const ONE_TIME_ACCRUAL_REVIEW_STATUSES = [
  * these rows do arrive.
  */
 function isRenderableOneTimeAccrual(accrual) {
-    return accrual.accrualStatus !== 'posting_blocked';
+    return (accrual.accrualStatus !== 'posting_blocked' &&
+        // Terminal states the user has already decided. The GET list excludes both server-side, so
+        // these only appear in the window between an ignore/revert response being written back and the
+        // background refresh landing -- during which an ignored row would otherwise sit in Pending
+        // Review offering a Post button. Dropped here rather than at render time so group counts and
+        // KPI totals do not count rows nobody can see.
+        accrual.accrualStatus !== 'reverted' &&
+        !accrual.isIgnored);
 }
 function getJEScheduleRowType(schedule) {
     return isOneTimeAccrualRow(schedule)
@@ -104,6 +111,16 @@ function isAccruedScheduleRow(schedule) {
 function isOneTimeAccrualRow(schedule) {
     return 'jeOneTimeAccrualKey' in schedule;
 }
+/** The row's own Amount, so callers can read its currency and not just its value. */
+function getScheduleAmountObject(schedule) {
+    if (isOneTimeAccrualRow(schedule)) {
+        return schedule.estimatedAmount;
+    }
+    if (isAccruedScheduleRow(schedule)) {
+        return schedule.recurringAmount;
+    }
+    return schedule.baseTransaction.amount;
+}
 function getScheduleAmount(schedule) {
     if (isOneTimeAccrualRow(schedule)) {
         return schedule.estimatedAmount.amount;
@@ -322,25 +339,41 @@ function getExpenseAutomationJESchedulesView(state) {
     const sumAmount = (schedules) => schedules.reduce((total, schedule) => total + (getScheduleAmount(schedule) ?? 0), 0);
     const pendingReviewTotal = sumAmount(pendingReviewSchedules);
     const createdTotal = sumAmount(createdSchedules);
+    /**
+     * The currency the tiles render in. Taken from the schedules themselves rather than assumed:
+     * every row on a tab shares a tenant currency, so the first one that states it is the answer.
+     */
+    const sumToAmount = (schedules) => {
+        const first = schedules[0];
+        const currency = first != null ? getScheduleAmountObject(first) : allScheduleAmountFallback;
+        return {
+            ...currency,
+            amount: sumAmount(schedules),
+        };
+    };
+    // An empty bucket still has to render a currency; borrow it from any row on the page.
+    const allScheduleAmountFallback = allScheduleRows.length > 0
+        ? getScheduleAmountObject(allScheduleRows[0])
+        : { amount: 0, currencyCode: '', currencySymbol: '' };
     const aiAccountantSchedules = allSchedules.filter(exports.isAiAccountantSchedule);
     const manualSchedules = allSchedules.filter((schedule) => !(0, exports.isAiAccountantSchedule)(schedule));
     const pendingUnfiltered = allSchedules.filter((schedule) => isPendingReviewRow(schedule));
     const kpiSummary = {
         aiAccountant: {
             count: aiAccountantSchedules.length,
-            amount: sumAmount(aiAccountantSchedules),
+            amount: sumToAmount(aiAccountantSchedules),
         },
         manual: {
             count: manualSchedules.length,
-            amount: sumAmount(manualSchedules),
+            amount: sumToAmount(manualSchedules),
         },
         needsReview: {
             count: pendingUnfiltered.length,
-            amount: sumAmount(pendingUnfiltered),
+            amount: sumToAmount(pendingUnfiltered),
         },
         total: {
             count: allSchedules.length,
-            amount: sumAmount(allSchedules),
+            amount: sumToAmount(allSchedules),
         },
     };
     // Each tab's badge counts from that tab's own bucket. A tab that has not been fetched yet

package/package.json

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