Merge branch 'develop' into multitenancy

Author: walker-sean

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/TaskFormModal.tsx

@@ -3,7 +3,7 @@ import { Autocomplete, FormControl, FormHelperText, FormLabel, Grid, MenuItem, T
 import { DatePicker } from '@mui/x-date-pickers';
 import { Controller, useForm } from 'react-hook-form';
 import { countWords, isGuest, isUnderWordCount, Task, TaskPriority, TeamPreview } from 'shared';
-import { useAllMembers, useCurrentUser } from '../../../../hooks/users.hooks';
+import { useAllUsers, useCurrentUser } from '../../../../hooks/users.hooks';
 import * as yup from 'yup';
 import { taskUserToAutocompleteOption } from '../../../../utils/task.utils';
 import NERFormModal from '../../../../components/NERFormModal';
@@ -42,7 +42,7 @@ interface TaskFormModalProps {
 const TaskFormModal: React.FC<TaskFormModalProps> = ({ task, onSubmit, modalShow, onHide, onReset }) => {
   const user = useCurrentUser();
 
-  const { data: users, isLoading, isError, error } = useAllMembers();
+  const { data: users, isLoading, isError, error } = useAllUsers();
 
   const {
     handleSubmit,