@zeniai/client-epic-state 4.20.2-beta0ND → 4.20.2-beta25RR

package/lib/esm/view/spendManagement/reimbursement/remiListView/remiListSelector.js

@@ -45,7 +45,6 @@ export const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled
         return {
             ...reimbursement,
             submittedBy: getUserByUserId(userState, reimbursement.reimburseeUserId),
-            createdByUser: getUserByUserId(userState, reimbursement.createdBy),
             approvers: approvers,
         };
     });
@@ -416,14 +415,6 @@ export const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements
                     reimbursementsWithNoSortKeyValue.push(reimbursement);
                 }
                 break;
-            case 'createdBy':
-                if (reimbursement.createdByUser != null) {
-                    reimbursementsWithSortKeyValue.push(reimbursement);
-                }
-                else {
-                    reimbursementsWithNoSortKeyValue.push(reimbursement);
-                }
-                break;
         }
     });
     const getColumnWiseSortOrder = (sortOrder) => {
@@ -431,7 +422,6 @@ export const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements
             case 'reportName':
             case 'type':
             case 'status':
-            case 'createdBy':
                 return sortOrder === 'ascending' ? 'asc' : 'desc';
             default:
                 return sortOrder === 'ascending' ? 'desc' : 'asc';
@@ -451,8 +441,6 @@ export const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements
                 return getStatusPerTab(reimbursement);
             case 'amount':
                 return reimbursement.amount.amount ?? 0;
-            case 'createdBy':
-                return `${reimbursement.createdByUser?.firstName ?? ''} ${reimbursement.createdByUser?.lastName ?? ''}`.toLowerCase();
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

package/lib/esm/view/spendManagement/reimbursement/remiListView/remiListState.js

@@ -55,7 +55,6 @@ export const toRemiSubTabUnderScoreType = (v) => stringToUnion(v, REMI_SUB_TAB_U
 const ALL_REIMBURSEMENT_SORT_KEYS = [
     'reportName',
     'submittedOn',
-    'createdBy',
     'type',
     'status',
     'amount',

package/lib/esm/view/taskManager/taskDetailView/epics/archiveTaskEpic.js

@@ -4,6 +4,7 @@ import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { updateTasks } from '../../../../entity/task/taskReducer';
 import { getTaskById } from '../../../../entity/task/taskSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { removeTaskFromList } from '../../taskListView/taskListReducer';
 import { archiveTask, archiveTaskSuccessOrFailure } from '../taskDetailReducer';
 // Epic function to handle archiving of tasks
 export const archiveTaskEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(archiveTask.match), mergeMap((action) => handleArchiveTask(action.payload.taskId, state$, zeniAPI)));
@@ -25,6 +26,7 @@ const handleApiResponse = (response, taskId) => {
         response.data.tasks.length > 0) {
         const fetchActions = [
             updateTasks(response.data.tasks),
+            removeTaskFromList(taskId),
             archiveTaskSuccessOrFailure({
                 fetchState: 'Completed',
                 taskId,

package/lib/esm/view/taskManager/taskDetailView/epics/deleteTaskEpic.js

@@ -2,6 +2,7 @@ import { from, of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessStatus, } from '../../../../responsePayload';
+import { removeTaskFromList } from '../../taskListView/taskListReducer';
 import { deleteTask, deleteTaskSuccessOrFailure } from '../taskDetailReducer';
 export const deleteTaskEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteTask.match), mergeMap((action) => {
     const { taskId } = action.payload;
@@ -10,6 +11,9 @@ export const deleteTaskEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filt
         .pipe(mergeMap((response) => {
         if (isSuccessStatus(response)) {
             const actions = [];
+            if (taskId != null) {
+                actions.push(removeTaskFromList(taskId));
+            }
             actions.push(deleteTaskSuccessOrFailure({ fetchState: 'Completed', taskId }));
             return from(actions);
         }

package/lib/esm/view/taskManager/taskDetailView/epics/initializeTaskToLocalStoreEpic.js

@@ -25,6 +25,7 @@ export const initializeTaskToLocalStoreEpic = (actions$, state$) => actions$.pip
             savedRecurringEndDate: task.recurringEndDate,
             recurringStartDate: task.recurringStartDate,
             timeSpent: task.timeSpent,
+            isPrivate: task.isPrivate,
         };
         const actions = [
             saveTaskUpdatesToLocalStore({ taskDetailLocalData, taskId }),

package/lib/esm/view/taskManager/taskDetailView/epics/saveTaskDetailEpic.js

@@ -94,5 +94,6 @@ const prepareTaskPayload = (state, taskId, taskGroupId) => {
         sync_token: syncToken,
         task_group_ids: taskGroupId != null ? [taskGroupId] : [],
         time_spent: convertHHMMStrToMinutes(localData.timeSpent),
+        ...(taskId == null ? { is_private: localData.isPrivate ?? false } : {}),
     };
 };

package/lib/esm/view/taskManager/taskDetailView/epics/snoozeTaskEpic.js

@@ -0,0 +1,64 @@
+import { from, of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { updateTasks } from '../../../../entity/task/taskReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { date } from '../../../../zeniDayJS';
+import { removeTaskFromList } from '../../taskListView/taskListReducer';
+import { snoozeTask, snoozeTaskSuccessOrFailure } from '../taskDetailReducer';
+export const snoozeTaskEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(snoozeTask.match), mergeMap((action) => handleSnoozeTask(action.payload.taskId, action.payload.snoozedUntil, zeniAPI)));
+const formatSnoozedUntilForDisplay = (snoozedUntil) => date(snoozedUntil).format('MMM D, h:mm A');
+const handleSnoozeTask = (taskId, snoozedUntil, zeniAPI) => {
+    const snoozeTaskApi$ = zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}/snooze`, { snoozed_until: snoozedUntil });
+    return snoozeTaskApi$.pipe(mergeMap((response) => handleApiResponse(response, taskId, snoozedUntil)), catchError((error) => of(snoozeTaskSuccessOrFailure({
+        fetchState: 'Error',
+        taskId,
+        error: createZeniAPIStatus('Unexpected Error', 'Snooze Task REST API call errored out: ' + JSON.stringify(error)),
+    }))));
+};
+const handleApiResponse = (response, taskId, snoozedUntil) => {
+    if (isSuccessResponse(response) &&
+        response.data != null &&
+        response.data.tasks.length > 0) {
+        const fetchActions = [
+            updateTasks(response.data.tasks),
+            removeTaskFromList(taskId),
+            snoozeTaskSuccessOrFailure({
+                fetchState: 'Completed',
+                taskId,
+            }),
+            openSnackbar({
+                messageSection: 'snooze_task',
+                messageText: 'success',
+                type: 'success',
+                variables: [
+                    {
+                        variableName: '_snoozed_until_',
+                        variableValue: formatSnoozedUntilForDisplay(snoozedUntil),
+                    },
+                ],
+            }),
+        ];
+        return from(fetchActions);
+    }
+    else {
+        return from([
+            snoozeTaskSuccessOrFailure({
+                fetchState: 'Error',
+                taskId,
+                error: response.status,
+            }),
+            openSnackbar({
+                messageSection: 'snooze_task',
+                messageText: 'failed',
+                type: 'error',
+                variables: [
+                    {
+                        variableName: '_api-error_',
+                        variableValue: response.status.message,
+                    },
+                ],
+            }),
+        ]);
+    }
+};

package/lib/esm/view/taskManager/taskDetailView/epics/unsnoozeTaskEpic.js

@@ -0,0 +1,54 @@
+import { from, of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { updateTasks } from '../../../../entity/task/taskReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { snoozeTaskSuccessOrFailure, unsnoozeTask, } from '../taskDetailReducer';
+export const unsnoozeTaskEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(unsnoozeTask.match), mergeMap((action) => handleUnsnoozeTask(action.payload.taskId, zeniAPI)));
+const handleUnsnoozeTask = (taskId, zeniAPI) => {
+    const unsnoozeTaskApi$ = zeniAPI.deleteAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}/snooze`);
+    return unsnoozeTaskApi$.pipe(mergeMap((response) => handleApiResponse(response, taskId)), catchError((error) => of(snoozeTaskSuccessOrFailure({
+        fetchState: 'Error',
+        taskId,
+        error: createZeniAPIStatus('Unexpected Error', 'Unsnooze Task REST API call errored out: ' + JSON.stringify(error)),
+    }))));
+};
+const handleApiResponse = (response, taskId) => {
+    if (isSuccessResponse(response) &&
+        response.data != null &&
+        response.data.tasks.length > 0) {
+        const fetchActions = [
+            updateTasks(response.data.tasks),
+            snoozeTaskSuccessOrFailure({
+                fetchState: 'Completed',
+                taskId,
+            }),
+            openSnackbar({
+                messageSection: 'unsnooze_task',
+                messageText: 'success',
+                type: 'success',
+            }),
+        ];
+        return from(fetchActions);
+    }
+    else {
+        return from([
+            snoozeTaskSuccessOrFailure({
+                fetchState: 'Error',
+                taskId,
+                error: response.status,
+            }),
+            openSnackbar({
+                messageSection: 'unsnooze_task',
+                messageText: 'failed',
+                type: 'error',
+                variables: [
+                    {
+                        variableName: '_api-error_',
+                        variableValue: response.status.message,
+                    },
+                ],
+            }),
+        ]);
+    }
+};

package/lib/esm/view/taskManager/taskDetailView/taskDetail.js

@@ -31,5 +31,9 @@ export const initialTaskDetail = {
         fetchState: 'Not-Started',
         error: undefined,
     },
+    snoozeStatus: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
     taskDetailLocalData: initialTaskDetailLocalData,
 };

package/lib/esm/view/taskManager/taskDetailView/taskDetailReducer.js

@@ -185,6 +185,54 @@ const taskDetailView = createSlice({
             draft.editTaskStateById[taskId].archiveStatus.fetchState = fetchState;
             draft.editTaskStateById[taskId].archiveStatus.error = error;
         },
+        snoozeTask: {
+            reducer(draft, action) {
+                const { taskId } = action.payload;
+                draft.editTaskStateById[taskId] = {
+                    ...(draft.editTaskStateById[taskId] != null
+                        ? draft.editTaskStateById[taskId]
+                        : initialTaskDetail),
+                    snoozeStatus: {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    },
+                };
+            },
+            prepare(taskId, snoozedUntil) {
+                return {
+                    payload: {
+                        taskId,
+                        snoozedUntil,
+                    },
+                };
+            },
+        },
+        snoozeTaskSuccessOrFailure(draft, action) {
+            const { taskId, fetchState, error } = action.payload;
+            draft.editTaskStateById[taskId].snoozeStatus.fetchState = fetchState;
+            draft.editTaskStateById[taskId].snoozeStatus.error = error;
+        },
+        unsnoozeTask: {
+            reducer(draft, action) {
+                const { taskId } = action.payload;
+                draft.editTaskStateById[taskId] = {
+                    ...(draft.editTaskStateById[taskId] != null
+                        ? draft.editTaskStateById[taskId]
+                        : initialTaskDetail),
+                    snoozeStatus: {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    },
+                };
+            },
+            prepare(taskId) {
+                return {
+                    payload: {
+                        taskId,
+                    },
+                };
+            },
+        },
         deleteTask: {
             reducer(draft, action) {
                 const { taskId } = action.payload;
@@ -270,5 +318,5 @@ const taskDetailView = createSlice({
         },
     },
 });
-export const { fetchTaskDetailPage, fetchTaskDetail, initializeTaskToLocalStore, updateEditTaskFetchStatus, saveTaskUpdatesToLocalStore, discardTaskUpdatesInLocalStore, saveTaskDetail, archiveTask, archiveTaskSuccessOrFailure, saveTaskSuccessOrFailure, deleteTask, removeTaskDetail, deleteTaskSuccessOrFailure, fetchTaskHistory, updateTaskHistory, updateTaskHistoryFetchStatus, clearTaskDetail, updateCreatedTagToLocalStore, updateDeletedTagToLocalStore, } = taskDetailView.actions;
+export const { fetchTaskDetailPage, fetchTaskDetail, initializeTaskToLocalStore, updateEditTaskFetchStatus, saveTaskUpdatesToLocalStore, discardTaskUpdatesInLocalStore, saveTaskDetail, archiveTask, archiveTaskSuccessOrFailure, snoozeTask, snoozeTaskSuccessOrFailure, unsnoozeTask, saveTaskSuccessOrFailure, deleteTask, removeTaskDetail, deleteTaskSuccessOrFailure, fetchTaskHistory, updateTaskHistory, updateTaskHistoryFetchStatus, clearTaskDetail, updateCreatedTagToLocalStore, updateDeletedTagToLocalStore, } = taskDetailView.actions;
 export default taskDetailView.reducer;

package/lib/esm/view/taskManager/taskDetailView/taskDetailSelector.js

@@ -21,11 +21,13 @@ export const getTaskDetail = (state, taskId) => {
     };
     let taskHistory = [];
     let createdByUser = undefined;
+    let snoozedUntil = undefined;
     if (taskId != null && sourceTaskDetail != null) {
         const taskEntity = getTaskById(taskState, taskId);
         const fileIdsInEntity = taskEntity?.fileIds ?? [];
         if (taskEntity != null) {
             createdByUser = getUserAndUserRole(userState, userRoleState, addressState, taskEntity.createdBy);
+            snoozedUntil = taskEntity.snoozedUntil;
         }
         if (fileIdsInEntity.length > 0) {
             fetchStatus = reduceFetchState([
@@ -74,6 +76,7 @@ export const getTaskDetail = (state, taskId) => {
         version: 0,
         createdByUser,
         showTaskDetailFormFooter,
+        snoozedUntil,
     };
 };
 export const allTaskStatus = [
@@ -91,11 +94,11 @@ export const allTaskStatus = [
     },
     {
         code: 'done',
-        name: 'In Review',
+        name: 'Done',
     },
     {
         code: 'resolved',
-        name: 'Complete',
+        name: 'Resolved',
     },
 ];
 export const allTaskPriority = [

package/lib/esm/view/taskManager/taskListView/taskList.js

@@ -26,6 +26,7 @@ const ALL_TASK_LIST_SORT_KEYS = [
     'status',
     'priority',
     'timeSpent',
+    'visibility',
 ];
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const toTaskListSortKeyType = (v) => stringToUnion(v, ALL_TASK_LIST_SORT_KEYS);

package/lib/esm/view/taskManager/taskListView/taskListReducer.js

@@ -404,12 +404,34 @@ const taskList = createSlice({
             draft.updateTasksFetchState.fetchState = 'Error';
             draft.updateTasksFetchState.error = action.payload.error;
         },
+        removeTaskFromList(draft, action) {
+            const taskIdToRemove = action.payload;
+            draft.taskIds = draft.taskIds.filter((id) => id !== taskIdToRemove);
+            Object.keys(draft.taskIdsByGroupsIds).forEach((groupId) => {
+                draft.taskIdsByGroupsIds[groupId] = draft.taskIdsByGroupsIds[groupId].filter((id) => id !== taskIdToRemove);
+            });
+            Object.keys(draft.taskIdsByPriority).forEach((key) => {
+                draft.taskIdsByPriority[key] = draft.taskIdsByPriority[key].filter((id) => id !== taskIdToRemove);
+            });
+            Object.keys(draft.taskIdsByStatus).forEach((key) => {
+                draft.taskIdsByStatus[key] = draft.taskIdsByStatus[key].filter((id) => id !== taskIdToRemove);
+            });
+            Object.keys(draft.taskIdsByDueDate).forEach((key) => {
+                draft.taskIdsByDueDate[key] = draft.taskIdsByDueDate[key].filter((id) => id !== taskIdToRemove);
+            });
+            Object.keys(draft.taskIdsByAssignees).forEach((key) => {
+                draft.taskIdsByAssignees[key] = draft.taskIdsByAssignees[key].filter((id) => id !== taskIdToRemove);
+            });
+            Object.keys(draft.taskIdsByTags).forEach((key) => {
+                draft.taskIdsByTags[key] = draft.taskIdsByTags[key].filter((id) => id !== taskIdToRemove);
+            });
+        },
         clearTaskList(draft) {
             Object.assign(draft, initialState);
         },
     },
 });
-export const { fetchTaskListPage, fetchTaskList, updateTaskList, updateTaskListFetchStatus, updateTaskListSearchText, updateTaskListUIState, updateTaskFilters, updateTaskListOnNewGroupCreationSuccess, bulkUpdateTaskList, updateTasksListOnBulkUpdateTasksSuccess, updateTasksListOnBulkUpdateTasksFailure, initiateTaskListLocalData, updateTaskListLocalData, updateTaskListOnTaskGroupDeletion, dragNDropTasks, updateTaskListOnNewTaskCreationSuccess, updateTaskListOnTaskGroupNameUpdate, updateTaskFromListView, updateTasksListOnUpdateTaskSuccess, updateTasksListOnUpdateTaskFailure, updateTaskListOnCreateTaskFromTemplateSuccess, clearTaskList, } = taskList.actions;
+export const { fetchTaskListPage, fetchTaskList, updateTaskList, updateTaskListFetchStatus, updateTaskListSearchText, updateTaskListUIState, updateTaskFilters, updateTaskListOnNewGroupCreationSuccess, bulkUpdateTaskList, updateTasksListOnBulkUpdateTasksSuccess, updateTasksListOnBulkUpdateTasksFailure, initiateTaskListLocalData, updateTaskListLocalData, updateTaskListOnTaskGroupDeletion, dragNDropTasks, updateTaskListOnNewTaskCreationSuccess, updateTaskListOnTaskGroupNameUpdate, updateTaskFromListView, updateTasksListOnUpdateTaskSuccess, updateTasksListOnUpdateTaskFailure, updateTaskListOnCreateTaskFromTemplateSuccess, removeTaskFromList, clearTaskList, } = taskList.actions;
 export default taskList.reducer;
 /**
  *  helpers

package/lib/esm/view/taskManager/taskListView/taskListSelector.js

@@ -17,8 +17,12 @@ import { allTaskPriority, allTaskStatus, } from '../taskDetailView/taskDetailSel
 import { DUE_DATE_GROUP_KEYS, } from './taskList';
 import { initialState } from './taskListReducer';
 const isDefaultFilters = (taskListState) => {
-    return (isEqual(taskListState.filters, initialState.filters) &&
-        initialState.uiState.searchText === taskListState.uiState.searchText);
+    if (taskListState.uiState.searchText !== initialState.uiState.searchText) {
+        return false;
+    }
+    const hasNoActiveFilters = taskListState.filters.categories == null ||
+        taskListState.filters.categories.length === 0;
+    return (hasNoActiveFilters || isEqual(taskListState.filters, initialState.filters));
 };
 const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     const tasksInOrder = orderBy(tasksList, (task) => {
@@ -34,8 +38,12 @@ const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
                 return task.status.name;
             case 'priority':
                 return ALL_PRIORITY_CODE.indexOf(task.priority.code);
+            case 'assignee':
+                return task.firstAssigneeSortName;
             case 'timeSpent':
                 return task.timeSpent;
+            case 'visibility':
+                return task.isPrivate ? 1 : 0;
             case 'name':
             default:
                 return task.name.toLowerCase();
@@ -43,7 +51,7 @@ const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     }, sortOrder);
     return tasksInOrder;
 };
-const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, }) => {
+const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, userGroupsState, }) => {
     const { sortKey, searchText } = taskListState.uiState;
     const sortOrder = getSortOrder(taskListState.uiState.sortOrder);
     const tasks = taskIds
@@ -53,7 +61,18 @@ const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRole
             const assigneeUsers = task.assignees
                 .map((userId) => getUserAndUserRole(userState, userRoleState, addressState, userId))
                 .filter((value) => value != null);
-            return { ...task, assigneeUsers };
+            // Compute sort name matching display order: users first, then groups
+            const firstUser = assigneeUsers[0]?.user;
+            const firstUserName = (firstUser != null ? getUserName(firstUser) : '') ||
+                firstUser?.email ||
+                '';
+            const firstGroupName = task.groupAssignees
+                .map((gId) => userGroupsState.userGroupByUserGroupId[gId]?.name)
+                .find((name) => name != null && name !== '');
+            const firstAssigneeSortName = (firstUserName ||
+                firstGroupName ||
+                '').toLowerCase();
+            return { ...task, assigneeUsers, firstAssigneeSortName };
         }
         return undefined;
     })
@@ -62,7 +81,7 @@ const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRole
     const sortedTaskList = sortTasksList(tagState, filteredTaskList, sortKey, sortOrder);
     return sortedTaskList;
 };
-const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupState, taskGroupViewState, userState, userRoleState, addressState, tagState, }) => {
+const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupState, taskGroupViewState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const { taskGroupsIds } = taskGroupViewState;
     const taskGroupsWithTasksList = taskGroupsIds
         .map((taskGroupId) => {
@@ -76,6 +95,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         if (taskGroup != null) {
             return {
@@ -109,7 +129,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
     }
     return sortedTaskGroupsWithTasksList;
 };
-export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const assigneeGroups = Object.keys(taskListState.taskIdsByAssignees);
     const taskGroupsWithTasksList = assigneeGroups.map((groupKey) => {
         const taskIds = taskListState.taskIdsByAssignees[groupKey];
@@ -121,6 +141,7 @@ export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userSt
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         const assigneeIds = groupKey.split(',');
         const groupName = getUsersByUserIds(userState, assigneeIds)
@@ -141,7 +162,7 @@ export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userSt
     }
     return taskGroupsWithTasksList;
 };
-export const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+export const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = ALL_PRIORITY_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByPriority[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -152,6 +173,7 @@ export const getTaskListGroupedByPriority = ({ taskListState, taskState, userSta
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: allTaskPriority.find((priority) => priority.code === groupKey)?.name ??
@@ -166,7 +188,7 @@ export const getTaskListGroupedByPriority = ({ taskListState, taskState, userSta
     }
     return taskGroupsWithTasksList;
 };
-const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = ALL_TASK_STATUS_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByStatus[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -177,6 +199,7 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: allTaskStatus.find((taskStatus) => taskStatus.code === groupKey)
@@ -191,7 +214,7 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
     }
     return taskGroupsWithTasksList;
 };
-const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const tagGroups = Object.keys(taskListState.taskIdsByTags);
     const taskGroupsWithTasksList = tagGroups.map((groupKey) => {
         const taskIds = taskListState.taskIdsByTags[groupKey];
@@ -203,6 +226,7 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         const tagIds = groupKey.split(',');
         const groupName = getTagsByIds(tagState, tagIds)
@@ -222,7 +246,7 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
     }
     return taskGroupsWithTasksList;
 };
-const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = DUE_DATE_GROUP_KEYS.map((groupKey) => {
         const taskIds = taskListState.taskIdsByDueDate[groupKey];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -233,6 +257,7 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: groupKey,
@@ -246,7 +271,7 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
     }
     return taskGroupsWithTasksList;
 };
-const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupViewState, tagState, }) => {
+const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupViewState, tagState, userGroupsState, }) => {
     const { groupByKey } = taskListState.uiState;
     if (groupByKey === 'groupName') {
         return getTaskListGroupedByGroupName({
@@ -258,6 +283,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             taskGroupState,
             taskGroupViewState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'assignee') {
@@ -268,6 +294,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'priority') {
@@ -278,6 +305,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'status') {
@@ -288,6 +316,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'tag') {
@@ -298,6 +327,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     return getTaskListGroupedByDueDate({
@@ -307,6 +337,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
         userRoleState,
         addressState,
         tagState,
+        userGroupsState,
     });
 };
 export const getAllTasks = createSelector((state) => state.taskListState, (state) => state.taskState, (state) => state.userState, (state) => state.userRoleState, (state) => state.userListViewState, (state) => state.addressState, (state) => state.taskGroupState, (state) => state.taskGroupViewState, (state) => state.tagViewState, (state) => state.tagState, (state) => state.taskGroupTemplateState, (state) => state.taskGroupTemplateViewState, (state) => state.userGroupsState, (state) => state.userGroupListViewState, (_state, isTaskTemplatesEnabled) => isTaskTemplatesEnabled, (taskListState, taskState, userState, userRoleState, userListViewState, addressState, taskGroupState, taskGroupViewState, tagViewState, tagState, taskGroupTemplateState, taskGroupTemplateViewState, userGroupsState, userGroupListViewState, isTaskTemplatesEnabled) => {
@@ -320,6 +351,7 @@ export const getAllTasks = createSelector((state) => state.taskListState, (state
         taskGroupState,
         taskGroupViewState,
         tagState,
+        userGroupsState,
     });
     const fetchStateVariables = [
         taskListState,

package/lib/esm/view/transactionDetail/epics/saveTransactionHelper.js

@@ -75,8 +75,8 @@ export const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDe
                 lineItem.account?.qboId !== accountLine.account.qboId &&
                     Boolean(lineItem.account?.qboId);
             hasClassChanged =
-                (lineItem.class?.qboId != null || accountLine.class?.qboId != null) &&
-                    lineItem.class?.qboId !== accountLine.class?.qboId;
+                Boolean(lineItem.class?.qboId) &&
+                    lineItem.class?.qboId !== accountLine.class.qboId;
             const recommendedAccountBase = toRecommendedAccountBase(lineItem.amount.amount, lineItem.account);
             const recommendedClassBase = toRecommendedClassBase(lineItem.amount.amount, lineItem.class);
             const latestRecommendedCategory = lineItem.recommendedAccount;