@zeniai/client-epic-state 4.15.25 → 4.15.27

package/lib/view/expenseAutomationView/payload/reconciliationPayload.d.ts

@@ -7,8 +7,11 @@ import { UserPayload } from '../../../entity/user/userPayload';
 import { RootState } from '../../../reducer';
 import { ZeniAPIResponse } from '../../../responsePayload';
 import { BalancesLocalData, SaveReconcileDetailActionPayload } from '../types/reconciliationViewState';
+export interface AccountAndPaymentAccountPayload extends AccountPayload {
+    payment_account_id: string | null;
+}
 export interface ReconciliationPayload {
-    accounts: AccountPayload[];
+    accounts: AccountAndPaymentAccountPayload[];
     reconciliation: ReconciliationDataPayload[];
     users: UserPayload[];
 }

package/lib/view/expenseAutomationView/payload/reconciliationPayload.js

@@ -12,7 +12,7 @@ function createSaveReconciliationPayloadBasedOnActionAndMethod(state, selectedPe
     let payload = {};
     payload = Object.assign({ action: action.reconcileAction === 'save_reconcile_for_later'
             ? 'save_for_later'
-            : action.reconcileAction, account_type: 'bank', bank_balance: (_a = balance === null || balance === void 0 ? void 0 : balance.amount) !== null && _a !== void 0 ? _a : 0, cleared_balance: localData.clearedBalance.amount, variance: localData.variance.amount, currency_code: balance === null || balance === void 0 ? void 0 : balance.currencyCode }, (initialClearedBalance != null && initialClearedBalance.amount != null
+            : action.reconcileAction, account_type: 'bank', bank_balance: (_a = balance === null || balance === void 0 ? void 0 : balance.amount) !== null && _a !== void 0 ? _a : 0, cleared_balance: localData.clearedBalance.amount, variance: localData.variance.amount, currency_code: balance === null || balance === void 0 ? void 0 : balance.currencyCode }, ((initialClearedBalance === null || initialClearedBalance === void 0 ? void 0 : initialClearedBalance.amount) != null
         ? {
             initial_cleared_balance: initialClearedBalance.amount,
         }

package/lib/view/expenseAutomationView/reducers/reconciliationViewReducer.d.ts

@@ -21,9 +21,9 @@ export declare const fetchReconciliation: import("@reduxjs/toolkit").ActionCreat
     reconciliationId?: ID;
 }, "expenseAutomationReconciliationView/fetchReconciliationFailure">, fetchReconciliationSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedPeriod: MonthYearPeriod, reconciliation: ReconciliationPayload, refreshViewInBackground?: any, accountId?: string | undefined, reconciliationId?: string | undefined], {
     selectedPeriod: MonthYearPeriod;
-    accountId: string | undefined;
-    refreshViewInBackground: any;
     reconciliation: ReconciliationPayload;
+    refreshViewInBackground: any;
+    accountId: string | undefined;
     reconciliationId: string | undefined;
 }, "expenseAutomationReconciliationView/fetchReconciliationSuccess", never, never>, saveReconciliationDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<SaveReconcileDetailActionPayload, "expenseAutomationReconciliationView/saveReconciliationDetail">, saveReconciliationDetailFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<SaveReconciliationDetailFailurePayload, "expenseAutomationReconciliationView/saveReconciliationDetailFailure">, updateSelectedAccountId: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     selectedAccountId?: ID;

package/lib/view/expenseAutomationView/reducers/reconciliationViewReducer.js

@@ -115,19 +115,20 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
         fetchReconciliationSuccess: {
             reducer(draft, action) {
                 if (action.payload.accountId == null) {
-                    updateAllReconciliation(draft, action.payload.selectedPeriod, action.payload.reconciliation.reconciliation, action.payload.refreshViewInBackground);
+                    updateAllReconciliation(draft, action.payload.reconciliation.accounts, action.payload.selectedPeriod, action.payload.reconciliation.reconciliation, action.payload.refreshViewInBackground);
                 }
-                else if (action.payload.reconciliation.reconciliation.length > 0) {
-                    updateReconciliationByAccountID(draft, action.payload.selectedPeriod, action.payload.accountId, action.payload.reconciliation.reconciliation[0], action.payload.refreshViewInBackground);
+                else if (action.payload.reconciliation.reconciliation.length > 0 &&
+                    action.payload.reconciliation.accounts.length > 0) {
+                    updateReconciliationByAccountID(draft, action.payload.reconciliation.accounts[0], action.payload.selectedPeriod, action.payload.accountId, action.payload.reconciliation.reconciliation[0], action.payload.refreshViewInBackground);
                 }
             },
             prepare(selectedPeriod, reconciliation, refreshViewInBackground = false, accountId, reconciliationId) {
                 return {
                     payload: {
                         selectedPeriod,
-                        accountId,
-                        refreshViewInBackground,
                         reconciliation,
+                        refreshViewInBackground,
+                        accountId,
                         reconciliationId,
                     },
                 };
@@ -318,31 +319,34 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
 _a = expenseAutomationReconciliationView.actions, exports.fetchReconciliation = _a.fetchReconciliation, exports.fetchReconciliationFailure = _a.fetchReconciliationFailure, exports.fetchReconciliationSuccess = _a.fetchReconciliationSuccess, exports.saveReconciliationDetail = _a.saveReconciliationDetail, exports.saveReconciliationDetailFailure = _a.saveReconciliationDetailFailure, exports.updateSelectedAccountId = _a.updateSelectedAccountId, exports.setConnectionInProgressForAccount = _a.setConnectionInProgressForAccount, exports.updateReconcileTabLocalData = _a.updateReconcileTabLocalData, exports.updateReconcileTabListSortState = _a.updateReconcileTabListSortState, exports.updateReconcileTabListScrollState = _a.updateReconcileTabListScrollState, exports.saveReconciliationDetailSuccess = _a.saveReconciliationDetailSuccess, exports.updateSelectedTab = _a.updateSelectedTab, exports.updateBalancesLocalData = _a.updateBalancesLocalData, exports.initialiseLocalDataForSelectedAccountId = _a.initialiseLocalDataForSelectedAccountId, exports.clearExpenseAutomationReconciliationView = _a.clearExpenseAutomationReconciliationView, exports.updateSelectedDrawerAccountId = _a.updateSelectedDrawerAccountId, exports.updateReviewTabSortState = _a.updateReviewTabSortState, exports.initializeReconciliationReviewTabLocalData = _a.initializeReconciliationReviewTabLocalData, exports.updateReviewTabLocalData = _a.updateReviewTabLocalData, exports.saveReconciliationReview = _a.saveReconciliationReview, exports.updateSaveReconciliationReviewFetchStatus = _a.updateSaveReconciliationReviewFetchStatus;
 // Export reducer
 exports.default = expenseAutomationReconciliationView.reducer;
-function updateAllReconciliation(draft, selectedPeriod, reconciliationData, refreshViewInBackground) {
+function updateAllReconciliation(draft, accounts, selectedPeriod, reconciliationData, refreshViewInBackground) {
     draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)] = {
         accountIDs: [],
         reconciliationByAccountID: {},
     };
     const accountReconciliationRecords = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)];
     reconciliationData.forEach((reconciliation) => {
-        var _a;
+        var _a, _b, _c;
+        const account = accounts.find((account) => account.account_id === reconciliation.account_id);
         const oldConnectionStatus = draft.accountConnectionStatusByAccountID[reconciliation.account_id];
         if (oldConnectionStatus == null) {
             draft.accountConnectionStatusByAccountID[reconciliation.account_id] = {
                 status: (0, accountReconState_1.toBankStatusCodeType)(reconciliation.bank_status.code),
                 connectionInProgress: false,
+                paymentAccountId: (_a = account === null || account === void 0 ? void 0 : account.payment_account_id) !== null && _a !== void 0 ? _a : undefined,
             };
         }
         else {
             draft.accountConnectionStatusByAccountID[reconciliation.account_id] = {
                 status: (0, accountReconState_1.toBankStatusCodeType)(reconciliation.bank_status.code),
-                connectionInProgress: !(reconciliation.bank_status.code === 'connected' &&
-                    oldConnectionStatus.connectionInProgress === true),
+                connectionInProgress: reconciliation.bank_status.code === 'not_connected' &&
+                    oldConnectionStatus.connectionInProgress === true,
+                paymentAccountId: (_b = account === null || account === void 0 ? void 0 : account.payment_account_id) !== null && _b !== void 0 ? _b : undefined,
             };
         }
         accountReconciliationRecords.reconciliationByAccountID[reconciliation.account_id] = {
             accountId: reconciliation.account_id,
-            reconciliationId: (_a = reconciliation.reconciliation_id) !== null && _a !== void 0 ? _a : undefined,
+            reconciliationId: (_c = reconciliation.reconciliation_id) !== null && _c !== void 0 ? _c : undefined,
             transactionFetchState: { fetchState: 'Not-Started', error: undefined },
             refreshStatus: { fetchState: 'Not-Started', error: undefined },
         };
@@ -359,17 +363,22 @@ function updateAllReconciliation(draft, selectedPeriod, reconciliationData, refr
         draft.error = undefined;
     }
 }
-function updateReconciliationByAccountID(draft, selectedPeriod, accountId, reconciliationData, refreshViewInBackground) {
-    var _a, _b;
+function updateReconciliationByAccountID(draft, accounts, selectedPeriod, accountId, reconciliationData, refreshViewInBackground) {
+    var _a, _b, _c;
     const oldRecord = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId];
+    const oldConnectionStatus = draft.accountConnectionStatusByAccountID[accountId];
     draft.accountConnectionStatusByAccountID[accountId] = {
         status: (0, accountReconState_1.toBankStatusCodeType)(reconciliationData.bank_status.code),
-        connectionInProgress: false,
+        connectionInProgress: oldConnectionStatus != null
+            ? reconciliationData.bank_status.code === 'not_connected' &&
+                oldConnectionStatus.connectionInProgress === true
+            : false,
+        paymentAccountId: (_a = accounts.payment_account_id) !== null && _a !== void 0 ? _a : undefined,
     };
     if (refreshViewInBackground === true) {
-        draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId] = Object.assign(Object.assign({}, oldRecord), { reconciliationId: (_a = reconciliationData.reconciliation_id) !== null && _a !== void 0 ? _a : undefined, refreshStatus: { fetchState: 'Completed', error: undefined } });
+        draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId] = Object.assign(Object.assign({}, oldRecord), { reconciliationId: (_b = reconciliationData.reconciliation_id) !== null && _b !== void 0 ? _b : undefined, refreshStatus: { fetchState: 'Completed', error: undefined } });
     }
     else {
-        draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId] = Object.assign(Object.assign({}, oldRecord), { reconciliationId: (_b = reconciliationData.reconciliation_id) !== null && _b !== void 0 ? _b : undefined, transactionFetchState: { fetchState: 'Completed', error: undefined } });
+        draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId] = Object.assign(Object.assign({}, oldRecord), { reconciliationId: (_c = reconciliationData.reconciliation_id) !== null && _c !== void 0 ? _c : undefined, transactionFetchState: { fetchState: 'Completed', error: undefined } });
     }
 }

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

@@ -46,5 +46,6 @@ export interface AccountReconciliationByAccount {
     accountReconEntity: AccountReconciliationEntity;
     transactionFetchState: FetchStateAndError;
     refreshStatus: FetchStateAndError;
+    paymentAccountId?: ID;
 }
 export {};

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

@@ -130,6 +130,7 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
         }
         reconList[accountID] = {
             accountConnectionStatus: accountConnectionStatus.status,
+            paymentAccountId: accountConnectionStatus.paymentAccountId,
             connectionInProgress: accountConnectionStatus.connectionInProgress,
             accountReconEntity: accountRecon,
             refreshStatus: accountReconForMonthYearPeriod.reconciliationByAccountID[accountID]

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

@@ -88,6 +88,7 @@ export interface ReconciliationViewState extends FetchStateAndError {
 export interface BankConnectionStatus {
     status: BankStatusCodeType;
     connectionInProgress: boolean;
+    paymentAccountId?: ID;
 }
 export interface AccountReconciliationRecords {
     accountIDs: ID[];

package/package.json

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