@zeniai/client-epic-state 5.0.82-betaAK4 → 5.0.82-betaAK6

package/lib/esm/view/spendManagement/autotransferRules/autoTransferRulesSelector.js

@@ -3,9 +3,50 @@ import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState'
 import { getAllFundingAccounts, } from '../commonSetup/setupViewSelector';
 import { getAllDepositAccounts } from '../zeniAccounts/depositAccountList/depositAccountListSelector';
 import { getAllPaymentAccounts } from '../zeniAccounts/paymentAccountList/paymentAccountListSelector';
+/**
+ * Lifts an `AutoSweepFlowState` into an `AutoTransferRule` so the auto-sweep
+ * config surfaces alongside the user's other auto-transfer rules.
+ *
+ * Mapping notes:
+ *   - `autoTransferRuleId` reuses `settingsId` from the cash-management
+ *     settings record. (Different system, but it's the closest stable id we
+ *     have. Returns `undefined` when no settings have been saved yet.)
+ *   - `'biweekly'` collapses to `'weekly'` — `AutoTransferRuleFrequency`
+ *     doesn't model biweekly.
+ *   - `ruleType` is fixed to `'cash_management'` so the rules-list UI can
+ *     special-case the row (icon, title, action menu) without confusing it
+ *     for a regular recurring rule.
+ *   - Destination is the singleton treasury account, so the id is `null` and
+ *     the type is `'treasury_account'`.
+ */
+export const mapAutoSweepFlowStateToAutoTransferRule = (state) => {
+    if (state.settingsId == null) {
+        return undefined;
+    }
+    return {
+        amount: state.bufferAmount.amount,
+        autoTransferRuleId: state.settingsId,
+        currencyCode: state.bufferAmount.currencyCode,
+        currencySymbol: state.bufferAmount.currencySymbol,
+        destinationBankAccountId: null,
+        destinationBankAccountType: 'treasury_account',
+        frequency: state.frequency === 'biweekly' ? 'weekly' : state.frequency,
+        isActive: true,
+        isDeleted: false,
+        lastRunTime: null,
+        ruleType: 'cash_management',
+        sourceBankAccountId: state.primaryFundingAccountId ?? '',
+        sourceBankAccountType: 'deposit_account',
+    };
+};
 export const getAutoTransferRules = (state) => {
-    const { autotransferRulesState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, treasuryDetailState, } = state;
+    const { autotransferRulesState, autoSweepFlowState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, treasuryDetailState, } = state;
     const { rules, error, historyByRuleId, ruleUpdateLocalData, ruleUpdateStatusById, ruleDeleteStatusById, createRuleFetchState, autoTransferReviewDetail, } = autotransferRulesState;
+    // Surface the auto-sweep config as an additional rule alongside the
+    // server-returned rules. Only present when a `settingsId` has been
+    // assigned (i.e. the user has saved auto-sweep at least once).
+    const autoSweepRule = mapAutoSweepFlowStateToAutoTransferRule(autoSweepFlowState);
+    const mergedRules = autoSweepRule != null ? [...rules, autoSweepRule] : rules;
     const depositAccountsView = getAllDepositAccounts(depositAccountState, depositAccountListState);
     const paymentAccountsView = getAllPaymentAccounts(paymentAccountState, paymentAccountListState);
     let transferMoneyParties = [];
@@ -30,7 +71,7 @@ export const getAutoTransferRules = (state) => {
     };
     return {
         autoTransferReviewDetail,
-        rules,
+        rules: mergedRules,
         ruleUpdateLocalData,
         ruleUpdateStatusById,
         ruleDeleteStatusById,

package/lib/esm/view/spendManagement/cashManagement/autoSweepFlow/epics/saveAutoSweepSettingsEpic.js

@@ -3,16 +3,20 @@ import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { toSaveAutoSweepSettingsBody, } from '../autoSweepFlowPayload';
 import { saveAutoSweepSettings, updateAutoSweepSettingsFetchStatus, } from '../autoSweepFlowReducer';
+const SETTINGS_ENDPOINT = 'https://dev.api.zeni.ai/cash-management-agent/1.0/cash-management/settings';
 export const saveAutoSweepSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveAutoSweepSettings.match), switchMap(() => {
-    const { bufferAmount, frequency, memo } = state$.value.autoSweepFlowState;
+    const { bufferAmount, frequency, memo, settingsId } = state$.value.autoSweepFlowState;
     const payload = toSaveAutoSweepSettingsBody({
         bufferAmount,
         frequency,
         memo,
     });
-    return zeniAPI
-        .putAndGetJSON(`https://dev.api.zeni.ai/cash-management-agent/1.0/cash-management/settings`, payload)
-        .pipe(mergeMap((response) => {
+    // First-time setup (no settings id from the GET yet) → POST a new
+    // record. Subsequent edits update the existing one via PUT.
+    const request$ = settingsId == null
+        ? zeniAPI.postAndGetJSON(SETTINGS_ENDPOINT, payload)
+        : zeniAPI.putAndGetJSON(SETTINGS_ENDPOINT, payload);
+    return request$.pipe(mergeMap((response) => {
         if (isSuccessResponse(response)) {
             return of(updateAutoSweepSettingsFetchStatus({ fetchState: 'Completed' }));
         }

package/lib/esm/view/spendManagement/cashManagement/cashManagementOverview/cashManagementOverviewSelector.js

@@ -92,25 +92,27 @@ export const getCashManagementOverview = (state) => {
 const buildProjectionData = (cashBalance, inflowEvents, outflowEvents) => {
     const events = [
         ...inflowEvents.map((e) => ({
+            amount: e.amount,
             date: e.paymentDate,
-            delta: e.amount.amount,
             isInflow: true,
         })),
         ...outflowEvents.map((e) => ({
+            amount: e.amount,
             date: e.paymentDate,
-            delta: -e.amount.amount,
-            isOutflow: true,
+            isInflow: false,
         })),
     ].sort((a, b) => a.date.valueOf() - b.date.valueOf());
-    let balance = cashBalance.amount;
+    let balance = cashBalance;
     const points = [{ balance, date: 'Today' }];
     events.forEach((event) => {
-        balance += event.delta;
+        balance = event.isInflow
+            ? addAmounts(balance, event.amount)
+            : subtractAmounts(balance, event.amount);
         points.push({
             balance,
             date: event.date.format('MMM D'),
-            isInflow: event.isInflow,
-            isOutflow: event.isOutflow,
+            isInflow: event.isInflow ? true : undefined,
+            isOutflow: event.isInflow ? undefined : true,
         });
     });
     return points;

package/lib/view/spendManagement/autotransferRules/autoTransferRulesPayload.d.ts

@@ -4,7 +4,7 @@ import { ZeniDate } from '../../../zeniDayJS';
 import { FundingAccount } from '../commonSetup/setupViewSelector';
 import { TreasuryAccount } from '../treasury/treasuryTransferMoney/treasuryTransferMoneyState';
 import { AutoTransferRule } from './autoTransferRulesState';
-export type AutoTransferRuleType = 'minimum_balance' | 'recurring' | 'percentage_of_balance';
+export type AutoTransferRuleType = 'minimum_balance' | 'recurring' | 'percentage_of_balance' | 'cash_management';
 export type AutoTransferRuleFrequency = 'daily' | 'weekly' | 'monthly';
 export interface DestinationBankAccountMetadataPayload {
     account_id: string;

package/lib/view/spendManagement/autotransferRules/autoTransferRulesSelector.d.ts

@@ -1,12 +1,30 @@
 import { FetchState, FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { RootState } from '../../../reducer';
+import { AutoSweepFlowState } from '../cashManagement/autoSweepFlow/autoSweepFlowState';
 import { CommonHistoryView } from '../commonHistoryView/commonHistory';
 import { FundingAccount } from '../commonSetup/setupViewSelector';
 import { TreasuryAccount } from '../treasury/treasuryTransferMoney/treasuryTransferMoneyState';
 import { ReviewTransferDetail } from '../zeniAccounts/transferDetail/transferDetailState';
 import { AutoTransferRuleLocalData } from './autoTransferRulesPayload';
 import { AutoTransferRule } from './autoTransferRulesState';
+/**
+ * Lifts an `AutoSweepFlowState` into an `AutoTransferRule` so the auto-sweep
+ * config surfaces alongside the user's other auto-transfer rules.
+ *
+ * Mapping notes:
+ *   - `autoTransferRuleId` reuses `settingsId` from the cash-management
+ *     settings record. (Different system, but it's the closest stable id we
+ *     have. Returns `undefined` when no settings have been saved yet.)
+ *   - `'biweekly'` collapses to `'weekly'` — `AutoTransferRuleFrequency`
+ *     doesn't model biweekly.
+ *   - `ruleType` is fixed to `'cash_management'` so the rules-list UI can
+ *     special-case the row (icon, title, action menu) without confusing it
+ *     for a regular recurring rule.
+ *   - Destination is the singleton treasury account, so the id is `null` and
+ *     the type is `'treasury_account'`.
+ */
+export declare const mapAutoSweepFlowStateToAutoTransferRule: (state: AutoSweepFlowState) => AutoTransferRule | undefined;
 export interface AutoTransferRulesSelectorView extends SelectorView {
     autoTransferReviewDetail: ReviewTransferDetail;
     createRuleFetchState: FetchStateAndError;

package/lib/view/spendManagement/autotransferRules/autoTransferRulesSelector.js

@@ -3,15 +3,57 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAutoTransferRuleHistory = exports.getAutoTransferRuleById = exports.getAutoTransferRules = void 0;
+exports.getAutoTransferRuleHistory = exports.getAutoTransferRuleById = exports.getAutoTransferRules = exports.mapAutoSweepFlowStateToAutoTransferRule = void 0;
 const get_1 = __importDefault(require("lodash/get"));
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const setupViewSelector_1 = require("../commonSetup/setupViewSelector");
 const depositAccountListSelector_1 = require("../zeniAccounts/depositAccountList/depositAccountListSelector");
 const paymentAccountListSelector_1 = require("../zeniAccounts/paymentAccountList/paymentAccountListSelector");
+/**
+ * Lifts an `AutoSweepFlowState` into an `AutoTransferRule` so the auto-sweep
+ * config surfaces alongside the user's other auto-transfer rules.
+ *
+ * Mapping notes:
+ *   - `autoTransferRuleId` reuses `settingsId` from the cash-management
+ *     settings record. (Different system, but it's the closest stable id we
+ *     have. Returns `undefined` when no settings have been saved yet.)
+ *   - `'biweekly'` collapses to `'weekly'` — `AutoTransferRuleFrequency`
+ *     doesn't model biweekly.
+ *   - `ruleType` is fixed to `'cash_management'` so the rules-list UI can
+ *     special-case the row (icon, title, action menu) without confusing it
+ *     for a regular recurring rule.
+ *   - Destination is the singleton treasury account, so the id is `null` and
+ *     the type is `'treasury_account'`.
+ */
+const mapAutoSweepFlowStateToAutoTransferRule = (state) => {
+    if (state.settingsId == null) {
+        return undefined;
+    }
+    return {
+        amount: state.bufferAmount.amount,
+        autoTransferRuleId: state.settingsId,
+        currencyCode: state.bufferAmount.currencyCode,
+        currencySymbol: state.bufferAmount.currencySymbol,
+        destinationBankAccountId: null,
+        destinationBankAccountType: 'treasury_account',
+        frequency: state.frequency === 'biweekly' ? 'weekly' : state.frequency,
+        isActive: true,
+        isDeleted: false,
+        lastRunTime: null,
+        ruleType: 'cash_management',
+        sourceBankAccountId: state.primaryFundingAccountId ?? '',
+        sourceBankAccountType: 'deposit_account',
+    };
+};
+exports.mapAutoSweepFlowStateToAutoTransferRule = mapAutoSweepFlowStateToAutoTransferRule;
 const getAutoTransferRules = (state) => {
-    const { autotransferRulesState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, treasuryDetailState, } = state;
+    const { autotransferRulesState, autoSweepFlowState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, treasuryDetailState, } = state;
     const { rules, error, historyByRuleId, ruleUpdateLocalData, ruleUpdateStatusById, ruleDeleteStatusById, createRuleFetchState, autoTransferReviewDetail, } = autotransferRulesState;
+    // Surface the auto-sweep config as an additional rule alongside the
+    // server-returned rules. Only present when a `settingsId` has been
+    // assigned (i.e. the user has saved auto-sweep at least once).
+    const autoSweepRule = (0, exports.mapAutoSweepFlowStateToAutoTransferRule)(autoSweepFlowState);
+    const mergedRules = autoSweepRule != null ? [...rules, autoSweepRule] : rules;
     const depositAccountsView = (0, depositAccountListSelector_1.getAllDepositAccounts)(depositAccountState, depositAccountListState);
     const paymentAccountsView = (0, paymentAccountListSelector_1.getAllPaymentAccounts)(paymentAccountState, paymentAccountListState);
     let transferMoneyParties = [];
@@ -36,7 +78,7 @@ const getAutoTransferRules = (state) => {
     };
     return {
         autoTransferReviewDetail,
-        rules,
+        rules: mergedRules,
         ruleUpdateLocalData,
         ruleUpdateStatusById,
         ruleDeleteStatusById,

package/lib/view/spendManagement/cashManagement/autoSweepFlow/epics/saveAutoSweepSettingsEpic.js

@@ -6,16 +6,20 @@ const operators_1 = require("rxjs/operators");
 const responsePayload_1 = require("../../../../../responsePayload");
 const autoSweepFlowPayload_1 = require("../autoSweepFlowPayload");
 const autoSweepFlowReducer_1 = require("../autoSweepFlowReducer");
+const SETTINGS_ENDPOINT = 'https://dev.api.zeni.ai/cash-management-agent/1.0/cash-management/settings';
 const saveAutoSweepSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(autoSweepFlowReducer_1.saveAutoSweepSettings.match), (0, operators_1.switchMap)(() => {
-    const { bufferAmount, frequency, memo } = state$.value.autoSweepFlowState;
+    const { bufferAmount, frequency, memo, settingsId } = state$.value.autoSweepFlowState;
     const payload = (0, autoSweepFlowPayload_1.toSaveAutoSweepSettingsBody)({
         bufferAmount,
         frequency,
         memo,
     });
-    return zeniAPI
-        .putAndGetJSON(`https://dev.api.zeni.ai/cash-management-agent/1.0/cash-management/settings`, payload)
-        .pipe((0, operators_1.mergeMap)((response) => {
+    // First-time setup (no settings id from the GET yet) → POST a new
+    // record. Subsequent edits update the existing one via PUT.
+    const request$ = settingsId == null
+        ? zeniAPI.postAndGetJSON(SETTINGS_ENDPOINT, payload)
+        : zeniAPI.putAndGetJSON(SETTINGS_ENDPOINT, payload);
+    return request$.pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             return (0, rxjs_1.of)((0, autoSweepFlowReducer_1.updateAutoSweepSettingsFetchStatus)({ fetchState: 'Completed' }));
         }

package/lib/view/spendManagement/cashManagement/cashManagementOverview/cashManagementOverviewSelector.d.ts

@@ -6,14 +6,8 @@ import { CashManagementMovement, UpcomingPaymentEvent } from './cashManagementOv
 export interface CashManagementOverviewBannerSelectorView extends SelectorView, CashManagementMovement {
     cashManagementSettingsId?: ID;
 }
-/**
- * One point on the cash-balance projection line. The first point is today's
- * `cashBalance`; each subsequent point is the running balance after applying
- * the next inflow / outflow event (in chronological order). The `isInflow` /
- * `isOutflow` flags drive the colored dot markers in the chart.
- */
 export interface CashProjectionPoint {
-    balance: number;
+    balance: Amount;
     /** Pre-formatted display label (e.g. `"Today"`, `"May 27"`). */
     date: string;
     isInflow?: boolean;

package/lib/view/spendManagement/cashManagement/cashManagementOverview/cashManagementOverviewSelector.js

@@ -97,25 +97,27 @@ exports.getCashManagementOverview = getCashManagementOverview;
 const buildProjectionData = (cashBalance, inflowEvents, outflowEvents) => {
     const events = [
         ...inflowEvents.map((e) => ({
+            amount: e.amount,
             date: e.paymentDate,
-            delta: e.amount.amount,
             isInflow: true,
         })),
         ...outflowEvents.map((e) => ({
+            amount: e.amount,
             date: e.paymentDate,
-            delta: -e.amount.amount,
-            isOutflow: true,
+            isInflow: false,
         })),
     ].sort((a, b) => a.date.valueOf() - b.date.valueOf());
-    let balance = cashBalance.amount;
+    let balance = cashBalance;
     const points = [{ balance, date: 'Today' }];
     events.forEach((event) => {
-        balance += event.delta;
+        balance = event.isInflow
+            ? addAmounts(balance, event.amount)
+            : subtractAmounts(balance, event.amount);
         points.push({
             balance,
             date: event.date.format('MMM D'),
-            isInflow: event.isInflow,
-            isOutflow: event.isOutflow,
+            isInflow: event.isInflow ? true : undefined,
+            isOutflow: event.isInflow ? undefined : true,
         });
     });
     return points;

package/package.json

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