@zeniai/client-epic-state 4.12.87 → 4.12.89

package/lib/view/accountMappingView/accountMappingPayload.js

@@ -1,125 +1,80 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toSaveFiling1099Payload = exports.toSaveAccountMappingPayload = void 0;
+exports.toSaveAccountMappingPayload = void 0;
 const toSaveAccountMappingPayload = (accountingLocalData) => {
-    var _a, _b, _c, _d;
     const accounts = [];
-    if (Boolean(accountingLocalData.selectedIncomeAccountId) === true) {
-        accounts.push({
-            account_id: accountingLocalData.selectedIncomeAccountId,
-            labels: ['uncategorized_income'],
-        });
-    }
-    else if (Boolean(accountingLocalData.previousIncomeAccount) === true) {
-        accounts.push({
-            account_id: (_a = accountingLocalData.previousIncomeAccount) === null || _a === void 0 ? void 0 : _a.accountId,
-            labels: [],
-        });
-    }
-    if (Boolean(accountingLocalData.selectedExpenseAccountId) === true) {
-        accounts.push({
-            account_id: accountingLocalData.selectedExpenseAccountId,
-            labels: ['uncategorized_expense'],
-        });
-    }
-    else if (Boolean(accountingLocalData.previousExpenseAccount) === true) {
-        accounts.push({
-            account_id: accountingLocalData.previousExpenseAccount
-                .accountId,
-            labels: [],
-        });
-    }
-    if (Boolean(accountingLocalData.selectedBillPayAccountId) === true) {
-        accounts.push({
-            account_id: accountingLocalData.selectedBillPayAccountId,
-            labels: ['bank_charges_and_fees'],
-        });
+    const findAndUpdateAccount = (accountId, label, tax1099Config) => {
+        const existingAccount = accounts.find((account) => account.account_id === accountId);
+        if (existingAccount) {
+            // Add label if not already present
+            if (label != '' &&
+                existingAccount.labels &&
+                !existingAccount.labels.includes(label)) {
+                existingAccount.labels.push(label);
+            }
+            // Merge tax_1099_config fields, updating them if new values are non-null
+            if (tax1099Config != null) {
+                existingAccount.tax_1099_config = Object.assign(Object.assign({}, existingAccount.tax_1099_config), tax1099Config);
+            }
+        }
+        else {
+            // Add a new account if it doesn't exist
+            accounts.push({
+                account_id: accountId,
+                labels: label.length === 0 ? [] : [label],
+                tax_1099_config: tax1099Config,
+            });
+        }
+    };
+    if (accountingLocalData.selectedIncomeAccountId != null) {
+        findAndUpdateAccount(accountingLocalData.selectedIncomeAccountId, 'uncategorized_income');
     }
-    else if (Boolean(accountingLocalData.previousBillPayAccount) === true) {
-        accounts.push({
-            account_id: accountingLocalData.previousBillPayAccount
-                .accountId,
-            labels: [],
-        });
+    if (accountingLocalData.selectedExpenseAccountId != null) {
+        findAndUpdateAccount(accountingLocalData.selectedExpenseAccountId, 'uncategorized_expense');
     }
-    if (Boolean(accountingLocalData.selectedReimbursementsAccountId) === true) {
-        accounts.push({
-            account_id: accountingLocalData.selectedReimbursementsAccountId,
-            labels: ['travel_transportation'],
-        });
+    if (accountingLocalData.selectedBillPayAccountId != null) {
+        findAndUpdateAccount(accountingLocalData.selectedBillPayAccountId, 'bank_charges_and_fees');
     }
-    else if (Boolean(accountingLocalData.previousReimbursementsAccount) === true) {
-        accounts.push({
-            account_id: accountingLocalData.previousReimbursementsAccount.accountId,
-            labels: [],
-        });
+    if (accountingLocalData.selectedReimbursementsAccountId != null) {
+        findAndUpdateAccount(accountingLocalData.selectedReimbursementsAccountId, 'travel_transportation');
     }
     if (accountingLocalData.selectedPrepaidExpensesAccountIds.length > 0) {
-        (_b = accountingLocalData.selectedPrepaidExpensesAccountIds) === null || _b === void 0 ? void 0 : _b.forEach((accountId) => {
-            accounts.push({
-                account_id: accountId,
-                labels: ['prepaid_expenses'],
-            });
-        });
-    }
-    else if (accountingLocalData.previousPrepaidExpensesAccount.length > 0) {
-        accountingLocalData.previousPrepaidExpensesAccount.forEach((account) => {
-            accounts.push({
-                account_id: account.accountId,
-                labels: [],
-            });
+        accountingLocalData.selectedPrepaidExpensesAccountIds.forEach((accountId) => {
+            findAndUpdateAccount(accountId, 'prepaid_expenses');
         });
     }
     if (accountingLocalData.selectedFixedAssetsAccountIds.length > 0) {
-        (_c = accountingLocalData.selectedFixedAssetsAccountIds) === null || _c === void 0 ? void 0 : _c.forEach((accountId) => {
-            accounts.push({
-                account_id: accountId,
-                labels: ['fixed_assets'],
-            });
+        accountingLocalData.selectedFixedAssetsAccountIds.forEach((accountId) => {
+            findAndUpdateAccount(accountId, 'fixed_assets');
         });
     }
-    else if (accountingLocalData.previousFixedAssetsAccount.length > 0) {
-        accountingLocalData.previousFixedAssetsAccount.forEach((account) => {
-            accounts.push({
-                account_id: account.accountId,
-                labels: [],
-            });
+    if (accountingLocalData.selectedAccruedExpensesAccountIds.length > 0) {
+        accountingLocalData.selectedAccruedExpensesAccountIds.forEach((accountId) => {
+            findAndUpdateAccount(accountId, 'accrued_expenses');
         });
     }
-    if (accountingLocalData.selectedAccruedExpensesAccountIds.length > 0) {
-        (_d = accountingLocalData.selectedAccruedExpensesAccountIds) === null || _d === void 0 ? void 0 : _d.forEach((accountId) => {
-            accounts.push({
-                account_id: accountId,
-                labels: ['accrued_expenses'],
+    if (accountingLocalData.selectedBankAccounts1099FilingAccountIds.length > 0) {
+        accountingLocalData.selectedBankAccounts1099FilingAccountIds.forEach((accountId) => {
+            findAndUpdateAccount(accountId, '', {
+                is_bank_account: true,
+                is_expense_account: false,
+                expense_type: null,
+                type_1099: null,
+                box_type: null,
             });
         });
     }
-    else if (accountingLocalData.previousAccruedExpensesAccount.length > 0) {
-        accountingLocalData.previousAccruedExpensesAccount.forEach((account) => {
-            accounts.push({
-                account_id: account.accountId,
-                labels: [],
+    if (accountingLocalData.selectedExpenseAccounts1099FilingAccountIds.length > 0) {
+        accountingLocalData.selectedExpenseAccounts1099FilingAccountIds.forEach((account) => {
+            findAndUpdateAccount(account.accountId, '', {
+                is_bank_account: false,
+                is_expense_account: true,
+                expense_type: account.expenseType,
+                type_1099: account.type1099,
+                box_type: account.boxType,
             });
         });
     }
     return accounts;
 };
 exports.toSaveAccountMappingPayload = toSaveAccountMappingPayload;
-const toSaveFiling1099Payload = (accountingLocalData) => {
-    const gl_accounts = {
-        account_ids: [],
-        gl_account_ids: [],
-    };
-    const account_ids = [];
-    const gl_account_Ids = [];
-    accountingLocalData.selectedGLAccounts1099FilingAccountIds.forEach((glaccountId) => {
-        gl_account_Ids.push(glaccountId);
-    }),
-        accountingLocalData.selectedBankAccounts1099FilingAccountIds.forEach((accountId) => {
-            account_ids.push(accountId);
-        }),
-        (gl_accounts.account_ids = account_ids);
-    gl_accounts.gl_account_ids = gl_account_Ids;
-    return gl_accounts;
-};
-exports.toSaveFiling1099Payload = toSaveFiling1099Payload;

package/lib/view/accountMappingView/accountMappingReducer.js

@@ -20,7 +20,7 @@ exports.initialState = {
         selectedFixedAssetsAccountIds: [],
         selectedAccruedExpensesAccountIds: [],
         selectedBankAccounts1099FilingAccountIds: [],
-        selectedGLAccounts1099FilingAccountIds: [],
+        selectedExpenseAccounts1099FilingAccountIds: [],
         previousExpenseAccount: undefined,
         previousIncomeAccount: undefined,
         previousBillPayAccount: undefined,
@@ -29,7 +29,7 @@ exports.initialState = {
         previousFixedAssetsAccount: [],
         previousAccruedExpensesAccount: [],
         previousBankAccounts1099FilingAccount: [],
-        previousGLAccounts1099FilingAccount: [],
+        previousExpenseAccounts1099FilingAccount: [],
     },
     accountListFetchState: {
         error: undefined,
@@ -64,8 +64,8 @@ exports.initialState = {
     accruedExpensesRecommendations: [],
     bankAccounts1099FilingAccountIdList: [],
     bankAccounts1099FilingNestedAccountListHierarchy: [],
-    glAccounts1099FilingAccountIdList: [],
-    glAccounts1099FilingNestedAccountListHierarchy: [],
+    expenseAccounts1099FilingAccountIdList: [],
+    expenseAccounts1099FilingNestedAccountListHierarchy: [],
 };
 const accountMapping = (0, toolkit_1.createSlice)({
     name: 'accountMapping',
@@ -160,7 +160,7 @@ const doUpdateAccountListForAccountTypes = (draft, accountPayloadList) => {
     const fixedAssetsList = [];
     const accruedExpensesList = [];
     const bankAccounts1099FilingList = [];
-    const glAccounts1099FilingList = [];
+    const expenseAccounts1099FilingList = [];
     accountPayloadList.forEach((account) => {
         if (account.account_type === 'income') {
             incomeList.push(account); // list for uncategorized income
@@ -181,7 +181,7 @@ const doUpdateAccountListForAccountTypes = (draft, accountPayloadList) => {
         else if (account.account_type === 'bank') {
             bankAccounts1099FilingList.push(account); // list for bank accounts for Filing 1099
         }
-        glAccounts1099FilingList.push(account); // list for gl accounts
+        expenseAccounts1099FilingList.push(account); // list for gl accounts
     });
     draft.incomeAccountIdList = incomeList.map((account) => account.account_id);
     draft.expenseAccountIdList = expenseList.map((account) => account.account_id);
@@ -189,7 +189,10 @@ const doUpdateAccountListForAccountTypes = (draft, accountPayloadList) => {
     draft.fixedAssetsAccountIdList = fixedAssetsList.map((account) => account.account_id);
     draft.accruedExpensesAccountIdList = accruedExpensesList.map((account) => account.account_id);
     draft.bankAccounts1099FilingAccountIdList = bankAccounts1099FilingList.map((account) => account.account_id);
-    draft.glAccounts1099FilingAccountIdList = glAccounts1099FilingList.map((account) => account.account_id);
+    draft.expenseAccounts1099FilingAccountIdList =
+        expenseAccounts1099FilingList.map((account) => account.account_id);
+    /* Uncategorized Mapping Section Start */
+    // Uncategorized income
     const incomeAccountMetadata = incomeList.map((acc) => (0, accountPayload_1.mapAccountMetadataPayloadToAccountMetadata)(acc));
     const incomeAccountBase = incomeList.map((acc) => (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(acc));
     const incomeAccountIdentified = incomeAccountBase.find((account) => account.labels.includes('uncategorized_income'));
@@ -197,6 +200,7 @@ const doUpdateAccountListForAccountTypes = (draft, accountPayloadList) => {
         draft.data = Object.assign(Object.assign({}, draft.data), { selectedIncomeAccountId: incomeAccountIdentified.accountId, previousIncomeAccount: incomeAccountIdentified });
     }
     draft.incomeNestedAccountListHierarchy = (0, getNestedAccountIDHierarchyForReport_1.geNestedAccountIDHierarchyForReport)(incomeAccountMetadata);
+    // Uncategorized expense
     const expenseAccountMetadata = expenseList.map((acc) => (0, accountPayload_1.mapAccountMetadataPayloadToAccountMetadata)(acc));
     const expenseAccountBase = expenseList.map((acc) => (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(acc));
     const expenseAccountIdentified = expenseAccountBase.find((account) => account.labels.includes('uncategorized_expense'));
@@ -204,47 +208,69 @@ const doUpdateAccountListForAccountTypes = (draft, accountPayloadList) => {
         draft.data = Object.assign(Object.assign({}, draft.data), { selectedExpenseAccountId: expenseAccountIdentified.accountId, previousExpenseAccount: expenseAccountIdentified });
     }
     draft.expenseNestedAccountListHierarchy = (0, getNestedAccountIDHierarchyForReport_1.geNestedAccountIDHierarchyForReport)(expenseAccountMetadata);
+    /* Uncategorized Mapping Section End */
+    /* Billpay Mapping Section Start */
     const billPayAccountIdentified = expenseAccountBase.find((account) => account.labels.includes('bank_charges_and_fees'));
     if (billPayAccountIdentified != null) {
         draft.data = Object.assign(Object.assign({}, draft.data), { selectedBillPayAccountId: billPayAccountIdentified.accountId, previousBillPayAccount: billPayAccountIdentified });
     }
     draft.billPayNestedAccountListHierarchy = (0, getNestedAccountIDHierarchyForReport_1.geNestedAccountIDHierarchyForReport)(expenseAccountMetadata);
+    /* Billpay Mapping Section End */
+    /* Reimbursements Mapping Section Start */
     const reimbursementsAccountIdentified = expenseAccountBase.find((account) => account.labels.includes('travel_transportation'));
     if (reimbursementsAccountIdentified != null) {
         draft.data = Object.assign(Object.assign({}, draft.data), { selectedReimbursementsAccountId: reimbursementsAccountIdentified.accountId, previousReimbursementsAccount: reimbursementsAccountIdentified });
     }
     draft.reimbursementsNestedAccountListHierarchy =
         (0, getNestedAccountIDHierarchyForReport_1.geNestedAccountIDHierarchyForReport)(expenseAccountMetadata);
+    /* Reimbursements Mapping Section End */
+    /* Vendor Mapping Section Start */
+    // Prepaid expenses
     const prepaidExpensesAccountMetadata = prepaidExpensesList.map((acc) => (0, accountPayload_1.mapAccountMetadataPayloadToAccountMetadata)(acc));
     const prepaidExpensesAccountBase = prepaidExpensesList.map((acc) => (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(acc));
     const prepaidExpensesAccountsIdentified = prepaidExpensesAccountBase.filter((account) => account.labels.includes('prepaid_expenses'));
     draft.data = Object.assign(Object.assign({}, draft.data), { selectedPrepaidExpensesAccountIds: prepaidExpensesAccountsIdentified.map((account) => account.accountId), previousPrepaidExpensesAccount: prepaidExpensesAccountsIdentified });
     draft.prepaidExpensesNestedAccountListHierarchy =
         (0, getNestedAccountIDHierarchyForReport_1.geNestedAccountIDHierarchyForReport)(prepaidExpensesAccountMetadata);
+    // Fixed assets
     const fixedAssetsAccountMetadata = fixedAssetsList.map((acc) => (0, accountPayload_1.mapAccountMetadataPayloadToAccountMetadata)(acc));
     const fixedAssetsAccountBase = fixedAssetsList.map((acc) => (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(acc));
     const fixedAssetsAccountsIdentified = fixedAssetsAccountBase.filter((account) => account.labels.includes('fixed_assets'));
     draft.data = Object.assign(Object.assign({}, draft.data), { selectedFixedAssetsAccountIds: fixedAssetsAccountsIdentified.map((account) => account.accountId), previousFixedAssetsAccount: fixedAssetsAccountsIdentified });
     draft.fixedAssetsNestedAccountListHierarchy =
         (0, getNestedAccountIDHierarchyForReport_1.geNestedAccountIDHierarchyForReport)(fixedAssetsAccountMetadata);
+    // Accrued expenses
     const accruedExpensesAccountMetadata = accruedExpensesList.map((acc) => (0, accountPayload_1.mapAccountMetadataPayloadToAccountMetadata)(acc));
     const accruedExpensesAccountBase = accruedExpensesList.map((acc) => (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(acc));
     const accruedExpensesAccountsIdentified = accruedExpensesAccountBase.filter((account) => account.labels.includes('accrued_expenses'));
     draft.data = Object.assign(Object.assign({}, draft.data), { selectedAccruedExpensesAccountIds: accruedExpensesAccountsIdentified.map((account) => account.accountId), previousAccruedExpensesAccount: accruedExpensesAccountsIdentified });
     draft.accruedExpensesNestedAccountListHierarchy =
         (0, getNestedAccountIDHierarchyForReport_1.geNestedAccountIDHierarchyForReport)(accruedExpensesAccountMetadata);
+    /* Vendor Mapping Section End */
+    /* 1099 Mapping Section Start */
+    // Bank accounts for 1099 filing
     const bankAccounts1099FilingAccountMetadata = bankAccounts1099FilingList.map((acc) => (0, accountPayload_1.mapAccountMetadataPayloadToAccountMetadata)(acc));
     const bankAccounts1099FilingAccountBase = bankAccounts1099FilingList.map((acc) => (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(acc));
-    const bankAccounts1099FilingAccountsIdentified = bankAccounts1099FilingAccountBase.filter((account) => account.labels.includes('accounts_1099'));
+    const bankAccounts1099FilingAccountsIdentified = bankAccounts1099FilingAccountBase.filter((account) => { var _a; return (_a = account.tax1099Config) === null || _a === void 0 ? void 0 : _a.isBankAccount; });
     draft.data = Object.assign(Object.assign({}, draft.data), { selectedBankAccounts1099FilingAccountIds: bankAccounts1099FilingAccountsIdentified.map((account) => account.accountId), previousBankAccounts1099FilingAccount: bankAccounts1099FilingAccountsIdentified });
     draft.bankAccounts1099FilingNestedAccountListHierarchy =
         (0, getNestedAccountIDHierarchyForReport_1.geNestedAccountIDHierarchyForReport)(bankAccounts1099FilingAccountMetadata);
-    const glAccounts1099FilingAccountMetadata = glAccounts1099FilingList.map((acc) => (0, accountPayload_1.mapAccountMetadataPayloadToAccountMetadata)(acc));
-    const glAccounts1099FilingAccountBase = glAccounts1099FilingList.map((acc) => (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(acc));
-    const glAccounts1099FilingAccountsIdentified = glAccounts1099FilingAccountBase.filter((account) => account.labels.includes('gl_accounts'));
-    draft.data = Object.assign(Object.assign({}, draft.data), { selectedGLAccounts1099FilingAccountIds: glAccounts1099FilingAccountsIdentified.map((account) => account.accountId), previousGLAccounts1099FilingAccount: glAccounts1099FilingAccountsIdentified });
-    draft.glAccounts1099FilingNestedAccountListHierarchy =
-        (0, getNestedAccountIDHierarchyForReport_1.geNestedAccountIDHierarchyForReport)(glAccounts1099FilingAccountMetadata);
+    // Expense Categories for 1099 filing
+    const expenseAccounts1099FilingAccountMetadata = expenseAccounts1099FilingList.map((acc) => (0, accountPayload_1.mapAccountMetadataPayloadToAccountMetadata)(acc));
+    const expenseAccounts1099FilingAccountBase = expenseAccounts1099FilingList.map((acc) => (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(acc));
+    const expenseAccounts1099FilingAccountsIdentified = expenseAccounts1099FilingAccountBase.filter((account) => { var _a; return (_a = account.tax1099Config) === null || _a === void 0 ? void 0 : _a.isExpenseAccount; });
+    draft.data = Object.assign(Object.assign({}, draft.data), { selectedExpenseAccounts1099FilingAccountIds: expenseAccounts1099FilingAccountsIdentified.map((account) => {
+            var _a, _b, _c, _d, _e, _f;
+            return ({
+                accountId: account.accountId,
+                expenseType: (_b = (_a = account.tax1099Config) === null || _a === void 0 ? void 0 : _a.expenseType1099) !== null && _b !== void 0 ? _b : '',
+                type1099: (_d = (_c = account.tax1099Config) === null || _c === void 0 ? void 0 : _c.type1099) !== null && _d !== void 0 ? _d : '',
+                boxType: (_f = (_e = account.tax1099Config) === null || _e === void 0 ? void 0 : _e.boxType) !== null && _f !== void 0 ? _f : '',
+            });
+        }), previousExpenseAccounts1099FilingAccount: expenseAccounts1099FilingAccountsIdentified });
+    draft.expenseAccounts1099FilingNestedAccountListHierarchy =
+        (0, getNestedAccountIDHierarchyForReport_1.geNestedAccountIDHierarchyForReport)(expenseAccounts1099FilingAccountMetadata);
+    /* 1099 Mapping Section End */
     draft.accountListFetchState = {
         error: undefined,
         fetchState: 'Completed',

package/lib/view/accountMappingView/accountMappingState.d.ts

@@ -11,7 +11,7 @@ export interface AccountMappingLocalData {
     selectedPrepaidExpensesAccountIds: ID[];
     selectedAccruedExpensesAccountIds: ID[];
     selectedBankAccounts1099FilingAccountIds: ID[];
-    selectedGLAccounts1099FilingAccountIds: ID[];
+    selectedExpenseAccounts1099FilingAccountIds: ExpenseCategory1099Filing[];
     isIncomeRecommendationChecked: boolean;
     isExpenseRecommendationChecked: boolean;
     isBillPayRecommendationChecked: boolean;
@@ -24,7 +24,13 @@ export interface AccountMappingLocalData {
     previousFixedAssetsAccount: AccountBase[];
     previousAccruedExpensesAccount: AccountBase[];
     previousBankAccounts1099FilingAccount: AccountBase[];
-    previousGLAccounts1099FilingAccount: AccountBase[];
+    previousExpenseAccounts1099FilingAccount: AccountBase[];
+}
+export interface ExpenseCategory1099Filing {
+    accountId: ID;
+    expenseType: string;
+    type1099: string;
+    boxType: string;
 }
 export interface AccountMappingState {
     data: AccountMappingLocalData;
@@ -52,6 +58,6 @@ export interface AccountMappingState {
     accruedExpensesRecommendations: Recommendation[];
     bankAccounts1099FilingAccountIdList: ID[];
     bankAccounts1099FilingNestedAccountListHierarchy: NestedAccountHierarchyForReport[];
-    glAccounts1099FilingAccountIdList: ID[];
-    glAccounts1099FilingNestedAccountListHierarchy: NestedAccountHierarchyForReport[];
+    expenseAccounts1099FilingAccountIdList: ID[];
+    expenseAccounts1099FilingNestedAccountListHierarchy: NestedAccountHierarchyForReport[];
 }

package/lib/view/accountMappingView/accountMappingViewSelector.d.ts

@@ -14,7 +14,7 @@ export interface AccountMappingView extends SelectorView {
     fixedAssetsAccountList: AccountBase[];
     accruedExpensesAccountList: AccountBase[];
     bankAccounts1099FilingAccountList: AccountBase[];
-    glAccounts1099FilingAccountList: AccountBase[];
+    expenseAccounts1099FilingAccountList: AccountBase[];
     incomeRecommendation?: Recommendation;
     expenseRecommendation?: Recommendation;
     billPayRecommendation?: Recommendation;
@@ -30,7 +30,7 @@ export interface AccountMappingView extends SelectorView {
     fixedAssetsAccountHierarchy: NestedAccountHierarchyForReport[];
     accruedExpensesAccountHierarchy: NestedAccountHierarchyForReport[];
     bankAccounts1099FilingAccountHierarchy: NestedAccountHierarchyForReport[];
-    glAccounts1099FilingAccountHierarchy: NestedAccountHierarchyForReport[];
+    expenseAccounts1099FilingAccountHierarchy: NestedAccountHierarchyForReport[];
     accountMappingLocalData?: AccountMappingLocalData;
     saveState: FetchStateAndError;
 }

package/lib/view/accountMappingView/accountMappingViewSelector.js

@@ -61,11 +61,11 @@ exports.getAccountMappingView = (0, toolkit_1.createSelector)((state) => state.a
             bankAccounts1099FilingAccountList.push(account);
         }
     });
-    const glAccounts1099FilingAccountList = [];
-    accountMappingState.glAccounts1099FilingAccountIdList.forEach((accountId) => {
+    const expenseAccounts1099FilingAccountList = [];
+    accountMappingState.expenseAccounts1099FilingAccountIdList.forEach((accountId) => {
         const account = (0, accountSelector_1.getAccountBase)(accountState, accountId, 'account_list_by_type');
         if (account != null) {
-            glAccounts1099FilingAccountList.push(account);
+            expenseAccounts1099FilingAccountList.push(account);
         }
     });
     const fetchState = (0, reduceFetchState_1.reduceAllFetchState)([
@@ -82,7 +82,7 @@ exports.getAccountMappingView = (0, toolkit_1.createSelector)((state) => state.a
         fixedAssetsAccountList,
         accruedExpensesAccountList,
         bankAccounts1099FilingAccountList,
-        glAccounts1099FilingAccountList,
+        expenseAccounts1099FilingAccountList,
         incomeRecommendation: accountMappingState.incomeRecommendations.length > 0
             ? accountMappingState.incomeRecommendations[0]
             : undefined,
@@ -107,7 +107,7 @@ exports.getAccountMappingView = (0, toolkit_1.createSelector)((state) => state.a
         fixedAssetsAccountHierarchy: accountMappingState.fixedAssetsNestedAccountListHierarchy,
         accruedExpensesAccountHierarchy: accountMappingState.accruedExpensesNestedAccountListHierarchy,
         bankAccounts1099FilingAccountHierarchy: accountMappingState.bankAccounts1099FilingNestedAccountListHierarchy,
-        glAccounts1099FilingAccountHierarchy: accountMappingState.glAccounts1099FilingNestedAccountListHierarchy,
+        expenseAccounts1099FilingAccountHierarchy: accountMappingState.expenseAccounts1099FilingNestedAccountListHierarchy,
         fetchState: fetchState.fetchState,
         saveState,
     };

package/lib/view/accountMappingView/fetchAccountListForAccountTypesEpic.js

@@ -9,6 +9,7 @@ const accountMappingReducer_1 = require("./accountMappingReducer");
 const fetchAccountListForAccountTypesEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(accountMappingReducer_1.fetchAccountListForAccountTypes.match), (0, operators_1.switchMap)(() => {
     const queryParam = {
         is_bookkeeping_admin: false,
+        is_include_tax_1099_config: true,
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accounts?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

package/lib/view/accountMappingView/saveAccountMappingViewEpic.js

@@ -11,13 +11,12 @@ const snackbarReducer_1 = require("../../entity/snackbar/snackbarReducer");
 const saveAccountMappingViewEpic = (actions$, state, zeniAPI) => actions$.pipe((0, operators_1.filter)(accountMappingReducer_1.saveAccountMapping.match), (0, operators_1.mergeMap)(() => {
     const accountMappingState = state.value.accountMappingState;
     const payload = (0, accountMappingPayload_1.toSaveAccountMappingPayload)(accountMappingState.data);
-    const payloadFiling1099 = (0, accountMappingPayload_1.toSaveFiling1099Payload)(accountMappingState.data);
     if (payload.length === 0) {
         return (0, rxjs_1.from)([]);
     }
     else {
         return zeniAPI
-            .putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accounts`, { accounts: payload, gl_accounts: payloadFiling1099 })
+            .putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accounts`, { accounts: payload })
             .pipe((0, operators_1.mergeMap)((response) => {
             if ((0, responsePayload_1.isSuccessStatus)(response)) {
                 const actionsSuccess = [

package/lib/view/cardBalance/cardBalanceSelector.d.ts

@@ -9,7 +9,7 @@ export declare const getCardBalance: (state: RootState) => {
     accountsInOrder: {
         accountId: string;
         accountName: string;
-        accountType: "cash_position" | "fixed_assets" | "bank" | "credit_card" | "expenses" | "cogs" | "income" | "cash_in" | "cash_out" | "other_income" | "other_expense" | "accounts_receivable" | "other_current_assets" | "other_assets" | "accounts_payable" | "other_current_liabilities" | "long_term_liabilities" | "equity" | "current_liabilities" | "current_assets" | "accounts_1099" | "gl_accounts" | undefined;
+        accountType: "cash_position" | "fixed_assets" | "bank" | "credit_card" | "expenses" | "cogs" | "income" | "cash_in" | "cash_out" | "other_income" | "other_expense" | "accounts_receivable" | "other_current_assets" | "other_assets" | "accounts_payable" | "other_current_liabilities" | "long_term_liabilities" | "equity" | "current_liabilities" | "current_assets" | undefined;
         accountSubType: string | undefined;
         accountDescription: string;
         last4Digits: string | undefined;
@@ -21,7 +21,7 @@ export declare const getCardBalance: (state: RootState) => {
         coaId: string | undefined;
         classesViewParentId: import("../../commonStateTypes/classesView/nestedClassID").ClassesViewParentID | undefined;
         accountsViewParentId: import("../../commonStateTypes/accountView/nestedAccountID").AccountsViewParentID | undefined;
-        labels: ("prepaid_expenses" | "fixed_assets" | "accounts_1099" | "gl_accounts" | "uncategorized_income" | "uncategorized_expense" | "bank_charges_and_fees" | "travel_transportation" | "accrued_expenses")[];
+        labels: ("prepaid_expenses" | "fixed_assets" | "uncategorized_income" | "uncategorized_expense" | "bank_charges_and_fees" | "travel_transportation" | "accrued_expenses")[];
     }[];
     balance: import("../..").Balance | undefined;
     firstMonthOfFY: 2 | 1 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;

package/lib/view/cashBalance/cashBalanceSelector.d.ts

@@ -9,7 +9,7 @@ export declare const getCashBalance: (state: RootState) => {
     accountsInOrder: {
         accountId: string;
         accountName: string;
-        accountType: "cash_position" | "fixed_assets" | "bank" | "credit_card" | "expenses" | "cogs" | "income" | "cash_in" | "cash_out" | "other_income" | "other_expense" | "accounts_receivable" | "other_current_assets" | "other_assets" | "accounts_payable" | "other_current_liabilities" | "long_term_liabilities" | "equity" | "current_liabilities" | "current_assets" | "accounts_1099" | "gl_accounts" | undefined;
+        accountType: "cash_position" | "fixed_assets" | "bank" | "credit_card" | "expenses" | "cogs" | "income" | "cash_in" | "cash_out" | "other_income" | "other_expense" | "accounts_receivable" | "other_current_assets" | "other_assets" | "accounts_payable" | "other_current_liabilities" | "long_term_liabilities" | "equity" | "current_liabilities" | "current_assets" | undefined;
         accountSubType: string | undefined;
         accountDescription: string;
         last4Digits: string | undefined;
@@ -21,7 +21,7 @@ export declare const getCashBalance: (state: RootState) => {
         coaId: string | undefined;
         classesViewParentId: import("../../commonStateTypes/classesView/nestedClassID").ClassesViewParentID | undefined;
         accountsViewParentId: import("../../commonStateTypes/accountView/nestedAccountID").AccountsViewParentID | undefined;
-        labels: ("prepaid_expenses" | "fixed_assets" | "accounts_1099" | "gl_accounts" | "uncategorized_income" | "uncategorized_expense" | "bank_charges_and_fees" | "travel_transportation" | "accrued_expenses")[];
+        labels: ("prepaid_expenses" | "fixed_assets" | "uncategorized_income" | "uncategorized_expense" | "bank_charges_and_fees" | "travel_transportation" | "accrued_expenses")[];
     }[];
     balance: import("../..").Balance | undefined;
     firstMonthOfFY: 2 | 1 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;

package/lib/view/spendManagement/billPay/billPayConfig/billPayConfigPayload.d.ts

@@ -11,7 +11,7 @@ export interface BillPayConfigPayload {
     is_international_wire_enabled: boolean;
     is_international_wires_verified: boolean;
     payment_processor: BillPayConfigPaymentProcessorPayload;
-    bill_bulk_operation_max_count: number;
+    max_bills_allowed_for_bulk_action: number;
     required_fields: {
         ach: Record<PaymentAchSubConfigCodeType, string[]>;
         wire: Record<BillPaymentWireSubConfigCodeType, string[]>;

package/lib/view/spendManagement/billPay/billPayConfig/billPayConfigReducer.js

@@ -79,7 +79,7 @@ const billPayConfig = (0, toolkit_1.createSlice)({
             draft.fetchState = 'Completed';
             draft.error = undefined;
             draft.billPayBotEmail = payload.bill_pay_bot_email;
-            draft.billBulkSubmissionLimit = payload.bill_bulk_operation_max_count;
+            draft.billBulkSubmissionLimit = payload.max_bills_allowed_for_bulk_action;
             draft.vendor.supportedCountries = vendor.supported_countries.map((country) => {
                 return {
                     countryCode: country.country_code,

package/lib/view/spendManagement/reimbursement/reimbursementConfig/reimbursementConfigPayload.d.ts

@@ -9,7 +9,7 @@ export interface ReimbursementConfigPayload {
     };
     currency_country_map: CurrencyCountryPayload[];
     reimbursement_bot_email: string;
-    reimbursement_bulk_operation_max_count: number;
+    max_reimbursements_allowed_for_bulk_action: number;
 }
 interface ReimbursementConfigPaymentProcessorPayload {
     payment_timeline: Record<ReimbursementmentConfigCodeType, Record<ReimbursementmentSubConfigCodeType, ConfigTimelinePayload>>;

package/lib/view/spendManagement/reimbursement/reimbursementConfig/reimbursementConfigReducer.js

@@ -41,7 +41,7 @@ const reimbursementConfig = (0, toolkit_1.createSlice)({
             draft.error = undefined;
             draft.reimbursementBotEmail = payload.reimbursement_bot_email;
             draft.reimbursementBulkSubmissionLimit =
-                payload.reimbursement_bulk_operation_max_count;
+                payload.max_reimbursements_allowed_for_bulk_action;
         },
         updateReimbursementConfigFailure(draft, action) {
             draft.fetchState = 'Error';

package/lib/view/topEx/topExSelector.d.ts

@@ -22,7 +22,7 @@ export declare const getTopExpenses: (accountState: AccountState, topExState: To
         accountsOrdered: {
             accountId: string;
             accountName: string;
-            accountType: "cash_position" | "fixed_assets" | "bank" | "credit_card" | "expenses" | "cogs" | "income" | "cash_in" | "cash_out" | "other_income" | "other_expense" | "accounts_receivable" | "other_current_assets" | "other_assets" | "accounts_payable" | "other_current_liabilities" | "long_term_liabilities" | "equity" | "current_liabilities" | "current_assets" | "accounts_1099" | "gl_accounts" | undefined;
+            accountType: "cash_position" | "fixed_assets" | "bank" | "credit_card" | "expenses" | "cogs" | "income" | "cash_in" | "cash_out" | "other_income" | "other_expense" | "accounts_receivable" | "other_current_assets" | "other_assets" | "accounts_payable" | "other_current_liabilities" | "long_term_liabilities" | "equity" | "current_liabilities" | "current_assets" | undefined;
             accountSubType: string | undefined;
             accountDescription: string;
             logo: import("url-parse")<string> | import("url-parse")<Record<string, string | undefined>> | undefined;