@zeniai/client-epic-state 4.10.67 → 4.10.69

package/lib/view/spendManagement/plaidAccount/plaidAccountViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearPlaidAccountView = exports.updatePlaidAccountViewAccountDetails = exports.establishPlaidConnectionFailure = exports.establishPlaidConnectionSuccess = exports.establishPlaidConnection = exports.getPlaidLinkTokenFailure = exports.getPlaidLinkTokenSuccess = exports.getPlaidLinkToken = exports.updatePaymentAccountLoginStatusFailure = exports.updatePaymentAccountLoginStatusSuccess = exports.updatePaymentAccountLoginStatus = exports.updatePaymentAccountStatusFailure = exports.updatePaymentAccountStatusSuccess = exports.updatePaymentAccountStatus = exports.updatePaymentAccountFailure = exports.updatePaymentAccountSuccess = exports.updatePaymentAccount = exports.getPaymentAccountsFailure = exports.getPaymentAccountsSuccess = exports.getPaymentAccounts = exports.initialState = void 0;
+exports.clearPlaidAccountView = exports.updateMappedCashAccountFailure = exports.updateMappedCashAccountSuccess = exports.updateMappedCashAccount = exports.updatePrimaryFundingAccountFailure = exports.updatePrimaryFundingAccountSuccess = exports.updatePrimaryFundingAccount = exports.updatePlaidAccountViewAccountDetails = exports.establishPlaidConnectionFailure = exports.establishPlaidConnectionSuccess = exports.establishPlaidConnection = exports.getPlaidLinkTokenFailure = exports.getPlaidLinkTokenSuccess = exports.getPlaidLinkToken = exports.updatePaymentAccountLoginStatusFailure = exports.updatePaymentAccountLoginStatusSuccess = exports.updatePaymentAccountLoginStatus = exports.updatePaymentAccountStatusFailure = exports.updatePaymentAccountStatusSuccess = exports.updatePaymentAccountStatus = exports.updatePaymentAccountFailure = exports.updatePaymentAccountSuccess = exports.updatePaymentAccount = exports.getPaymentAccountsFailure = exports.getPaymentAccountsSuccess = exports.getPaymentAccounts = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const zeniDayJS_1 = require("../../../zeniDayJS");
 const plaidAccountViewState_1 = require("./plaidAccountViewState");
@@ -9,6 +9,7 @@ exports.initialState = {
     spend_management_setup: plaidAccountViewState_1.initialPlaidAccountState,
     user_reimbursement_account: plaidAccountViewState_1.initialPlaidAccountState,
     external_account: plaidAccountViewState_1.initialPlaidAccountState,
+    reimbursement_setup: plaidAccountViewState_1.initialPlaidAccountState,
 };
 const plaidAccountView = (0, toolkit_1.createSlice)({
     name: 'plaidAccountView',
@@ -77,13 +78,11 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
         },
         updatePaymentAccountSuccess: {
             reducer(draft, action) {
-                const { paymentAccountIds, plaidAccountKeyType } = action.payload;
+                const { plaidAccountKeyType } = action.payload;
                 draft[plaidAccountKeyType].accountDetails.updateStatus = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
-                draft[plaidAccountKeyType].accountDetails.paymentAccountIds =
-                    paymentAccountIds;
             },
             prepare(paymentAccountIds, plaidAccountKeyType) {
                 return {
@@ -306,27 +305,116 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
             },
         },
         updatePlaidAccountViewAccountDetails: {
-            prepare(allBankAccountIds, paymentAccountIds, plaidAccountKeyType) {
+            prepare(allBankAccountIds, paymentAccountIds, plaidAccountKeyType, depositAccountIds, primaryFundingAccount) {
                 return {
-                    payload: { allBankAccountIds, paymentAccountIds, plaidAccountKeyType },
+                    payload: {
+                        allBankAccountIds,
+                        paymentAccountIds,
+                        plaidAccountKeyType,
+                        depositAccountIds,
+                        primaryFundingAccount,
+                    },
                 };
             },
             reducer(draft, action) {
-                const { allBankAccountIds, paymentAccountIds, plaidAccountKeyType } = action.payload;
+                const { allBankAccountIds, paymentAccountIds, depositAccountIds, primaryFundingAccount, plaidAccountKeyType, } = action.payload;
                 draft[plaidAccountKeyType].accountDetails.allBankAccountIds =
                     allBankAccountIds;
                 draft[plaidAccountKeyType].accountDetails.paymentAccountIds =
                     paymentAccountIds;
+                draft[plaidAccountKeyType].accountDetails.depositAccountIds =
+                    depositAccountIds !== null && depositAccountIds !== void 0 ? depositAccountIds : [];
+                draft[plaidAccountKeyType].accountDetails.primaryFundingAccount =
+                    primaryFundingAccount;
                 draft[plaidAccountKeyType].accountDetails.fetchStatus = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
             },
         },
+        updatePrimaryFundingAccount: {
+            reducer(draft) {
+                draft['reimbursement_setup'].accountDetails.primaryFundingAccountUpdateStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(companyId, accountId, accountType) {
+                return { payload: { companyId, accountId, accountType } };
+            },
+        },
+        updatePrimaryFundingAccountSuccess: {
+            reducer(draft, action) {
+                const { accountId, accountType } = action.payload;
+                draft['reimbursement_setup'].accountDetails.primaryFundingAccountUpdateStatus = {
+                    fetchState: 'Completed',
+                    error: undefined,
+                };
+                draft['reimbursement_setup'].accountDetails.primaryFundingAccount = {
+                    accountId: accountId,
+                    accountType: accountType,
+                };
+            },
+            prepare(accountId, accountType) {
+                return {
+                    payload: { accountId, accountType },
+                };
+            },
+        },
+        updatePrimaryFundingAccountFailure: {
+            reducer(draft, action) {
+                draft['reimbursement_setup'].accountDetails.primaryFundingAccountUpdateStatus = {
+                    fetchState: 'Error',
+                    error: action.payload,
+                };
+            },
+            prepare(error) {
+                return {
+                    payload: error,
+                };
+            },
+        },
+        updateMappedCashAccount: {
+            reducer(draft) {
+                draft['reimbursement_setup'].accountDetails.updateStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(accountId, depositAccountId) {
+                return { payload: { accountId, depositAccountId } };
+            },
+        },
+        updateMappedCashAccountSuccess: {
+            reducer(draft) {
+                draft['reimbursement_setup'].accountDetails.updateStatus = {
+                    fetchState: 'Completed',
+                    error: undefined,
+                };
+            },
+            prepare(depositAccountIds) {
+                return {
+                    payload: { depositAccountIds },
+                };
+            },
+        },
+        updateMappedCashAccountFailure: {
+            reducer(draft, action) {
+                draft['reimbursement_setup'].accountDetails.updateStatus = {
+                    fetchState: 'Error',
+                    error: action.payload,
+                };
+            },
+            prepare(error) {
+                return {
+                    payload: error,
+                };
+            },
+        },
         clearPlaidAccountView(draft) {
             Object.assign(draft, exports.initialState);
         },
     },
 });
-_a = plaidAccountView.actions, exports.getPaymentAccounts = _a.getPaymentAccounts, exports.getPaymentAccountsSuccess = _a.getPaymentAccountsSuccess, exports.getPaymentAccountsFailure = _a.getPaymentAccountsFailure, exports.updatePaymentAccount = _a.updatePaymentAccount, exports.updatePaymentAccountSuccess = _a.updatePaymentAccountSuccess, exports.updatePaymentAccountFailure = _a.updatePaymentAccountFailure, exports.updatePaymentAccountStatus = _a.updatePaymentAccountStatus, exports.updatePaymentAccountStatusSuccess = _a.updatePaymentAccountStatusSuccess, exports.updatePaymentAccountStatusFailure = _a.updatePaymentAccountStatusFailure, exports.updatePaymentAccountLoginStatus = _a.updatePaymentAccountLoginStatus, exports.updatePaymentAccountLoginStatusSuccess = _a.updatePaymentAccountLoginStatusSuccess, exports.updatePaymentAccountLoginStatusFailure = _a.updatePaymentAccountLoginStatusFailure, exports.getPlaidLinkToken = _a.getPlaidLinkToken, exports.getPlaidLinkTokenSuccess = _a.getPlaidLinkTokenSuccess, exports.getPlaidLinkTokenFailure = _a.getPlaidLinkTokenFailure, exports.establishPlaidConnection = _a.establishPlaidConnection, exports.establishPlaidConnectionSuccess = _a.establishPlaidConnectionSuccess, exports.establishPlaidConnectionFailure = _a.establishPlaidConnectionFailure, exports.updatePlaidAccountViewAccountDetails = _a.updatePlaidAccountViewAccountDetails, exports.clearPlaidAccountView = _a.clearPlaidAccountView;
+_a = plaidAccountView.actions, exports.getPaymentAccounts = _a.getPaymentAccounts, exports.getPaymentAccountsSuccess = _a.getPaymentAccountsSuccess, exports.getPaymentAccountsFailure = _a.getPaymentAccountsFailure, exports.updatePaymentAccount = _a.updatePaymentAccount, exports.updatePaymentAccountSuccess = _a.updatePaymentAccountSuccess, exports.updatePaymentAccountFailure = _a.updatePaymentAccountFailure, exports.updatePaymentAccountStatus = _a.updatePaymentAccountStatus, exports.updatePaymentAccountStatusSuccess = _a.updatePaymentAccountStatusSuccess, exports.updatePaymentAccountStatusFailure = _a.updatePaymentAccountStatusFailure, exports.updatePaymentAccountLoginStatus = _a.updatePaymentAccountLoginStatus, exports.updatePaymentAccountLoginStatusSuccess = _a.updatePaymentAccountLoginStatusSuccess, exports.updatePaymentAccountLoginStatusFailure = _a.updatePaymentAccountLoginStatusFailure, exports.getPlaidLinkToken = _a.getPlaidLinkToken, exports.getPlaidLinkTokenSuccess = _a.getPlaidLinkTokenSuccess, exports.getPlaidLinkTokenFailure = _a.getPlaidLinkTokenFailure, exports.establishPlaidConnection = _a.establishPlaidConnection, exports.establishPlaidConnectionSuccess = _a.establishPlaidConnectionSuccess, exports.establishPlaidConnectionFailure = _a.establishPlaidConnectionFailure, exports.updatePlaidAccountViewAccountDetails = _a.updatePlaidAccountViewAccountDetails, exports.updatePrimaryFundingAccount = _a.updatePrimaryFundingAccount, exports.updatePrimaryFundingAccountSuccess = _a.updatePrimaryFundingAccountSuccess, exports.updatePrimaryFundingAccountFailure = _a.updatePrimaryFundingAccountFailure, exports.updateMappedCashAccount = _a.updateMappedCashAccount, exports.updateMappedCashAccountSuccess = _a.updateMappedCashAccountSuccess, exports.updateMappedCashAccountFailure = _a.updateMappedCashAccountFailure, exports.clearPlaidAccountView = _a.clearPlaidAccountView;
 exports.default = plaidAccountView.reducer;

package/lib/view/spendManagement/plaidAccount/plaidAccountViewSelector.d.ts

@@ -1,2 +1,2 @@
 import { PlaidAccountKeyType, PlaidAccountState, PlaidAccountViewState } from './plaidAccountViewState';
-export declare function getPlaidAccountwDetails(plaidAccountViewState: PlaidAccountViewState, plaidAccountKeyType: PlaidAccountKeyType): PlaidAccountState;
+export declare function getPlaidAccountDetails(plaidAccountViewState: PlaidAccountViewState, plaidAccountKeyType: PlaidAccountKeyType): PlaidAccountState;

package/lib/view/spendManagement/plaidAccount/plaidAccountViewSelector.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPlaidAccountwDetails = void 0;
-function getPlaidAccountwDetails(plaidAccountViewState, plaidAccountKeyType) {
+exports.getPlaidAccountDetails = void 0;
+function getPlaidAccountDetails(plaidAccountViewState, plaidAccountKeyType) {
     return plaidAccountViewState[plaidAccountKeyType];
 }
-exports.getPlaidAccountwDetails = getPlaidAccountwDetails;
+exports.getPlaidAccountDetails = getPlaidAccountDetails;

package/lib/view/spendManagement/plaidAccount/plaidAccountViewState.d.ts

@@ -1,7 +1,7 @@
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { ZeniDate } from '../../../zeniDayJS';
 export declare type PlaidLinkTokenType = 'link_account' | 'update_account' | 'link_account_no_microdeposit' | 'link_external_account';
-export declare type PlaidAccountKeyType = 'spend_management_setup' | 'user_reimbursement_account' | 'external_account';
+export declare type PlaidAccountKeyType = 'spend_management_setup' | 'reimbursement_setup' | 'user_reimbursement_account' | 'external_account';
 export declare type PlaidConnectionDetails = Record<PlaidLinkTokenType, {
     linkToken?: string;
     expiration?: ZeniDate;
@@ -13,7 +13,13 @@ export interface PlaidAccountState {
     accountDetails: {
         fetchStatus: FetchStateAndError;
         updateStatus: FetchStateAndError;
+        primaryFundingAccountUpdateStatus?: FetchStateAndError;
+        primaryFundingAccount?: {
+            accountId: ID;
+            accountType: string;
+        };
         paymentAccountIds: ID[];
+        depositAccountIds: ID[];
         allBankAccountIds: ID[];
     };
     plaidConnectionDetails: PlaidConnectionDetails;

package/lib/view/spendManagement/plaidAccount/plaidAccountViewState.js

@@ -6,6 +6,7 @@ exports.initialPlaidAccountState = {
         fetchStatus: { fetchState: 'Not-Started', error: undefined },
         updateStatus: { fetchState: 'Not-Started', error: undefined },
         paymentAccountIds: [],
+        depositAccountIds: [],
         allBankAccountIds: [],
     },
     plaidConnectionDetails: {

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewPayload.d.ts

@@ -1,12 +1,14 @@
 import { FilePayload } from '../../../../entity/file/filePayload';
 import { ZeniAPIResponse } from '../../../../responsePayload';
 import { MerchantPayload } from '../../../../entity/merchant/merchantPayload';
-import { AmountPayload, ReimbursementPayload } from '../../../../entity/reimbursement/reimbursementPayload';
 import { EntityApprovalStatusPayload } from '../../../../entity/entityApprovalStatus/entityApprovalStatusPayload';
 import { ApprovalRulePayload } from '../../../../entity/approvalRule/approvalRulePayload';
 import { UserPayload } from '../../../../entity/user/userPayload';
 import { BankAccountPayload } from '../../../../entity/bankAccount/bankAccountPayload';
+import { AmountPayload, ReimbursementPayload } from '../../../../entity/reimbursement/reimbursementPayload';
 import { ReimbursementConfigPayload } from '../../reimbursement/reimbursementConfig/reimbursementConfigPayload';
+import { MilageReimbursementLine, OutofPocketReimbursementLine } from '../../../../entity/reimbursement/reimbursementState';
+import { SegregatedReimbursementLineWithRecommendation } from './editRemiViewState';
 export interface CurrencyConversionPayload {
     home_currency_conversions: AmountPayload;
 }
@@ -40,3 +42,5 @@ export interface RemiSavePayload {
 export declare type RemiSaveResponse = ZeniAPIResponse<RemiSavePayload>;
 export declare type CurrencyConversionResponse = ZeniAPIResponse<CurrencyConversionPayload>;
 export declare type ReimbursementConfigResponse = ZeniAPIResponse<ReimbursementConfigPayload>;
+export declare const toReimbursementLineWithRecommendationFromMileage: (line: MilageReimbursementLine) => SegregatedReimbursementLineWithRecommendation;
+export declare const toReimbursementLineWithRecommendationFromOutOfPocket: (line: OutofPocketReimbursementLine) => SegregatedReimbursementLineWithRecommendation;

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewPayload.js

@@ -1,2 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toReimbursementLineWithRecommendationFromOutOfPocket = exports.toReimbursementLineWithRecommendationFromMileage = void 0;
+const toReimbursementLineWithRecommendationFromMileage = (line) => {
+    const convertedLine = {
+        type: line.type,
+        fileId: line.fileId,
+        lineId: line.lineId,
+        homeCurrencyConversions: line.homeCurrencyConversions,
+        mileage: {
+            description: line.description,
+            lineDetail: line.lineDetail,
+            transactionDate: line.transactionDate,
+            amount: line.amount,
+            currencyCode: line.currencyCode,
+            currencySymbol: line.currencySymbol,
+            distanceMileage: line === null || line === void 0 ? void 0 : line.distanceMileage,
+        },
+        outOfPocket: {
+            recommendations: [],
+            isCategoryFirstTimeAutofilled: false,
+            isCategoryUpdateSelected: false,
+            isRetainedCategorySelected: false,
+        },
+    };
+    return convertedLine;
+};
+exports.toReimbursementLineWithRecommendationFromMileage = toReimbursementLineWithRecommendationFromMileage;
+const toReimbursementLineWithRecommendationFromOutOfPocket = (line) => {
+    const convertedLine = {
+        type: line.type,
+        fileId: line.fileId,
+        lineId: line.lineId,
+        homeCurrencyConversions: line.homeCurrencyConversions,
+        mileage: {},
+        outOfPocket: {
+            merchant: line === null || line === void 0 ? void 0 : line.merchant,
+            description: line.description,
+            lineDetail: line.lineDetail,
+            transactionDate: line.transactionDate,
+            amount: line.amount,
+            currencyCode: line.currencyCode,
+            currencySymbol: line.currencySymbol,
+            recommendations: [],
+            isCategoryFirstTimeAutofilled: false,
+            isCategoryUpdateSelected: false,
+            isRetainedCategorySelected: false,
+        },
+    };
+    return convertedLine;
+};
+exports.toReimbursementLineWithRecommendationFromOutOfPocket = toReimbursementLineWithRecommendationFromOutOfPocket;

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewReducer.js

@@ -350,24 +350,24 @@ exports.default = editRemiView.reducer;
 const doUpdateRecommendationForEntity = (draft, lineId, recommendations, shouldAutofill, reimbursementId, reimbursementStageCode) => {
     var _a, _b, _c, _d, _e, _f;
     if (reimbursementId != null) {
-        const lineAccount = (_a = draft.editRemiStateById[reimbursementId].remiDetailLocalData
-            .updatesByLineId[lineId].lineDetail) === null || _a === void 0 ? void 0 : _a.account;
-        const lineClass = (_b = draft.editRemiStateById[reimbursementId].remiDetailLocalData
-            .updatesByLineId[lineId].lineDetail) === null || _b === void 0 ? void 0 : _b.class;
         if (draft.editRemiStateById[reimbursementId].remiDetailLocalData
             .updatesByLineId[lineId].type === 'out_of_pocket') {
+            const lineAccount = (_a = draft.editRemiStateById[reimbursementId].remiDetailLocalData
+                .updatesByLineId[lineId].outOfPocket.lineDetail) === null || _a === void 0 ? void 0 : _a.account;
+            const lineClass = (_b = draft.editRemiStateById[reimbursementId].remiDetailLocalData
+                .updatesByLineId[lineId].outOfPocket.lineDetail) === null || _b === void 0 ? void 0 : _b.class;
             const merchantForCurrentLineId = draft.editRemiStateById[reimbursementId].remiDetailLocalData
-                .updatesByLineId[lineId].merchant;
+                .updatesByLineId[lineId].outOfPocket.merchant;
             if (merchantForCurrentLineId != null) {
                 const { recommendedAccount } = (0, initializeRemiToLocalStoreEpic_1.getRecommendedCategoryClass)(recommendations, lineAccount, lineClass);
                 // autofill the account with recommendedAccount and set isCategoryFirstTimeAutofilled as true
                 if (shouldAutofill) {
-                    draft.editRemiStateById[reimbursementId].remiDetailLocalData.updatesByLineId[lineId] = Object.assign(Object.assign({}, draft.editRemiStateById[reimbursementId].remiDetailLocalData
-                        .updatesByLineId[lineId]), { recommendations,
+                    draft.editRemiStateById[reimbursementId].remiDetailLocalData.updatesByLineId[lineId].outOfPocket = Object.assign(Object.assign({}, draft.editRemiStateById[reimbursementId].remiDetailLocalData
+                        .updatesByLineId[lineId].outOfPocket), { recommendations,
                         recommendedAccount, isCategoryUpdateSelected: false, isCategoryFirstTimeAutofilled: true });
                     //autofilling account with recommendedAccount
-                    draft.editRemiStateById[reimbursementId].remiDetailLocalData.updatesByLineId[lineId].lineDetail = Object.assign(Object.assign({}, draft.editRemiStateById[reimbursementId].remiDetailLocalData
-                        .updatesByLineId[lineId].lineDetail), { account: recommendedAccount });
+                    draft.editRemiStateById[reimbursementId].remiDetailLocalData.updatesByLineId[lineId].outOfPocket.lineDetail = Object.assign(Object.assign({}, draft.editRemiStateById[reimbursementId].remiDetailLocalData
+                        .updatesByLineId[lineId].outOfPocket.lineDetail), { account: recommendedAccount });
                     //add account to addRemiAutoFieldsByLineId, since account was autofilled
                     if (!((_c = draft.editRemiStateById[reimbursementId].addRemiAutoFieldsByLineId[lineId]) === null || _c === void 0 ? void 0 : _c.includes('account')) &&
                         (recommendedAccount === null || recommendedAccount === void 0 ? void 0 : recommendedAccount.accountId) != null) {
@@ -382,24 +382,27 @@ const doUpdateRecommendationForEntity = (draft, lineId, recommendations, shouldA
                 }
                 // show retain checkbox only in pending approval
                 if (reimbursementStageCode === 'pending_approval') {
-                    draft.editRemiStateById[reimbursementId].remiDetailLocalData.updatesByLineId[lineId] = Object.assign(Object.assign({}, draft.editRemiStateById[reimbursementId].remiDetailLocalData
-                        .updatesByLineId[lineId]), { retainedAccount: recommendedAccount != null ? lineAccount : undefined, isRetainedCategorySelected: false });
+                    draft.editRemiStateById[reimbursementId].remiDetailLocalData.updatesByLineId[lineId].outOfPocket = Object.assign(Object.assign({}, draft.editRemiStateById[reimbursementId].remiDetailLocalData
+                        .updatesByLineId[lineId].outOfPocket), { retainedAccount: recommendedAccount != null ? lineAccount : undefined, isRetainedCategorySelected: false });
                 }
             }
         }
     }
     else {
-        const lineAccount = (_d = draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId].lineDetail) === null || _d === void 0 ? void 0 : _d.account;
-        const lineClass = (_e = draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId].lineDetail) === null || _e === void 0 ? void 0 : _e.class;
         if (draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId].type ===
             'out_of_pocket') {
+            const lineAccount = (_d = draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId]
+                .outOfPocket.lineDetail) === null || _d === void 0 ? void 0 : _d.account;
+            const lineClass = (_e = draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId]
+                .outOfPocket.lineDetail) === null || _e === void 0 ? void 0 : _e.class;
             const { recommendedAccount } = (0, initializeRemiToLocalStoreEpic_1.getRecommendedCategoryClass)(recommendations, lineAccount, lineClass);
             // autofill the account with recommendedAccount and set isCategoryFirstTimeAutofilled as true
             if (shouldAutofill) {
-                draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId] = Object.assign(Object.assign({}, draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId]), { recommendations,
+                draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId].outOfPocket = Object.assign(Object.assign({}, draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId]
+                    .outOfPocket), { recommendations,
                     recommendedAccount, isCategoryUpdateSelected: false, isCategoryFirstTimeAutofilled: true });
-                draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId].lineDetail = Object.assign(Object.assign({}, draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId]
-                    .lineDetail), { account: recommendedAccount });
+                draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId].outOfPocket.lineDetail = Object.assign(Object.assign({}, draft.newRemiState.remiDetailLocalData.updatesByLineId[lineId]
+                    .outOfPocket.lineDetail), { account: recommendedAccount });
                 //add account to addRemiAutoFieldsByLineId, since account was autofilled
                 if (!((_f = draft.newRemiState.addRemiAutoFieldsByLineId[lineId]) === null || _f === void 0 ? void 0 : _f.includes('account')) &&
                     (recommendedAccount === null || recommendedAccount === void 0 ? void 0 : recommendedAccount.accountId) != null) {

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewSelector.d.ts

@@ -4,7 +4,7 @@ import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAnd
 import { BillStageCodeType, BillStatusCodeType } from '../../../../entity/billPay/billTransaction/billTransactionState';
 import { AccountListSelectorView } from '../../../accountList/accountListSelector';
 import { ClassListSelectorView } from '../../../classList/classListSelector';
-import { AutoFields, ReimbursementLineWithRecommendation, WhatForSection } from './editRemiViewState';
+import { AutoFields, SegregatedReimbursementLineWithRecommendation, WhatForSection, SegregatedReimbursementLine } from './editRemiViewState';
 import { ReimbursementInfo, ReimbursementLine } from '../../../../entity/reimbursement/reimbursementState';
 import { File } from '../../../../entity/file/fileState';
 import { Attachment } from '../../../../entity/transaction/stateTypes/attachment';
@@ -62,7 +62,10 @@ export interface EditRemiInitialDetails {
 export declare type ReimbursementLineWithAttachment = ReimbursementLine & {
     file?: Attachment;
 };
-export declare type ReimbursementLineWithAttachmentAndRecommendation = ReimbursementLineWithRecommendation & {
+export declare type SegregatedReimbursementLineWithAttachment = SegregatedReimbursementLine & {
+    file?: Attachment;
+};
+export declare type ReimbursementLineWithAttachmentAndRecommendation = SegregatedReimbursementLineWithRecommendation & {
     file?: Attachment;
     recommendationFetchState: FetchState;
 };

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewSelector.js

@@ -121,8 +121,8 @@ const getEditRemiDetail = (state, reimbursementId) => {
     Object.keys(lineDetailSectionUpdatesByLineId).forEach((lineId) => {
         var _a, _b, _c, _d, _e, _f;
         if (lineDetailSectionUpdatesByLineId[lineId].type === 'out_of_pocket') {
-            const merchantId = (_a = lineDetailSectionUpdatesByLineId[lineId].merchant) === null || _a === void 0 ? void 0 : _a.id;
-            const merchantName = (_b = lineDetailSectionUpdatesByLineId[lineId].merchant) === null || _b === void 0 ? void 0 : _b.name;
+            const merchantId = (_a = lineDetailSectionUpdatesByLineId[lineId].outOfPocket.merchant) === null || _a === void 0 ? void 0 : _a.id;
+            const merchantName = (_b = lineDetailSectionUpdatesByLineId[lineId].outOfPocket.merchant) === null || _b === void 0 ? void 0 : _b.name;
             if (Boolean(merchantId) === true) {
                 const { fetchState } = (0, recommendationSelector_1.getRecommendationsForEntity)(state, merchantId, 'merchant');
                 lineDetailSection[lineId] = Object.assign(Object.assign({}, lineDetailSectionUpdatesByLineId[lineId]), { file: (_c = sourceRemiDetail.remiDetailLocalData.files) === null || _c === void 0 ? void 0 : _c.find((attachment) => attachment.fileId ===

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewState.d.ts

@@ -1,8 +1,10 @@
 import { Amount } from '../../../../commonStateTypes/amount';
 import { FetchState, FetchStateAndError, ID } from '../../../../commonStateTypes/common';
 import { Recommendation } from '../../../../commonStateTypes/recommendationBase';
+import { ZeniDate } from '../../../../zeniDayJS';
 import { AccountBase, RecommendedAccountBase } from '../../../../entity/account/accountState';
-import { MilageReimbursementLine, OutofPocketReimbursementLine } from '../../../../entity/reimbursement/reimbursementState';
+import { MerchantBase } from '../../../../entity/merchant/merchant';
+import { DistanceMilage, LineDetail, ReimbursementTypeCode } from '../../../../entity/reimbursement/reimbursementState';
 import { Attachment } from '../../../../entity/transaction/stateTypes/attachment';
 export interface EditRemiDetail {
     fetchStatus: FetchStateAndError;
@@ -14,7 +16,18 @@ export interface EditRemiDetail {
     remiDetailLocalData: RemiDetailLocalData;
 }
 export declare const initialRemiDetail: EditRemiDetail;
-export interface OutofPocketReimbursementLineWithRecommendation extends Partial<OutofPocketReimbursementLine> {
+export interface SegregatedReimbursementLine {
+    lineId: ID;
+    type: ReimbursementTypeCode;
+    fileId?: ID;
+    homeCurrencyConversions: Amount;
+    mileage: Partial<MilageLine>;
+    outOfPocket: Partial<OutofPocketLine>;
+}
+export interface SegregatedReimbursementLineWithRecommendation extends SegregatedReimbursementLine {
+    outOfPocket: OutofPocketReimbursementLineWithRecommendation;
+}
+export interface OutofPocketReimbursementLineWithRecommendation extends Partial<OutofPocketLine> {
     recommendations: Recommendation[];
     recommendedAccount?: RecommendedAccountBase;
     isCategoryUpdateSelected: boolean;
@@ -22,20 +35,30 @@ export interface OutofPocketReimbursementLineWithRecommendation extends Partial<
     retainedAccount?: AccountBase;
     isRetainedCategorySelected: boolean;
 }
-export declare type ReimbursementLineWithRecommendation = Partial<MilageReimbursementLine> | OutofPocketReimbursementLineWithRecommendation;
+export interface OutofPocketLine extends ReimbursementBaseLineWithoutType {
+    merchant: MerchantBase;
+}
+export interface MilageLine extends ReimbursementBaseLineWithoutType {
+    distanceMileage: DistanceMilage;
+}
+export interface ReimbursementBaseLineWithoutType extends Amount {
+    lineDetail: LineDetail;
+    transactionDate: ZeniDate;
+    description: string;
+}
 export interface EditRemiDetailViewState {
     newRemiState: EditRemiDetail;
     editRemiStateById: Record<ID, EditRemiDetail>;
 }
+export interface WhatForSection {
+    reportTitle?: string;
+}
 export interface RemiDetailLocalData {
     whatForSection?: WhatForSection;
-    updatesByLineId: Record<ID, ReimbursementLineWithRecommendation>;
+    updatesByLineId: Record<ID, SegregatedReimbursementLineWithRecommendation>;
     currencyConversionStateByLineId: Record<ID, FetchStateAndError>;
     totalAmount?: Amount;
     files?: Attachment[];
     paymentTo?: ID;
 }
-export interface WhatForSection {
-    reportTitle?: string;
-}
 export declare type AutoFields = ('merchant' | 'transactionDate' | 'amount' | 'memo' | 'account' | 'class')[];

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchCurrencyConversionValueEpic.js

@@ -15,7 +15,7 @@ const fetchCurrencyConversionValueEpic = (actions$, state$, zeniAPI) => actions$
             state.editRemiDetailViewState.editRemiStateById[reimbursementId]
                 .remiDetailLocalData;
     }
-    const currentAmountDetails = remiDetailLocalData.updatesByLineId[lineId];
+    const currentAmountDetails = remiDetailLocalData.updatesByLineId[lineId].outOfPocket;
     const payload = {
         amount: {
             amount: (_a = currentAmountDetails.amount) !== null && _a !== void 0 ? _a : 0,

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchRecommendationsAndUpdateMerchantRecommendationsEpic.js

@@ -92,8 +92,8 @@ state$) => actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.waitForMe
                 var _a, _b;
                 return reimbursementLineWithRecommendation.type ===
                     'out_of_pocket' &&
-                    (((_a = reimbursementLineWithRecommendation.merchant) === null || _a === void 0 ? void 0 : _a.id) === entityIdOrName ||
-                        ((_b = reimbursementLineWithRecommendation.merchant) === null || _b === void 0 ? void 0 : _b.name) === entityIdOrName);
+                    (((_a = reimbursementLineWithRecommendation.outOfPocket.merchant) === null || _a === void 0 ? void 0 : _a.id) === entityIdOrName ||
+                        ((_b = reimbursementLineWithRecommendation.outOfPocket.merchant) === null || _b === void 0 ? void 0 : _b.name) === entityIdOrName);
             });
             const lineIds = lineDetails
                 .map((lineDetail) => lineDetail.lineId)

package/lib/view/spendManagement/reimbursement/editRemiView/epics/initializeRemiToLocalStoreEpic.d.ts

@@ -1,10 +1,10 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { initializeRemiToLocalStore, saveRemiUpdatesToLocalStore } from '../editRemiViewReducer';
 import { RootState } from '../../../../../reducer';
 import { Recommendation } from '../../../../../commonStateTypes/recommendationBase';
 import { AccountBase, RecommendedAccountBase } from '../../../../../entity/account/accountState';
 import { ClassBase, RecommendedClassBase } from '../../../../../entity/class/classState';
+import { initializeRemiToLocalStore, saveRemiUpdatesToLocalStore } from '../editRemiViewReducer';
 export declare type ActionType = ReturnType<typeof initializeRemiToLocalStore> | ReturnType<typeof saveRemiUpdatesToLocalStore>;
 export declare const initializeRemiToLocalStoreEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;
 export declare const getRecommendedCategoryClass: (recommendation?: Recommendation[] | undefined, account?: AccountBase | undefined, classObj?: ClassBase | undefined) => {

package/lib/view/spendManagement/reimbursement/editRemiView/epics/initializeRemiToLocalStoreEpic.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRecommendedCategoryClass = exports.initializeRemiToLocalStoreEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const editRemiViewReducer_1 = require("../editRemiViewReducer");
 const merchantSelector_1 = require("../../../../../entity/merchant/merchantSelector");
+const editRemiViewReducer_1 = require("../editRemiViewReducer");
 const initializeRemiToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.initializeRemiToLocalStore.match), (0, operators_1.mergeMap)((action) => {
     var _a, _b;
     const { reimbursementId } = action.payload;
@@ -17,23 +17,67 @@ const initializeRemiToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
         const isPendingApproval = reimbursement.reimbursementInfo.stage.code === 'pending_approval';
         const updatesByLineId = {};
         (_a = reimbursement.lines) === null || _a === void 0 ? void 0 : _a.forEach((line) => {
-            var _a, _b;
+            var _a, _b, _c;
             if (line.type === 'out_of_pocket') {
                 const merchantId = (_a = line.merchant) === null || _a === void 0 ? void 0 : _a.id;
                 const merchant = merchantId != null
                     ? (0, merchantSelector_1.getMerchantByMerchantId)(state.merchantState, merchantId)
                     : undefined;
                 const { recommendedAccount } = (0, exports.getRecommendedCategoryClass)(merchant === null || merchant === void 0 ? void 0 : merchant.recommendations, line.lineDetail.account, line.lineDetail.class);
-                updatesByLineId[line.lineId] = Object.assign(Object.assign({}, line), { recommendations: (_b = merchant === null || merchant === void 0 ? void 0 : merchant.recommendations) !== null && _b !== void 0 ? _b : [], recommendedAccount, isCategoryUpdateSelected: false, isCategoryFirstTimeAutofilled: false, isRetainedCategorySelected: false });
+                updatesByLineId[line.lineId] = {
+                    lineId: line.lineId,
+                    type: line.type,
+                    fileId: line.fileId,
+                    homeCurrencyConversions: line.homeCurrencyConversions,
+                    outOfPocket: {
+                        recommendations: (_b = merchant === null || merchant === void 0 ? void 0 : merchant.recommendations) !== null && _b !== void 0 ? _b : [],
+                        recommendedAccount,
+                        isCategoryUpdateSelected: false,
+                        isCategoryFirstTimeAutofilled: false,
+                        isRetainedCategorySelected: false,
+                        merchant: {
+                            id: merchant === null || merchant === void 0 ? void 0 : merchant.id,
+                            name: (_c = merchant === null || merchant === void 0 ? void 0 : merchant.name) !== null && _c !== void 0 ? _c : '',
+                        },
+                        amount: line.amount,
+                        currencyCode: line.currencyCode,
+                        currencySymbol: line.currencySymbol,
+                        description: line.description,
+                        transactionDate: line.transactionDate,
+                        lineDetail: line.lineDetail,
+                    },
+                    mileage: {},
+                };
                 //show retain checkbox only in pending approval
                 if (isPendingApproval) {
-                    updatesByLineId[line.lineId] = Object.assign(Object.assign({}, updatesByLineId[line.lineId]), { retainedAccount: recommendedAccount != null
-                            ? line.lineDetail.account
-                            : undefined, isRetainedCategorySelected: false });
+                    updatesByLineId[line.lineId] = Object.assign(Object.assign({}, updatesByLineId[line.lineId]), { outOfPocket: Object.assign(Object.assign({}, updatesByLineId[line.lineId].outOfPocket), { retainedAccount: recommendedAccount != null
+                                ? line.lineDetail.account
+                                : undefined, isRetainedCategorySelected: false }) });
                 }
             }
             else {
-                updatesByLineId[line.lineId] = line;
+                updatesByLineId[line.lineId] = {
+                    lineId: line.lineId,
+                    type: line.type,
+                    fileId: line.fileId,
+                    homeCurrencyConversions: line.homeCurrencyConversions,
+                    mileage: {
+                        lineDetail: line.lineDetail,
+                        amount: line.amount,
+                        currencyCode: line.currencyCode,
+                        currencySymbol: line.currencySymbol,
+                        description: line.description,
+                        transactionDate: line.transactionDate,
+                        distanceMileage: line
+                            .distanceMileage,
+                    },
+                    outOfPocket: {
+                        recommendations: [],
+                        isCategoryFirstTimeAutofilled: false,
+                        isRetainedCategorySelected: false,
+                        isCategoryUpdateSelected: false,
+                    },
+                };
             }
         });
         const currencyConversionStateByLineId = {};