From f6ece0cded75aad36b39619933ae028edd180119 Mon Sep 17 00:00:00 2001
From: Paul Bui-Quang <paul.bui-quang@aphp.fr>
Date: Thu, 4 May 2023 16:44:00 +0200
Subject: [PATCH] refactor: remove dispatch any

---
 .../ControlPanel/ControlPanel.tsx             | 10 ++--
 .../components/Breadcrumbs/Breadcrumbs.tsx    |  4 +-
 .../LogicalOperator/LogicalOperator.tsx       | 22 ++++----
 .../components/Form/BiologyForm.tsx           |  2 +-
 .../components/Hierarchy/BiologyHierarchy.tsx |  8 +--
 .../CCAM/components/Form/CCAMForm.tsx         |  2 +-
 .../components/Hierarchy/CCAMHierarchy.tsx    |  8 +--
 .../Cim10Form/components/Form/Cim10Form.tsx   |  2 +-
 .../components/Hierarchy/Cim10Hierarchy.tsx   |  8 +--
 .../GHM/components/Form/GhmForm.tsx           |  2 +-
 .../GHM/components/Hierarchy/GhmHierarchy.tsx |  8 +--
 .../components/Form/MedicationForm.tsx        |  2 +-
 .../Hierarchy/MedicationHierarchy.tsx         |  8 +--
 .../RequestForm/RequestForm.tsx               |  2 +-
 .../LogicalOperatorItem.tsx                   | 18 +++---
 .../PopulationCard/PopulationCard.tsx         |  4 +-
 .../TemporalConstraintCard.tsx                |  4 +-
 .../TemporalConstraintModal.tsx               |  4 +-
 .../ModalCreateNewRequest.tsx                 | 18 +++---
 src/components/CreationCohort/Requeteur.tsx   | 10 ++--
 .../ModalAddOrEditProject.tsx                 |  6 +-
 .../ModalDeleteRequests.tsx                   |  2 +-
 .../ModalEditCohort/ModalEditCohort.tsx       |  8 +--
 .../ModalMoveRequest/ModalMoveRequest.tsx     |  2 +-
 .../ProjectTable/ProjectRow/ProjectRow.tsx    |  6 +-
 .../ProjectTable/RequestRow/RequestRow.tsx    |  4 +-
 .../ProjectTable/VersionRow/VersionRow.tsx    |  4 +-
 .../Patient/PatientBiology/PatientBiology.tsx |  2 +-
 .../Patient/PatientDocs/PatientDocs.tsx       |  2 +-
 .../PatientMedication/PatientMedication.tsx   |  2 +-
 .../Patient/PatientPMSI/PatientPMSI.tsx       |  2 +-
 .../PatientTimeline/PatientTimeline.tsx       |  2 +-
 .../Routes/LeftSideBar/LeftSideBar.tsx        | 18 +++---
 src/components/Routes/PrivateRoute.tsx        |  2 +-
 src/components/SavedResearch/ResearchCard.tsx |  6 +-
 .../ResearchTable/RequestsTable.tsx           | 10 ++--
 .../ResearchTable/ResearchTable.tsx           |  2 +-
 src/components/ScopeTree/ScopeTree.tsx        | 16 +++---
 src/components/TopBar/TopBar.tsx              |  8 +--
 .../Welcome/ResearchCard/ResearchCard.tsx     |  8 +--
 src/state/cohortCreation.ts                   | 24 ++++----
 src/state/exploredCohort.ts                   |  2 +-
 src/state/request.ts                          |  2 +-
 src/utils/pmsi.ts                             | 55 ++++++++++---------
 src/views/Dashboard/Dashboard.tsx             |  4 +-
 src/views/MyProjects/MyProjects.tsx           | 24 ++++----
 src/views/Patient/Patient.tsx                 |  2 +-
 src/views/Welcome/Welcome.tsx                 | 16 +++---
 48 files changed, 195 insertions(+), 192 deletions(-)

diff --git a/src/components/CreationCohort/ControlPanel/ControlPanel.tsx b/src/components/CreationCohort/ControlPanel/ControlPanel.tsx
index 4a4bebbb4..38aa6dded 100644
--- a/src/components/CreationCohort/ControlPanel/ControlPanel.tsx
+++ b/src/components/CreationCohort/ControlPanel/ControlPanel.tsx
@@ -117,15 +117,15 @@ const ControlPanel: React.FC<{
     if (logicalOperatorNeedToBeErase && logicalOperatorNeedToBeErase.length > 0) {
       for (const logicalOperator of logicalOperatorNeedToBeErase) {
         const { id } = logicalOperator
-        dispatch<any>(deleteCriteriaGroup(id))
+        dispatch(deleteCriteriaGroup(id))
       }
     }
-    dispatch<any>(buildCohortCreation({}))
+    dispatch(buildCohortCreation({}))
   }
 
   const _relaunchCount = (keepCount: boolean) => {
     if (keepCount) setOldCount(count ?? null)
-    dispatch<any>(
+    dispatch(
       countCohortCreation({
         json,
         snapshotId: currentSnapshot,
@@ -151,7 +151,7 @@ const ControlPanel: React.FC<{
   useEffect(() => {
     const interval = setInterval(() => {
       if (count && count.status && (count.status === 'pending' || count.status === 'started')) {
-        dispatch<any>(countCohortCreation({ uuid: count.uuid }))
+        dispatch(countCohortCreation({ uuid: count.uuid }))
       } else {
         clearInterval(interval)
       }
@@ -198,7 +198,7 @@ const ControlPanel: React.FC<{
 
           <Button
             onClick={() => {
-              dispatch<any>(resetCohortCreation())
+              dispatch(resetCohortCreation())
             }}
             className={classes.actionButton}
             startIcon={<UpdateSharpIcon color="action" className={classes.iconBorder} />}
diff --git a/src/components/CreationCohort/DiagramView/components/Breadcrumbs/Breadcrumbs.tsx b/src/components/CreationCohort/DiagramView/components/Breadcrumbs/Breadcrumbs.tsx
index db6e21bd2..7c468a82a 100644
--- a/src/components/CreationCohort/DiagramView/components/Breadcrumbs/Breadcrumbs.tsx
+++ b/src/components/CreationCohort/DiagramView/components/Breadcrumbs/Breadcrumbs.tsx
@@ -33,9 +33,9 @@ const CohortCreationBreadcrumbs: React.FC = () => {
 
   useEffect(() => {
     if (!projects || (projects && projects.length === 0)) {
-      dispatch<any>(fetchProjectsList())
+      dispatch(fetchProjectsList())
     } else if (!requests || (requests && requests.length === 0)) {
-      dispatch<any>(fetchRequestsList())
+      dispatch(fetchRequestsList())
     } else {
       const foundItem = requests.find(({ uuid }) => uuid === requestId)
       if (foundItem) {
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/LogicalOperator.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/LogicalOperator.tsx
index 72e5457c1..8b14871d3 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/LogicalOperator.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/LogicalOperator.tsx
@@ -172,7 +172,7 @@ const LogicalOperator: React.FC = () => {
   const [selectedCriteria, setSelectedCriteria] = useState<SelectedCriteriaType | null>(null)
 
   const _buildCohortCreation = () => {
-    dispatch<any>(buildCohortCreation({}))
+    dispatch(buildCohortCreation({}))
   }
 
   const _onConfirmAddOrEditCriteria = async (item: SelectedCriteriaType) => {
@@ -180,15 +180,15 @@ const LogicalOperator: React.FC = () => {
     const nextCriteriaId = request.nextCriteriaId
     if (item.id !== undefined) {
       // Edition
-      await dispatch<any>(editSelectedCriteria(item))
+      await dispatch(editSelectedCriteria(item))
     } else {
       // Creation
       item.id = nextCriteriaId
-      await dispatch<any>(addNewSelectedCriteria(item))
+      await dispatch(addNewSelectedCriteria(item))
       // Link criteria with group operator
       const currentParent = request.criteriaGroup ? request.criteriaGroup.find(({ id }) => id === parentId) : null
       if (!currentParent) return
-      await dispatch<any>(
+      await dispatch(
         editCriteriaGroup({
           ...currentParent,
           criteriaIds: [...currentParent.criteriaIds, nextCriteriaId]
@@ -211,9 +211,9 @@ const LogicalOperator: React.FC = () => {
       isSubGroup: parentId === 0 ? false : true,
       isInclusive: true
     }
-    await dispatch<any>(addNewCriteriaGroup(newOperator))
+    await dispatch(addNewCriteriaGroup(newOperator))
     // Edit parent and add nextGroupId inside criteriaIds
-    await dispatch<any>(
+    await dispatch(
       editCriteriaGroup({
         ...currentParent,
         criteriaIds: [...currentParent.criteriaIds, nextGroupId]
@@ -223,26 +223,26 @@ const LogicalOperator: React.FC = () => {
   }
 
   const _addNewCriteria = (parentId: number) => {
-    dispatch<any>(suspendCount())
+    dispatch(suspendCount())
     setOpenDrawer('criteria')
     setParentId(parentId)
     setSelectedCriteria(null)
   }
 
   const _editCriteria = (criteria: SelectedCriteriaType, parentId: number) => {
-    dispatch<any>(suspendCount())
+    dispatch(suspendCount())
     setOpenDrawer('criteria')
     setParentId(parentId)
     setSelectedCriteria(criteria)
   }
 
   const _deleteCriteria = async (criteriaId: number) => {
-    await dispatch<any>(deleteSelectedCriteria(criteriaId))
+    await dispatch(deleteSelectedCriteria(criteriaId))
     _buildCohortCreation()
   }
 
   const _duplicateCriteria = async (criteriaId: number) => {
-    await dispatch<any>(duplicateSelectedCriteria(criteriaId))
+    await dispatch(duplicateSelectedCriteria(criteriaId))
     _buildCohortCreation()
   }
 
@@ -264,7 +264,7 @@ const LogicalOperator: React.FC = () => {
         onChangeSelectedCriteria={_onConfirmAddOrEditCriteria}
         open={openDrawer === 'criteria'}
         onClose={() => {
-          dispatch<any>(unsuspendCount())
+          dispatch(unsuspendCount())
           setOpenDrawer(null)
         }}
       />
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/components/Form/BiologyForm.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/components/Form/BiologyForm.tsx
index e96adcd35..107e302a4 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/components/Form/BiologyForm.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/components/Form/BiologyForm.tsx
@@ -54,7 +54,7 @@ const BiologyForm: React.FC<BiologyFormProps> = (props) => {
       return setError(true)
     }
     onChangeSelectedCriteria(currentState)
-    dispatch<any>(fetchBiology())
+    dispatch(fetchBiology())
   }
 
   const defaultValuesCode = currentState.code
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/components/Hierarchy/BiologyHierarchy.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/components/Hierarchy/BiologyHierarchy.tsx
index db1886665..4d27840b1 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/components/Hierarchy/BiologyHierarchy.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/components/Hierarchy/BiologyHierarchy.tsx
@@ -55,7 +55,7 @@ const BiologyListItem: React.FC<BiologyListItemProps> = (props) => {
   const isIndeterminated = checkIfIndeterminated(biologyItem, selectedItems)
   const _onExpand = async (biologyCode: string) => {
     if (isLoadingsyncHierarchyTable > 0 || isLoadingPmsi > 0) return
-    dispatch<any>(incrementLoadingSyncHierarchyTable())
+    dispatch(incrementLoadingSyncHierarchyTable())
     setOpen(!open)
     const newHierarchy = await expandItem(
       biologyCode,
@@ -65,15 +65,15 @@ const BiologyListItem: React.FC<BiologyListItemProps> = (props) => {
       dispatch
     )
     await handleClick(selectedItems, newHierarchy)
-    dispatch<any>(decrementLoadingSyncHierarchyTable())
+    dispatch(decrementLoadingSyncHierarchyTable())
   }
 
   const handleClickOnHierarchy = async (biologyItem: PmsiListType) => {
     if (isLoadingsyncHierarchyTable > 0 || isLoadingPmsi > 0) return
-    dispatch<any>(incrementLoadingSyncHierarchyTable())
+    dispatch(incrementLoadingSyncHierarchyTable())
     const newSelectedItems = getSelectedPmsi(biologyItem, selectedItems || [], biologyHierarchy)
     await handleClick(newSelectedItems)
-    dispatch<any>(decrementLoadingSyncHierarchyTable())
+    dispatch(decrementLoadingSyncHierarchyTable())
   }
 
   if (!subItems || (subItems && Array.isArray(subItems) && subItems.length === 0)) {
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/components/Form/CCAMForm.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/components/Form/CCAMForm.tsx
index e2f68dbe1..442439bbd 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/components/Form/CCAMForm.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/components/Form/CCAMForm.tsx
@@ -39,7 +39,7 @@ const CcamForm: React.FC<CcamFormProps> = (props) => {
       return setError(true)
     }
     onChangeSelectedCriteria(currentState)
-    dispatch<any>(fetchProcedure())
+    dispatch(fetchProcedure())
   }
 
   const getCCAMOptions = async (searchValue: string) => {
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/components/Hierarchy/CCAMHierarchy.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/components/Hierarchy/CCAMHierarchy.tsx
index 257e7ee1f..cf0792d15 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/components/Hierarchy/CCAMHierarchy.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/components/Hierarchy/CCAMHierarchy.tsx
@@ -58,7 +58,7 @@ const ProcedureListItem: React.FC<ProcedureListItemProps> = (props) => {
   const isIndeterminated = checkIfIndeterminated(procedureItem, selectedItems)
   const _onExpand = async (procedureCode: string) => {
     if (isLoadingsyncHierarchyTable > 0 || isLoadingPmsi > 0) return
-    dispatch<any>(incrementLoadingSyncHierarchyTable())
+    dispatch(incrementLoadingSyncHierarchyTable())
     setOpen(!open)
     const newHierarchy = await expandItem(
       procedureCode,
@@ -68,15 +68,15 @@ const ProcedureListItem: React.FC<ProcedureListItemProps> = (props) => {
       dispatch
     )
     await handleClick(selectedItems, newHierarchy)
-    dispatch<any>(decrementLoadingSyncHierarchyTable())
+    dispatch(decrementLoadingSyncHierarchyTable())
   }
 
   const handleClickOnHierarchy = async (procedureItem: PmsiListType) => {
     if (isLoadingsyncHierarchyTable > 0 || isLoadingPmsi > 0) return
-    dispatch<any>(incrementLoadingSyncHierarchyTable())
+    dispatch(incrementLoadingSyncHierarchyTable())
     const newSelectedItems = getSelectedPmsi(procedureItem, selectedItems || [], procedureHierarchy)
     await handleClick(newSelectedItems)
-    dispatch<any>(decrementLoadingSyncHierarchyTable())
+    dispatch(decrementLoadingSyncHierarchyTable())
   }
 
   if (!subItems || (subItems && Array.isArray(subItems) && subItems.length === 0)) {
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Form/Cim10Form.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Form/Cim10Form.tsx
index 7d6975a3f..3045b1b36 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Form/Cim10Form.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Form/Cim10Form.tsx
@@ -49,7 +49,7 @@ const Cim10Form: React.FC<Cim10FormProps> = (props) => {
       return setError(true)
     }
     onChangeSelectedCriteria(currentState)
-    dispatch<any>(fetchCondition())
+    dispatch(fetchCondition())
   }
   const getDiagOptions = async (searchValue: string) => await criteria.fetch.fetchCim10Diagnostic(searchValue, false)
 
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Hierarchy/Cim10Hierarchy.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Hierarchy/Cim10Hierarchy.tsx
index 14be09fc8..1a0ae4006 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Hierarchy/Cim10Hierarchy.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Hierarchy/Cim10Hierarchy.tsx
@@ -54,7 +54,7 @@ const CimListItem: React.FC<CimListItemProps> = (props) => {
   const isIndeterminated = checkIfIndeterminated(cim10Item, selectedItems)
   const _onExpand = async (cim10Code: string) => {
     if (isLoadingsyncHierarchyTable > 0 || isLoadingPmsi > 0) return
-    dispatch<any>(incrementLoadingSyncHierarchyTable())
+    dispatch(incrementLoadingSyncHierarchyTable())
     setOpen(!open)
     const newHierarchy = await expandItem(
       cim10Code,
@@ -64,15 +64,15 @@ const CimListItem: React.FC<CimListItemProps> = (props) => {
       dispatch
     )
     await handleClick(selectedItems, newHierarchy)
-    dispatch<any>(decrementLoadingSyncHierarchyTable())
+    dispatch(decrementLoadingSyncHierarchyTable())
   }
 
   const handleClickOnHierarchy = async (cim10Item: PmsiListType) => {
     if (isLoadingsyncHierarchyTable > 0 || isLoadingPmsi > 0) return
-    dispatch<any>(incrementLoadingSyncHierarchyTable())
+    dispatch(incrementLoadingSyncHierarchyTable())
     const newSelectedItems = getSelectedPmsi(cim10Item, selectedItems || [], cim10Hierarchy)
     await handleClick(newSelectedItems)
-    dispatch<any>(decrementLoadingSyncHierarchyTable())
+    dispatch(decrementLoadingSyncHierarchyTable())
   }
 
   if (!subItems || (subItems && Array.isArray(subItems) && subItems.length === 0)) {
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/components/Form/GhmForm.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/components/Form/GhmForm.tsx
index 2941c2f81..aedd12d74 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/components/Form/GhmForm.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/components/Form/GhmForm.tsx
@@ -40,7 +40,7 @@ const GhmForm: React.FC<GHMFormProps> = (props) => {
       return setError(true)
     }
     onChangeSelectedCriteria(currentState)
-    dispatch<any>(fetchClaim())
+    dispatch(fetchClaim())
   }
   const defaultValuesCode = currentState.code
     ? currentState.code.map((code: any) => {
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/components/Hierarchy/GhmHierarchy.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/components/Hierarchy/GhmHierarchy.tsx
index f4ebdc38f..57a59a53e 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/components/Hierarchy/GhmHierarchy.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/components/Hierarchy/GhmHierarchy.tsx
@@ -54,19 +54,19 @@ const GhmListItem: React.FC<GhmListItemProps> = (props) => {
   const isIndeterminated = checkIfIndeterminated(ghmItem, selectedItems)
   const _onExpand = async (ghmCode: string) => {
     if (isLoadingsyncHierarchyTable > 0 || isLoadingPmsi > 0) return
-    dispatch<any>(incrementLoadingSyncHierarchyTable())
+    dispatch(incrementLoadingSyncHierarchyTable())
     setOpen(!open)
     const newHierarchy = await expandItem(ghmCode, selectedItems || [], ghmHierarchy, defaultDemographic.type, dispatch)
     await handleClick(selectedItems, newHierarchy)
-    dispatch<any>(decrementLoadingSyncHierarchyTable())
+    dispatch(decrementLoadingSyncHierarchyTable())
   }
 
   const handleClickOnHierarchy = async (ghmItem: PmsiListType) => {
     if (isLoadingsyncHierarchyTable > 0 || isLoadingPmsi > 0) return
-    dispatch<any>(incrementLoadingSyncHierarchyTable())
+    dispatch(incrementLoadingSyncHierarchyTable())
     const newSelectedItems = getSelectedPmsi(ghmItem, selectedItems || [], ghmHierarchy)
     await handleClick(newSelectedItems)
-    dispatch<any>(decrementLoadingSyncHierarchyTable())
+    dispatch(decrementLoadingSyncHierarchyTable())
   }
 
   if (!subItems || (subItems && Array.isArray(subItems) && subItems.length === 0)) {
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Form/MedicationForm.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Form/MedicationForm.tsx
index 076ee5299..7ef690e03 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Form/MedicationForm.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Form/MedicationForm.tsx
@@ -63,7 +63,7 @@ const MedicationForm: React.FC<MedicationFormProps> = (props) => {
       return setError(true)
     }
     onChangeSelectedCriteria(currentState)
-    dispatch<any>(fetchMedication())
+    dispatch(fetchMedication())
   }
 
   if (criteria?.data?.prescriptionTypes === 'loading' || criteria?.data?.administrations === 'loading') {
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Hierarchy/MedicationHierarchy.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Hierarchy/MedicationHierarchy.tsx
index 58b708351..38083f5e8 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Hierarchy/MedicationHierarchy.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Hierarchy/MedicationHierarchy.tsx
@@ -61,7 +61,7 @@ const MedicationListItem: React.FC<MedicationListItemProps> = (props) => {
 
   const _onExpand = async (medicationCode: string) => {
     if (isLoadingsyncHierarchyTable > 0 || isLoadingMedication > 0) return
-    dispatch<any>(incrementLoadingSyncHierarchyTable())
+    dispatch(incrementLoadingSyncHierarchyTable())
     setOpen(!open)
     const newHierarchy = await expandItem(
       medicationCode,
@@ -71,15 +71,15 @@ const MedicationListItem: React.FC<MedicationListItemProps> = (props) => {
       dispatch
     )
     await handleClick(selectedItems, newHierarchy)
-    dispatch<any>(decrementLoadingSyncHierarchyTable())
+    dispatch(decrementLoadingSyncHierarchyTable())
   }
 
   const handleClickOnHierarchy = (medicationItem: MedicationListType) => {
     if (isLoadingsyncHierarchyTable > 0 || isLoadingMedication > 0) return
-    dispatch<any>(incrementLoadingSyncHierarchyTable())
+    dispatch(incrementLoadingSyncHierarchyTable())
     const newSelectedItems = getSelectedPmsi(medicationItem, selectedItems || [], medicationHierarchy)
     handleClick(newSelectedItems)
-    dispatch<any>(decrementLoadingSyncHierarchyTable())
+    dispatch(decrementLoadingSyncHierarchyTable())
   }
 
   if (!subItems || (subItems && Array.isArray(subItems) && subItems.length === 0)) {
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/RequestForm/RequestForm.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/RequestForm/RequestForm.tsx
index ba1500442..5c1e12c78 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/RequestForm/RequestForm.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/RequestForm/RequestForm.tsx
@@ -37,7 +37,7 @@ const RequestForm: React.FC<RequestFormProps> = ({ parentId, goBack }) => {
       return setError(true)
     }
 
-    dispatch<any>(addRequestToCohortCreation({ parentId, selectedRequestId }))
+    dispatch(addRequestToCohortCreation({ parentId, selectedRequestId }))
   }
 
   return (
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/LogicalOperatorItem/LogicalOperatorItem.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/LogicalOperatorItem/LogicalOperatorItem.tsx
index 24cdc0d4c..bc723695e 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/LogicalOperatorItem/LogicalOperatorItem.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/LogicalOperatorItem/LogicalOperatorItem.tsx
@@ -91,11 +91,11 @@ const LogicalOperatorItem: React.FC<LogicalOperatorItemProps> = ({ itemId }) =>
   }
 
   const _buildCohortCreation = () => {
-    dispatch<any>(buildCohortCreation({}))
+    dispatch(buildCohortCreation({}))
   }
 
   const _deleteLogicalOperator = async () => {
-    await dispatch<any>(deleteCriteriaGroup(itemId))
+    await dispatch(deleteCriteriaGroup(itemId))
     _buildCohortCreation()
   }
 
@@ -107,7 +107,7 @@ const LogicalOperatorItem: React.FC<LogicalOperatorItemProps> = ({ itemId }) =>
 
       switch (value) {
         case 'atLeast':
-          dispatch<any>(
+          dispatch(
             editCriteriaGroup({
               ..._currentLogicalOperator,
               type: 'NamongM',
@@ -121,7 +121,7 @@ const LogicalOperatorItem: React.FC<LogicalOperatorItemProps> = ({ itemId }) =>
           )
           break
         case 'atMost':
-          dispatch<any>(
+          dispatch(
             editCriteriaGroup({
               ..._currentLogicalOperator,
               type: 'NamongM',
@@ -135,7 +135,7 @@ const LogicalOperatorItem: React.FC<LogicalOperatorItemProps> = ({ itemId }) =>
           )
           break
         case 'exactly':
-          dispatch<any>(
+          dispatch(
             editCriteriaGroup({
               ..._currentLogicalOperator,
               type: 'NamongM',
@@ -151,7 +151,7 @@ const LogicalOperatorItem: React.FC<LogicalOperatorItemProps> = ({ itemId }) =>
         case 'andGroup':
         case 'orGroup':
         default:
-          dispatch<any>(
+          dispatch(
             editCriteriaGroup({
               ..._currentLogicalOperator,
               type: value
@@ -160,7 +160,7 @@ const LogicalOperatorItem: React.FC<LogicalOperatorItemProps> = ({ itemId }) =>
           break
       }
     } else if (key === 'options.number') {
-      dispatch<any>(
+      dispatch(
         editCriteriaGroup({
           ..._currentLogicalOperator,
           type: 'NamongM',
@@ -173,7 +173,7 @@ const LogicalOperatorItem: React.FC<LogicalOperatorItemProps> = ({ itemId }) =>
         })
       )
     } else {
-      dispatch<any>(
+      dispatch(
         editCriteriaGroup({
           ..._currentLogicalOperator,
           [key]: value
@@ -297,7 +297,7 @@ const LogicalOperatorItem: React.FC<LogicalOperatorItemProps> = ({ itemId }) =>
           </Button>
           <Button
             onClick={() => {
-              dispatch<any>(updateTemporalConstraints([]))
+              dispatch(updateTemporalConstraints([]))
               _handleChangeLogicalOperatorProps('groupType', 'orGroup')
             }}
           >
diff --git a/src/components/CreationCohort/DiagramView/components/PopulationCard/PopulationCard.tsx b/src/components/CreationCohort/DiagramView/components/PopulationCard/PopulationCard.tsx
index 3106424f8..efacad83c 100644
--- a/src/components/CreationCohort/DiagramView/components/PopulationCard/PopulationCard.tsx
+++ b/src/components/CreationCohort/DiagramView/components/PopulationCard/PopulationCard.tsx
@@ -56,13 +56,13 @@ const PopulationCard: React.FC = () => {
       subItems: []
     }))
 
-    dispatch<any>(buildCohortCreation({ selectedPopulation: _selectedPopulations }))
+    dispatch(buildCohortCreation({ selectedPopulation: _selectedPopulations }))
     onChangeOpenDrawer(false)
   }
 
   const fetchScopeTree = () => {
     if (scopesList && scopesList.length === 0) {
-      dispatch<any>(fetchScopesList())
+      dispatch(fetchScopesList())
     }
   }
 
diff --git a/src/components/CreationCohort/DiagramView/components/TemporalConstraintCard/TemporalConstraintCard.tsx b/src/components/CreationCohort/DiagramView/components/TemporalConstraintCard/TemporalConstraintCard.tsx
index 3e9a2ad3f..cccd82a8f 100644
--- a/src/components/CreationCohort/DiagramView/components/TemporalConstraintCard/TemporalConstraintCard.tsx
+++ b/src/components/CreationCohort/DiagramView/components/TemporalConstraintCard/TemporalConstraintCard.tsx
@@ -53,8 +53,8 @@ const TemporalConstraint: React.FC = () => {
       ) {
         if (temporalConstraints && temporalConstraints.length > 1) {
           temporalConstraints?.map((temporalConstraint) => {
-            dispatch<any>(deleteTemporalConstraint(temporalConstraint))
-            dispatch<any>(buildCohortCreation({}))
+            dispatch(deleteTemporalConstraint(temporalConstraint))
+            dispatch(buildCohortCreation({}))
           })
         }
         setDisableTemporalConstraint(true)
diff --git a/src/components/CreationCohort/DiagramView/components/TemporalConstraintCard/components/TemporalConstraintModal/TemporalConstraintModal.tsx b/src/components/CreationCohort/DiagramView/components/TemporalConstraintCard/components/TemporalConstraintModal/TemporalConstraintModal.tsx
index 35d8044b5..5ee902ff1 100644
--- a/src/components/CreationCohort/DiagramView/components/TemporalConstraintCard/components/TemporalConstraintModal/TemporalConstraintModal.tsx
+++ b/src/components/CreationCohort/DiagramView/components/TemporalConstraintCard/components/TemporalConstraintModal/TemporalConstraintModal.tsx
@@ -38,8 +38,8 @@ const TemporalConstraint: React.FC<{
   const dispatch = useAppDispatch()
 
   const handleConfirm = () => {
-    dispatch<any>(updateTemporalConstraints(newConstraintsList))
-    dispatch<any>(buildCohortCreation({}))
+    dispatch(updateTemporalConstraints(newConstraintsList))
+    dispatch(buildCohortCreation({}))
   }
 
   const handleClose = () => {
diff --git a/src/components/CreationCohort/Modals/ModalCreateNewRequest/ModalCreateNewRequest.tsx b/src/components/CreationCohort/Modals/ModalCreateNewRequest/ModalCreateNewRequest.tsx
index b36c1ed09..57a2c75d8 100644
--- a/src/components/CreationCohort/Modals/ModalCreateNewRequest/ModalCreateNewRequest.tsx
+++ b/src/components/CreationCohort/Modals/ModalCreateNewRequest/ModalCreateNewRequest.tsx
@@ -72,8 +72,8 @@ const ModalCreateNewRequest: React.FC<{
     if (projectState && projectState.projectsList && projectState.projectsList.length > 0) {
       projectsList = projectState.projectsList
     } else {
-      const myProjects = (await dispatch<any>(fetchProjects())) || []
-      projectsList = myProjects.payload.results
+      const myProjects = (await dispatch(fetchProjects()).unwrap()) || []
+      projectsList = myProjects.projectsList
     }
     // Auto select newset project folder
     // + Auto set the new project folder with 'Projet de recherche ...'
@@ -94,9 +94,9 @@ const ModalCreateNewRequest: React.FC<{
     if (requestState && requestState.requestsList) {
       _onChangeValue('name', `Nouvelle requête ${(requestState?.requestsList.length || 0) + 1}`)
     } else {
-      const requestResponse = await dispatch<any>(fetchRequests())
+      const requestResponse = await dispatch(fetchRequests()).unwrap()
       if (!requestResponse) return
-      _onChangeValue('name', `Nouvelle requête ${(requestResponse?.payload?.count || 0) + 1}`)
+      _onChangeValue('name', `Nouvelle requête ${(requestResponse?.count || 0) + 1}`)
     }
   }
 
@@ -145,19 +145,19 @@ const ModalCreateNewRequest: React.FC<{
       if (newProject) {
         currentRequest.parent_folder = newProject.uuid
       }
-      dispatch<any>(fetchProjects())
+      dispatch(fetchProjects())
     }
 
     if (isEdition) {
-      dispatch<any>(editRequest({ editedRequest: currentRequest }))
+      dispatch(editRequest({ editedRequest: currentRequest }))
     } else {
-      dispatch<any>(addRequest({ newRequest: currentRequest }))
+      dispatch(addRequest({ newRequest: currentRequest }))
     }
   }
 
   const handleConfirmOpen = () => {
     if (tab === 'open' && openRequest !== null) {
-      dispatch<any>(fetchRequestCohortCreation({ requestId: openRequest }))
+      dispatch(fetchRequestCohortCreation({ requestId: openRequest }))
     }
   }
 
@@ -165,7 +165,7 @@ const ModalCreateNewRequest: React.FC<{
     if (loading || !isEdition || !selectedRequest) return
     setLoading(true)
 
-    dispatch<any>(deleteRequest({ deletedRequest: selectedRequest }))
+    dispatch(deleteRequest({ deletedRequest: selectedRequest }))
   }
 
   return (
diff --git a/src/components/CreationCohort/Requeteur.tsx b/src/components/CreationCohort/Requeteur.tsx
index cfcad9464..8eddffa93 100644
--- a/src/components/CreationCohort/Requeteur.tsx
+++ b/src/components/CreationCohort/Requeteur.tsx
@@ -62,8 +62,8 @@ const Requeteur = () => {
     setRequestLoading((requestLoading) => requestLoading + 1)
     try {
       if (requestIdFromUrl) {
-        dispatch<any>(resetCohortCreation())
-        dispatch<any>(
+        dispatch(resetCohortCreation())
+        dispatch(
           fetchRequestCohortCreation({
             requestId: requestIdFromUrl,
             snapshotId: snapshotIdFromUrl
@@ -93,7 +93,7 @@ const Requeteur = () => {
       })
 
       _criteria = await getDataFromFetch(Object.freeze(_criteria), selectedCriteria, criteriaList)
-      dispatch<any>(setCriteriaList(_criteria))
+      dispatch(setCriteriaList(_criteria))
     } catch (error) {
       console.error(error)
     }
@@ -103,7 +103,7 @@ const Requeteur = () => {
   }, [dispatch, criteriaGroup, selectedCriteria, selectedPopulation]) // eslint-disable-line
 
   const _unbuildRequest = async (newCurrentSnapshot: CohortCreationSnapshotType) => {
-    dispatch<any>(unbuildCohortCreation({ newCurrentSnapshot }))
+    dispatch(unbuildCohortCreation({ newCurrentSnapshot }))
   }
 
   /**
@@ -126,7 +126,7 @@ const Requeteur = () => {
       )
 
       if (createCohortResult && createCohortResult.status === 201) {
-        dispatch<any>(resetCohortCreation())
+        dispatch(resetCohortCreation())
         navigate(`/home`)
       }
     }
diff --git a/src/components/MyProjects/Modals/ModalAddOrEditProject/ModalAddOrEditProject.tsx b/src/components/MyProjects/Modals/ModalAddOrEditProject/ModalAddOrEditProject.tsx
index 7b65e6e63..df00d072d 100644
--- a/src/components/MyProjects/Modals/ModalAddOrEditProject/ModalAddOrEditProject.tsx
+++ b/src/components/MyProjects/Modals/ModalAddOrEditProject/ModalAddOrEditProject.tsx
@@ -65,9 +65,9 @@ const ModalAddOrEditProject: React.FC<{
 
     if (!selectedProject) return
     if (isEdition) {
-      dispatch<any>(editProject({ editedProject: modalProjectState }))
+      dispatch(editProject({ editedProject: modalProjectState }))
     } else {
-      dispatch<any>(addProject({ newProject: modalProjectState }))
+      dispatch(addProject({ newProject: modalProjectState }))
     }
   }
 
@@ -76,7 +76,7 @@ const ModalAddOrEditProject: React.FC<{
     setLoading(true)
 
     if (isEdition && selectedProject !== null) {
-      dispatch<any>(deleteProject({ deletedProject: selectedProject }))
+      dispatch(deleteProject({ deletedProject: selectedProject }))
     }
     onClose()
   }
diff --git a/src/components/MyProjects/Modals/ModalDeleteRequests/ModalDeleteRequests.tsx b/src/components/MyProjects/Modals/ModalDeleteRequests/ModalDeleteRequests.tsx
index 0e3163110..15a16ad8d 100644
--- a/src/components/MyProjects/Modals/ModalDeleteRequests/ModalDeleteRequests.tsx
+++ b/src/components/MyProjects/Modals/ModalDeleteRequests/ModalDeleteRequests.tsx
@@ -26,7 +26,7 @@ const ModalMoveRequest: React.FunctionComponent<IModalMoveRequestProps> = ({ ope
   const dispatch = useAppDispatch()
 
   const _onConfirm = async () => {
-    await dispatch<any>(deleteRequests({ deletedRequests: selectedRequests }))
+    await dispatch(deleteRequests({ deletedRequests: selectedRequests }))
 
     onClose(true)
   }
diff --git a/src/components/MyProjects/Modals/ModalEditCohort/ModalEditCohort.tsx b/src/components/MyProjects/Modals/ModalEditCohort/ModalEditCohort.tsx
index 418cd55fb..d20d254c9 100644
--- a/src/components/MyProjects/Modals/ModalEditCohort/ModalEditCohort.tsx
+++ b/src/components/MyProjects/Modals/ModalEditCohort/ModalEditCohort.tsx
@@ -59,7 +59,7 @@ const ModalEditCohort: React.FC<{
   }
 
   const handleClose = () => {
-    dispatch<any>(setSelectedCohortState(null))
+    dispatch(setSelectedCohortState(null))
     onClose()
   }
 
@@ -74,9 +74,9 @@ const ModalEditCohort: React.FC<{
 
     if (!selectedCohort) return
     if (isEdition) {
-      await dispatch<any>(editCohort({ editedCohort: modalCohortState }))
+      await dispatch(editCohort({ editedCohort: modalCohortState }))
     } else {
-      await dispatch<any>(addCohort({ newCohort: modalCohortState }))
+      await dispatch(addCohort({ newCohort: modalCohortState }))
     }
     onClose()
   }
@@ -86,7 +86,7 @@ const ModalEditCohort: React.FC<{
     setLoading(true)
 
     if (isEdition && selectedCohort !== null) {
-      await dispatch<any>(deleteCohort({ deletedCohort: selectedCohort }))
+      await dispatch(deleteCohort({ deletedCohort: selectedCohort }))
     }
     onClose()
   }
diff --git a/src/components/MyProjects/Modals/ModalMoveRequest/ModalMoveRequest.tsx b/src/components/MyProjects/Modals/ModalMoveRequest/ModalMoveRequest.tsx
index 06e13bdec..33eaf24f9 100644
--- a/src/components/MyProjects/Modals/ModalMoveRequest/ModalMoveRequest.tsx
+++ b/src/components/MyProjects/Modals/ModalMoveRequest/ModalMoveRequest.tsx
@@ -34,7 +34,7 @@ const ModalMoveRequest: React.FunctionComponent<IModalMoveRequestProps> = ({ ope
   }, [open])
 
   const _onConfirm = async () => {
-    await dispatch<any>(
+    await dispatch(
       moveRequests({
         selectedRequests,
         parent_folder: currentFolder !== null ? currentFolder.uuid : undefined
diff --git a/src/components/MyProjects/ProjectTable/ProjectRow/ProjectRow.tsx b/src/components/MyProjects/ProjectTable/ProjectRow/ProjectRow.tsx
index 517a40f24..edca15912 100644
--- a/src/components/MyProjects/ProjectTable/ProjectRow/ProjectRow.tsx
+++ b/src/components/MyProjects/ProjectTable/ProjectRow/ProjectRow.tsx
@@ -49,15 +49,15 @@ const ProjectRow: React.FC<ProjectRowProps> = ({
   const handleClickAddOrEditProject = (selectedProjectId: string | null) => {
     onSelectedRow([])
     if (selectedProjectId) {
-      dispatch<any>(setSelectedProject(selectedProjectId))
+      dispatch(setSelectedProject(selectedProjectId))
     } else {
-      dispatch<any>(setSelectedProject(null))
+      dispatch(setSelectedProject(null))
     }
   }
 
   const handleAddRequest = () => {
     onSelectedRow([])
-    dispatch<any>(setSelectedRequest({ uuid: '', name: '', parent_folder: row.uuid }))
+    dispatch(setSelectedRequest({ uuid: '', name: '', parent_folder: row.uuid }))
   }
 
   // eslint-disable-next-line
diff --git a/src/components/MyProjects/ProjectTable/RequestRow/RequestRow.tsx b/src/components/MyProjects/ProjectTable/RequestRow/RequestRow.tsx
index ba6a79711..4ba8ecaa5 100644
--- a/src/components/MyProjects/ProjectTable/RequestRow/RequestRow.tsx
+++ b/src/components/MyProjects/ProjectTable/RequestRow/RequestRow.tsx
@@ -37,11 +37,11 @@ const RequestRow: React.FC<RequestRowProps> = ({ row, cohortsList, selectedReque
   const maintenanceIsActive = meState?.maintenance?.active
 
   const onEditRequest = (requestId: string) => {
-    dispatch<any>(setSelectedRequest({ uuid: requestId, name: '' }))
+    dispatch(setSelectedRequest({ uuid: requestId, name: '' }))
   }
 
   const onShareRequest = (requestId: string) => {
-    dispatch<any>(setSelectedRequestShare({ uuid: requestId, name: '' }))
+    dispatch(setSelectedRequestShare({ uuid: requestId, name: '' }))
   }
 
   useEffect(() => {
diff --git a/src/components/MyProjects/ProjectTable/VersionRow/VersionRow.tsx b/src/components/MyProjects/ProjectTable/VersionRow/VersionRow.tsx
index 56476f86d..faecdcf49 100644
--- a/src/components/MyProjects/ProjectTable/VersionRow/VersionRow.tsx
+++ b/src/components/MyProjects/ProjectTable/VersionRow/VersionRow.tsx
@@ -45,7 +45,7 @@ const VersionRow: React.FC<{ requestId: string; cohortsList: Cohort[] }> = ({ re
       .sort((a, b) => +moment(a.created_at).format('x') - +moment(b.created_at).format('x')) || []
 
   const _handleEditCohort = (cohort: Cohort) => {
-    dispatch<any>(setSelectedCohort(cohort ?? null))
+    dispatch(setSelectedCohort(cohort ?? null))
   }
 
   // You can make an export if you got 1 cohort with: EXPORT_ACCESS = 'DATA_NOMINATIVE'
@@ -63,7 +63,7 @@ const VersionRow: React.FC<{ requestId: string; cohortsList: Cohort[] }> = ({ re
     )
 
   const onSetCohortFavorite = async (cohort: Cohort) => {
-    await dispatch<any>(editCohort({ editedCohort: { ...cohort, favorite: !cohort.favorite } }))
+    await dispatch(editCohort({ editedCohort: { ...cohort, favorite: !cohort.favorite } }))
   }
 
   return (
diff --git a/src/components/Patient/PatientBiology/PatientBiology.tsx b/src/components/Patient/PatientBiology/PatientBiology.tsx
index 4e604e6c9..28ce82184 100644
--- a/src/components/Patient/PatientBiology/PatientBiology.tsx
+++ b/src/components/Patient/PatientBiology/PatientBiology.tsx
@@ -51,7 +51,7 @@ const PatientBiology: React.FC<PatientBiologyTypes> = ({ groupId }) => {
   })
 
   const _fetchBiology = async (page: number) => {
-    dispatch<any>(
+    dispatch(
       fetchBiology({
         groupId,
         options: {
diff --git a/src/components/Patient/PatientDocs/PatientDocs.tsx b/src/components/Patient/PatientDocs/PatientDocs.tsx
index 93f68ee3a..0e2730d8d 100644
--- a/src/components/Patient/PatientDocs/PatientDocs.tsx
+++ b/src/components/Patient/PatientDocs/PatientDocs.tsx
@@ -70,7 +70,7 @@ const PatientDocs: React.FC<PatientDocsProps> = ({ groupId }) => {
 
   const fetchDocumentsList = async (page: number) => {
     const selectedDocTypesCodes = filters.selectedDocTypes.map((docType) => docType.code)
-    dispatch<any>(
+    dispatch(
       fetchDocuments({
         signal: controllerRef.current?.signal,
         groupId,
diff --git a/src/components/Patient/PatientMedication/PatientMedication.tsx b/src/components/Patient/PatientMedication/PatientMedication.tsx
index 6c1cb5219..f29aaa6ff 100644
--- a/src/components/Patient/PatientMedication/PatientMedication.tsx
+++ b/src/components/Patient/PatientMedication/PatientMedication.tsx
@@ -59,7 +59,7 @@ const PatientMedication: React.FC<PatientMedicationTypes> = ({ groupId }) => {
   const [order, setOrder] = useState<Order>({ orderBy: 'Period-start', orderDirection: 'asc' })
 
   const _fetchMedication = async (page: number) => {
-    dispatch<any>(
+    dispatch(
       fetchMedication({
         selectedTab,
         groupId,
diff --git a/src/components/Patient/PatientPMSI/PatientPMSI.tsx b/src/components/Patient/PatientPMSI/PatientPMSI.tsx
index d05898507..e9628c802 100644
--- a/src/components/Patient/PatientPMSI/PatientPMSI.tsx
+++ b/src/components/Patient/PatientPMSI/PatientPMSI.tsx
@@ -65,7 +65,7 @@ const PatientPMSI: React.FC<PatientPMSITypes> = ({ groupId }) => {
 
   const _fetchPMSI = async (page: number) => {
     const selectedDiagnosticTypesCodes = filters.selectedDiagnosticTypes.map((diagnosticType) => diagnosticType.id)
-    dispatch<any>(
+    dispatch(
       fetchPmsi({
         selectedTab,
         groupId,
diff --git a/src/components/Patient/PatientTimeline/PatientTimeline.tsx b/src/components/Patient/PatientTimeline/PatientTimeline.tsx
index c05d5a217..851d85359 100644
--- a/src/components/Patient/PatientTimeline/PatientTimeline.tsx
+++ b/src/components/Patient/PatientTimeline/PatientTimeline.tsx
@@ -163,7 +163,7 @@ const PatientTimeline: React.FC<PatientTimelineTypes> = ({
   const { patientId } = useParams<{ patientId: string }>()
 
   useEffect(() => {
-    dispatch<any>(
+    dispatch(
       fetchAllProcedures({
         // @ts-ignore
         patientId,
diff --git a/src/components/Routes/LeftSideBar/LeftSideBar.tsx b/src/components/Routes/LeftSideBar/LeftSideBar.tsx
index b70c83dba..693059e80 100644
--- a/src/components/Routes/LeftSideBar/LeftSideBar.tsx
+++ b/src/components/Routes/LeftSideBar/LeftSideBar.tsx
@@ -64,38 +64,38 @@ const LeftSideBar: React.FC<{ open?: boolean }> = (props) => {
 
   useEffect(() => {
     if (props.open) {
-      dispatch<any>(openAction())
+      dispatch(openAction())
     } else {
       setAllreadyOpen(true)
-      dispatch<any>(closeAction())
+      dispatch(closeAction())
     }
   }, [props.open, cohortCreation]) // eslint-disable-line
 
   const handleDrawerOpenOrClose = (value: boolean) => {
     setAllreadyOpen(true)
     if (value) {
-      dispatch<any>(openAction())
+      dispatch(openAction())
     } else {
-      dispatch<any>(closeAction())
+      dispatch(closeAction())
     }
   }
 
   const handleDisplayPatientList = () => {
-    dispatch<any>(openAction())
+    dispatch(openAction())
     if (open) {
       setDisplayPatientList(!displayPatientList)
     }
   }
 
   const handleDisplaySearchList = () => {
-    dispatch<any>(openAction())
+    dispatch(openAction())
     if (open) {
       setDisplaySearchList(!displaySearchList)
     }
   }
 
   const handleNewRequest = () => {
-    dispatch<any>(resetCohortCreation())
+    dispatch(resetCohortCreation())
     navigate('/cohort/new')
   }
 
@@ -153,7 +153,7 @@ const LeftSideBar: React.FC<{ open?: boolean }> = (props) => {
                     <IconButton
                       onClick={() => {
                         localStorage.clear()
-                        dispatch<any>(logoutAction())
+                        dispatch(logoutAction())
                         navigate('/')
                       }}
                     >
@@ -172,7 +172,7 @@ const LeftSideBar: React.FC<{ open?: boolean }> = (props) => {
                       <IconButton
                         onClick={() => {
                           localStorage.clear()
-                          dispatch<any>(logoutAction())
+                          dispatch(logoutAction())
                           navigate('/')
                         }}
                       >
diff --git a/src/components/Routes/PrivateRoute.tsx b/src/components/Routes/PrivateRoute.tsx
index 8db1414ce..7204633e5 100644
--- a/src/components/Routes/PrivateRoute.tsx
+++ b/src/components/Routes/PrivateRoute.tsx
@@ -39,7 +39,7 @@ const PrivateRoute: React.FC = () => {
 
   useEffect(() => {
     if (!me && data && data.me) {
-      dispatch<any>(login(me))
+      dispatch(login(me))
     }
   }, [me, data, dispatch])
 
diff --git a/src/components/SavedResearch/ResearchCard.tsx b/src/components/SavedResearch/ResearchCard.tsx
index bfbf0fb96..4719071fa 100644
--- a/src/components/SavedResearch/ResearchCard.tsx
+++ b/src/components/SavedResearch/ResearchCard.tsx
@@ -70,7 +70,7 @@ const Research: React.FC<ResearchProps> = ({ simplified, onClickRow }) => {
   })
 
   const onFetchCohorts = async (_page?: number) => {
-    dispatch<any>(
+    dispatch(
       fetchCohorts({
         filters,
         sort,
@@ -95,12 +95,12 @@ const Research: React.FC<ResearchProps> = ({ simplified, onClickRow }) => {
   }
 
   const onDeleteCohort = async (cohort: Cohort) => {
-    await dispatch<any>(deleteCohort({ deletedCohort: cohort }))
+    await dispatch(deleteCohort({ deletedCohort: cohort }))
     onFetchCohorts()
   }
 
   const onSetCohortFavorite = async (cohort: Cohort) => {
-    await dispatch<any>(editCohort({ editedCohort: { ...cohort, favorite: !cohort.favorite } }))
+    await dispatch(editCohort({ editedCohort: { ...cohort, favorite: !cohort.favorite } }))
     if (sort.sortBy === 'modified_at' && sort.sortDirection === 'desc') {
       setPage(1)
       onFetchCohorts(1)
diff --git a/src/components/SavedResearch/ResearchTable/RequestsTable.tsx b/src/components/SavedResearch/ResearchTable/RequestsTable.tsx
index ab28e5399..493656902 100644
--- a/src/components/SavedResearch/ResearchTable/RequestsTable.tsx
+++ b/src/components/SavedResearch/ResearchTable/RequestsTable.tsx
@@ -300,7 +300,7 @@ const RequestsTable: React.FC<RequestsTableProps> = ({
               handleCloseDialog()
               const foundItem = researchData?.find(({ uuid }) => uuid === selectedRequest)
               if (!foundItem) return
-              dispatch<any>(deleteRequestState({ deletedRequest: foundItem }))
+              dispatch(deleteRequestState({ deletedRequest: foundItem }))
             }}
             color="secondary"
           >
@@ -309,14 +309,14 @@ const RequestsTable: React.FC<RequestsTableProps> = ({
         </DialogActions>
       </Dialog>
 
-      {selectedRequestState && <ModalAddOrEditRequest onClose={() => dispatch<any>(setSelectedRequestState(null))} />}
+      {selectedRequestState && <ModalAddOrEditRequest onClose={() => dispatch(setSelectedRequestState(null))} />}
       {selectedRequestShareState !== null &&
         selectedRequestShareState?.shared_query_snapshot !== undefined &&
         selectedRequestShareState?.shared_query_snapshot?.length > 0 && (
           <ModalShareRequest
             shareSuccessOrFailMessage={shareSuccessOrFailMessage}
             parentStateSetter={wrapperSetShareSuccessOrFailMessage}
-            onClose={() => dispatch<any>(setSelectedRequestShareState(null))}
+            onClose={() => dispatch(setSelectedRequestShareState(null))}
           />
         )}
 
@@ -325,11 +325,11 @@ const RequestsTable: React.FC<RequestsTableProps> = ({
         selectedRequestShareState?.shared_query_snapshot?.length === 0 && (
           <Snackbar
             open
-            onClose={() => dispatch<any>(setSelectedRequestShareState(null))}
+            onClose={() => dispatch(setSelectedRequestShareState(null))}
             autoHideDuration={5000}
             anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
           >
-            <Alert severity="error" onClose={() => dispatch<any>(setSelectedRequestShareState(null))}>
+            <Alert severity="error" onClose={() => dispatch(setSelectedRequestShareState(null))}>
               Votre requête ne possède aucun critère. Elle ne peux donc pas être partagée.
             </Alert>
           </Snackbar>
diff --git a/src/components/SavedResearch/ResearchTable/ResearchTable.tsx b/src/components/SavedResearch/ResearchTable/ResearchTable.tsx
index 691084af8..8c8bafe9b 100644
--- a/src/components/SavedResearch/ResearchTable/ResearchTable.tsx
+++ b/src/components/SavedResearch/ResearchTable/ResearchTable.tsx
@@ -136,7 +136,7 @@ const ResearchTable: React.FC<ResearchTableProps> = ({
   }
 
   const editCohort = async () => {
-    await dispatch<any>(setSelectedCohortState(null))
+    await dispatch(setSelectedCohortState(null))
 
     onUpdateCohorts()
   }
diff --git a/src/components/ScopeTree/ScopeTree.tsx b/src/components/ScopeTree/ScopeTree.tsx
index 62fd46d77..3704b5845 100644
--- a/src/components/ScopeTree/ScopeTree.tsx
+++ b/src/components/ScopeTree/ScopeTree.tsx
@@ -168,7 +168,7 @@ const ScopeTree: React.FC<ScopeTreeProps> = ({ defaultSelectedItems, onChangeSel
   const controllerRef = useRef<AbortController | null>()
 
   const fetchScopeTree = async (signal?: AbortSignal) => {
-    return dispatch<any>(fetchScopesList(signal))
+    return dispatch(fetchScopesList(signal)).unwrap()
   }
 
   const _cancelPendingRequest = () => {
@@ -182,8 +182,8 @@ const ScopeTree: React.FC<ScopeTreeProps> = ({ defaultSelectedItems, onChangeSel
     setSearchLoading(true)
     _cancelPendingRequest()
     const fetchScopeTreeResponse = await fetchScopeTree(controllerRef.current?.signal)
-    if (fetchScopeTreeResponse && fetchScopeTreeResponse.payload && !fetchScopeTreeResponse.payload.aborted) {
-      const newPerimetersList = fetchScopeTreeResponse.payload.scopesList
+    if (fetchScopeTreeResponse && !fetchScopeTreeResponse.aborted) {
+      const newPerimetersList = fetchScopeTreeResponse.scopesList
       setRootRows(newPerimetersList)
       setOpenPopulations([])
       setCount(newPerimetersList?.length)
@@ -236,7 +236,7 @@ const ScopeTree: React.FC<ScopeTreeProps> = ({ defaultSelectedItems, onChangeSel
       _openPopulation = [..._openPopulation, rowId]
       setOpenPopulations(_openPopulation)
     }
-    const expandResponse = await dispatch<any>(
+    const expandResponse = await dispatch(
       expandScopeElement({
         rowId: rowId,
         selectedItems: selectedItems,
@@ -244,10 +244,10 @@ const ScopeTree: React.FC<ScopeTreeProps> = ({ defaultSelectedItems, onChangeSel
         openPopulation: openPopulation,
         signal: controllerRef.current?.signal
       })
-    )
-    if (expandResponse && expandResponse.payload && !expandResponse.payload.aborted) {
-      const _selectedItems = expandResponse.payload.selectedItems ?? []
-      setRootRows(expandResponse.payload.scopesList ?? [])
+    ).unwrap()
+    if (expandResponse && !expandResponse.aborted) {
+      const _selectedItems = expandResponse.selectedItems ?? []
+      setRootRows(expandResponse.scopesList ?? [])
       onChangeSelectedItem(_selectedItems)
     }
   }
diff --git a/src/components/TopBar/TopBar.tsx b/src/components/TopBar/TopBar.tsx
index 3c84346c1..c065150af 100644
--- a/src/components/TopBar/TopBar.tsx
+++ b/src/components/TopBar/TopBar.tsx
@@ -151,11 +151,11 @@ const TopBar: React.FC<TopBarProps> = ({ context, patientsNb, access, afterEdit
   }
 
   const handleFavorite = () => {
-    dispatch<any>(favoriteExploredCohort({ exploredCohort: dashboard }))
+    dispatch(favoriteExploredCohort({ exploredCohort: dashboard }))
   }
 
   const handleConfirmDeletion = () => {
-    dispatch<any>(deleteCohort({ deletedCohort: dashboard }))
+    dispatch(deleteCohort({ deletedCohort: dashboard }))
     navigate('/home')
   }
 
@@ -304,9 +304,9 @@ const TopBar: React.FC<TopBarProps> = ({ context, patientsNb, access, afterEdit
                     onClick={async () => {
                       setAnchorEl(null)
                       if (!cohortList || (cohortList && cohortList.length === 0)) {
-                        await dispatch<any>(fetchCohortsList({}))
+                        await dispatch(fetchCohortsList({}))
                       }
-                      await dispatch<any>(setSelectedCohort(dashboard ?? null))
+                      await dispatch(setSelectedCohort(dashboard ?? null))
                       setOpenModal('edit')
                     }}
                   >
diff --git a/src/components/Welcome/ResearchCard/ResearchCard.tsx b/src/components/Welcome/ResearchCard/ResearchCard.tsx
index 0301a8716..25fc1a0cb 100644
--- a/src/components/Welcome/ResearchCard/ResearchCard.tsx
+++ b/src/components/Welcome/ResearchCard/ResearchCard.tsx
@@ -37,18 +37,18 @@ const ResearchCard: React.FC<ResearchCardProps> = ({
   const dispatch = useAppDispatch()
 
   const onDeleteCohort = async (cohort: Cohort) => {
-    await dispatch<any>(deleteCohort({ deletedCohort: cohort }))
+    await dispatch(deleteCohort({ deletedCohort: cohort }))
     updateCohorts()
   }
 
   const onSetCohortFavorite = async (cohort: Cohort) => {
-    await dispatch<any>(editCohort({ editedCohort: { ...cohort, favorite: !cohort.favorite } }))
+    await dispatch(editCohort({ editedCohort: { ...cohort, favorite: !cohort.favorite } }))
     updateCohorts()
   }
 
   const updateCohorts = async () => {
     if (listType === 'FavoriteCohorts' || listType === 'LastCohorts') {
-      await dispatch<any>(
+      await dispatch(
         fetchCohorts({
           listType: 'FavoriteCohorts',
           sort: { sortBy: 'modified_at', sortDirection: 'desc' },
@@ -64,7 +64,7 @@ const ResearchCard: React.FC<ResearchCardProps> = ({
         })
       )
 
-      await dispatch<any>(
+      await dispatch(
         fetchCohorts({
           listType: 'LastCohorts',
           sort: { sortBy: 'modified_at', sortDirection: 'desc' },
diff --git a/src/state/cohortCreation.ts b/src/state/cohortCreation.ts
index 0b409d3c5..13de65e48 100644
--- a/src/state/cohortCreation.ts
+++ b/src/state/cohortCreation.ts
@@ -105,7 +105,7 @@ const fetchRequestCohortCreation = createAsyncThunk<
     const { requestName, json, currentSnapshot, shortCohortLimit, snapshotsHistory, count, count_outdated } =
       requestResult
 
-    dispatch<any>(
+    dispatch(
       unbuildCohortCreation({
         newCurrentSnapshot: snapshotsHistory[
           snapshotsHistory.length ? snapshotsHistory.length - 1 : 0
@@ -183,7 +183,7 @@ const countCohortCreation = createAsyncThunk<
  *
  *
  */
-type SaveJsonReturn = {
+export type SaveJsonReturn = {
   requestId: string
   snapshotsHistory: CohortCreationSnapshotType[]
   currentSnapshot: string
@@ -275,13 +275,13 @@ const buildCohortCreation = createAsyncThunk<BuildCohortReturn, BuildCohortParam
       const json = await buildRequest(_selectedPopulation, _selectedCriteria, _criteriaGroup, _temporalConstraints)
 
       if (json !== state?.cohortCreation?.request?.json) {
-        const saveJsonResponse = await dispatch<any>(saveJson({ newJson: json }))
+        const saveJsonResponse = await dispatch(saveJson({ newJson: json })).unwrap()
 
-        await dispatch<any>(
+        await dispatch(
           countCohortCreation({
             json: json,
-            snapshotId: saveJsonResponse.payload.currentSnapshot,
-            requestId: saveJsonResponse.payload.requestId
+            snapshotId: saveJsonResponse.currentSnapshot,
+            requestId: saveJsonResponse.requestId
           })
         )
       }
@@ -367,13 +367,13 @@ const unbuildCohortCreation = createAsyncThunk<UnbuildCohortReturn, UnbuildParam
       const countId = dated_measures ? dated_measures.uuid : null
 
       if (countId) {
-        dispatch<any>(
+        dispatch(
           countCohortCreation({
             uuid: countId
           })
         )
       } else {
-        dispatch<any>(
+        dispatch(
           countCohortCreation({
             json: newCurrentSnapshot.json,
             snapshotId: newCurrentSnapshot.uuid,
@@ -428,12 +428,12 @@ const addRequestToCohortCreation = createAsyncThunk<
       parentId
     )
 
-    const saveJsonResponse = await dispatch<any>(saveJson({ newJson: json }))
-    await dispatch<any>(
+    const saveJsonResponse = await dispatch(saveJson({ newJson: json })).unwrap()
+    await dispatch(
       countCohortCreation({
         json: json,
-        snapshotId: saveJsonResponse.payload.currentSnapshot,
-        requestId: saveJsonResponse.payload.requestId
+        snapshotId: saveJsonResponse.currentSnapshot,
+        requestId: saveJsonResponse.requestId
       })
     )
 
diff --git a/src/state/exploredCohort.ts b/src/state/exploredCohort.ts
index 76be0cd7a..608e0ebd4 100644
--- a/src/state/exploredCohort.ts
+++ b/src/state/exploredCohort.ts
@@ -173,7 +173,7 @@ const fetchExploredCohort = createAsyncThunk<
         break
     }
   } else {
-    dispatch<any>(fetchExploredCohortInBackground({ context, id }))
+    dispatch(fetchExploredCohortInBackground({ context, id }))
   }
   return cohort ?? state.exploredCohort
 })
diff --git a/src/state/request.ts b/src/state/request.ts
index 0cc62bbc0..e4c3c5877 100644
--- a/src/state/request.ts
+++ b/src/state/request.ts
@@ -174,7 +174,7 @@ const deleteRequest = createAsyncThunk<DeleteRequestReturn, DeleteRequestParams,
         requestsList.splice(index, 1)
       }
 
-      dispatch<any>(fetchRequests())
+      dispatch(fetchRequests())
 
       return {
         selectedRequest: null,
diff --git a/src/utils/pmsi.ts b/src/utils/pmsi.ts
index 050b7d87a..1177362de 100644
--- a/src/utils/pmsi.ts
+++ b/src/utils/pmsi.ts
@@ -1,6 +1,6 @@
 import { expandPmsiElement, PmsiListType } from 'state/pmsi'
-import { AsyncThunk, Dispatch } from '@reduxjs/toolkit'
-import { RootState } from '../state'
+import { AsyncThunk } from '@reduxjs/toolkit'
+import { AppDispatch, RootState } from '../state'
 import {
   decrementLoadingSyncHierarchyTable,
   incrementLoadingSyncHierarchyTable,
@@ -283,18 +283,18 @@ export const initSyncHierarchyTableEffect = async (
   selectedCodes: PmsiListType[],
   fetchResource: AsyncThunk<any, void, { state: RootState }>,
   resourceType: string,
-  dispatch: Dispatch<any>,
+  dispatch: AppDispatch,
   isFetchedResource?: boolean
 ) => {
   if (!isFetchedResource) {
-    await dispatch<any>(fetchResource())
+    await dispatch(fetchResource())
   }
   if (!selectedCriteria) {
-    await dispatch<any>(pushSyncHierarchyTable({ code: [] }))
+    await dispatch(pushSyncHierarchyTable({ code: [] }))
   } else {
-    await dispatch<any>(initSyncHierarchyTable(selectedCriteria))
+    await dispatch(initSyncHierarchyTable(selectedCriteria))
   }
-  dispatch<any>(incrementLoadingSyncHierarchyTable())
+  dispatch(incrementLoadingSyncHierarchyTable())
   resourceHierarchy = await expandHierarchyCodes(
     selectedCodes,
     selectedCodes,
@@ -302,7 +302,7 @@ export const initSyncHierarchyTableEffect = async (
     resourceType,
     dispatch
   )
-  dispatch<any>(decrementLoadingSyncHierarchyTable())
+  dispatch(decrementLoadingSyncHierarchyTable())
 }
 
 export const onChangeSelectedCriteriaEffect = async (
@@ -310,10 +310,10 @@ export const onChangeSelectedCriteriaEffect = async (
   selectedCodes: PmsiListType[],
   resourceHierarchy: PmsiListType[],
   resourceType: string,
-  dispatch: Dispatch<any>
+  dispatch: AppDispatch
 ) => {
   await expandHierarchyCodes(codesToExpand, selectedCodes, resourceHierarchy, resourceType, dispatch)
-  dispatch<any>(pushSyncHierarchyTable({ code: selectedCodes }))
+  dispatch(pushSyncHierarchyTable({ code: selectedCodes }))
 }
 
 const isExpanded = (itemToExpand: PmsiListType | undefined) => {
@@ -333,29 +333,30 @@ export const CLAIM = 'Claim'
 export const CONDITION = 'Condition'
 export const PROCEDURE = 'Procedure'
 export const OBSERVATION = 'Observation'
+
 const expandRequest = async (
   codeToExpand: string,
   selectedCodes: PmsiListType[],
   resourceType: string,
-  dispatch: Dispatch<any>
+  dispatch: AppDispatch
 ) => {
   let type: 'claim' | 'condition' | 'procedure' = 'claim'
   if (resourceType.toLowerCase() === MEDICATION_REQUEST.toLowerCase()) {
-    const expandedMedication = await dispatch<any>(
+    const expandedMedication = await dispatch(
       expandMedicationElement({
         rowId: codeToExpand,
         selectedItems: selectedCodes
       })
-    )
-    return expandedMedication.payload.list
+    ).unwrap()
+    return expandedMedication.list
   } else if (resourceType.toLowerCase() === OBSERVATION.toLowerCase()) {
-    const expandedBiology = await dispatch<any>(
+    const expandedBiology = await dispatch(
       expandBiologyElement({
         rowId: codeToExpand,
         selectedItems: selectedCodes
       })
-    )
-    return expandedBiology.payload.list
+    ).unwrap()
+    return expandedBiology.list
   } else if (resourceType.toLowerCase() === 'claim') {
     type = 'claim'
   } else if (resourceType.toLowerCase() === 'procedure') {
@@ -365,21 +366,22 @@ const expandRequest = async (
   } else {
     return undefined
   }
-  const expandedPmsiElements = await dispatch<any>(
+  const expandedPmsiElements = await dispatch(
     expandPmsiElement({
       keyElement: type,
       rowId: codeToExpand,
       selectedItems: selectedCodes
     })
-  )
-  return expandedPmsiElements.payload[type].list
+  ).unwrap()
+  return expandedPmsiElements[type].list
 }
+
 export const expandItem = async (
   codeToExpand: string,
   selectedCodes: PmsiListType[],
   resourceHierarchy: PmsiListType[],
   resourceType: string,
-  dispatch: Dispatch<any>
+  dispatch: AppDispatch
 ) => {
   const equivalentRow = findEquivalentRowInItemAndSubItems(
     { id: codeToExpand, label: 'loading' },
@@ -391,14 +393,15 @@ export const expandItem = async (
   } else {
     newResourceHierarchy = await expandRequest(codeToExpand, selectedCodes, resourceType, dispatch)
   }
-  return newResourceHierarchy
+  return newResourceHierarchy || []
 }
+
 const expandSingleResourceItem = async (
   codeToExpand: PmsiListType,
   selectedCodes: PmsiListType[],
   resourceHierarchy: PmsiListType[],
   resourceType: string,
-  dispatch: Dispatch<any>
+  dispatch: AppDispatch
 ) => {
   if (
     !codeToExpand ||
@@ -469,7 +472,7 @@ const expandHierarchyCodes = async (
   selectedCodes: PmsiListType[],
   resourceHierarchy: PmsiListType[],
   resourceType: string,
-  dispatch: Dispatch<any>
+  dispatch: AppDispatch
 ) => {
   let newResourceHierarchy: PmsiListType[] = resourceHierarchy
   for await (const itemToExpand of codesToExpand) {
@@ -492,7 +495,7 @@ export const syncOnChangeFormValue = async (
   setDefaultCriteria: (value: PmsiListType[]) => void,
   selectedTab: string,
   resourceType: string,
-  dispatch: Dispatch<any>
+  dispatch: AppDispatch
 ) => {
   const newSelectedCriteria: any = selectedCriteria ? { ...selectedCriteria } : {}
   newSelectedCriteria[key] = value
@@ -502,7 +505,7 @@ export const syncOnChangeFormValue = async (
       resourceHierarchy
     )
     newSelectedCriteria[key] = optimizedHierarchySelection
-    dispatch<any>(pushSyncHierarchyTable({ code: optimizedHierarchySelection }))
+    dispatch(pushSyncHierarchyTable({ code: optimizedHierarchySelection }))
     if (selectedTab === 'form') {
       if (
         selectedCriteria.type !== 'IPPList' &&
diff --git a/src/views/Dashboard/Dashboard.tsx b/src/views/Dashboard/Dashboard.tsx
index d8a179b3b..6773fe2af 100644
--- a/src/views/Dashboard/Dashboard.tsx
+++ b/src/views/Dashboard/Dashboard.tsx
@@ -100,7 +100,7 @@ const Dashboard: React.FC<{
     const id = context === 'cohort' ? cohortId : context === 'perimeters' ? perimetreIds : undefined
 
     if (context !== 'new_cohort') {
-      dispatch<any>(fetchExploredCohort({ context, id }))
+      dispatch(fetchExploredCohort({ context, id }))
     }
   }, [context, cohortId]) // eslint-disable-line
 
@@ -110,7 +110,7 @@ const Dashboard: React.FC<{
 
   const forceReload = () => {
     const id = context === 'cohort' ? cohortId : context === 'perimeters' ? perimetreIds : undefined
-    dispatch<any>(fetchExploredCohort({ context, id, forceReload: true }))
+    dispatch(fetchExploredCohort({ context, id, forceReload: true }))
   }
 
   const handleChangeTabs = (event: any, newTab: string) => {
diff --git a/src/views/MyProjects/MyProjects.tsx b/src/views/MyProjects/MyProjects.tsx
index 4ea87b07b..aab1ef55a 100644
--- a/src/views/MyProjects/MyProjects.tsx
+++ b/src/views/MyProjects/MyProjects.tsx
@@ -71,17 +71,17 @@ const MyProjects: React.FC<{}> = () => {
   const loading = loadingProject || loadingRequest || loadingCohort
 
   const _fetchProjectsList = async () => {
-    dispatch<any>(setSelectedProject(null))
-    dispatch<any>(fetchProjectsList())
+    dispatch(setSelectedProject(null))
+    dispatch(fetchProjectsList())
   }
 
   const _fetchRequestsList = async () => {
-    dispatch<any>(setSelectedRequest(null))
-    dispatch<any>(fetchRequestsList())
+    dispatch(setSelectedRequest(null))
+    dispatch(fetchRequestsList())
   }
 
   const _fetchCohortsList = async () => {
-    dispatch<any>(fetchCohortsList({ limit: 100 }))
+    dispatch(fetchCohortsList({ limit: 100 }))
   }
 
   const _fetch = async () => {
@@ -95,7 +95,7 @@ const MyProjects: React.FC<{}> = () => {
   }, [])
 
   const handleClickAddProject = () => {
-    dispatch<any>(setSelectedProject(''))
+    dispatch(setSelectedProject(''))
   }
 
   if (loading) {
@@ -231,11 +231,11 @@ const MyProjects: React.FC<{}> = () => {
 
       <ModalAddOrEditProject
         open={selectedProject !== null}
-        onClose={() => dispatch<any>(setSelectedProject(null))}
+        onClose={() => dispatch(setSelectedProject(null))}
         selectedProject={selectedProject}
       />
 
-      {selectedRequest !== null && <ModalAddOrEditRequest onClose={() => dispatch<any>(setSelectedRequest(null))} />}
+      {selectedRequest !== null && <ModalAddOrEditRequest onClose={() => dispatch(setSelectedRequest(null))} />}
 
       {selectedRequestShare !== null &&
         selectedRequestShare?.shared_query_snapshot !== undefined &&
@@ -243,7 +243,7 @@ const MyProjects: React.FC<{}> = () => {
           <ModalShareRequest
             shareSuccessOrFailMessage={shareSuccessOrFailMessage}
             parentStateSetter={wrapperSetShareSuccessOrFailMessage}
-            onClose={() => dispatch<any>(setSelectedRequestShare(null))}
+            onClose={() => dispatch(setSelectedRequestShare(null))}
           />
         )}
 
@@ -252,11 +252,11 @@ const MyProjects: React.FC<{}> = () => {
         selectedRequestShare?.shared_query_snapshot?.length === 0 && (
           <Snackbar
             open
-            onClose={() => dispatch<any>(setSelectedRequestShare(null))}
+            onClose={() => dispatch(setSelectedRequestShare(null))}
             autoHideDuration={5000}
             anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
           >
-            <Alert severity="error" onClose={() => dispatch<any>(setSelectedRequestShare(null))}>
+            <Alert severity="error" onClose={() => dispatch(setSelectedRequestShare(null))}>
               Votre requête ne possède aucun critère. Elle ne peux donc pas être partagée.
             </Alert>
           </Snackbar>
@@ -288,7 +288,7 @@ const MyProjects: React.FC<{}> = () => {
         </Snackbar>
       )}
 
-      <ModalEditCohort open={selectedCohort !== null} onClose={() => dispatch<any>(setSelectedCohort(null))} />
+      <ModalEditCohort open={selectedCohort !== null} onClose={() => dispatch(setSelectedCohort(null))} />
 
       <ModalMoveRequests
         open={openModal === 'move_to_folder'}
diff --git a/src/views/Patient/Patient.tsx b/src/views/Patient/Patient.tsx
index cead91c34..dc3bd75fe 100644
--- a/src/views/Patient/Patient.tsx
+++ b/src/views/Patient/Patient.tsx
@@ -55,7 +55,7 @@ const Patient = () => {
 
   useEffect(() => {
     const _fetchPatient = async () => {
-      dispatch<any>(
+      dispatch(
         fetchPatientInfo({
           // @ts-ignore
           patientId,
diff --git a/src/views/Welcome/Welcome.tsx b/src/views/Welcome/Welcome.tsx
index 987cb7ed3..f32a7292c 100644
--- a/src/views/Welcome/Welcome.tsx
+++ b/src/views/Welcome/Welcome.tsx
@@ -50,9 +50,9 @@ const Welcome: React.FC = () => {
 
   useEffect(() => {
     // fetchProjectData
-    dispatch<any>(fetchProjects())
-    dispatch<any>(fetchRequests())
-    dispatch<any>(
+    dispatch(fetchProjects())
+    dispatch(fetchRequests())
+    dispatch(
       fetchCohorts({
         listType: 'FavoriteCohorts',
         sort: { sortBy: 'modified_at', sortDirection: 'desc' },
@@ -60,7 +60,7 @@ const Welcome: React.FC = () => {
         limit: 5
       })
     )
-    dispatch<any>(
+    dispatch(
       fetchCohorts({
         listType: 'LastCohorts',
         sort: { sortBy: 'modified_at', sortDirection: 'desc' },
@@ -69,16 +69,16 @@ const Welcome: React.FC = () => {
     )
 
     // fetchPmsiData
-    dispatch<any>(initPmsiHierarchy())
+    dispatch(initPmsiHierarchy())
 
     // fetchMedicationData
-    dispatch<any>(initMedicationHierarchy())
+    dispatch(initMedicationHierarchy())
 
     // fetchBiologyData
-    dispatch<any>(initBiologyHierarchy())
+    dispatch(initBiologyHierarchy())
 
     // fetchScope
-    dispatch<any>(fetchScopesList())
+    dispatch(fetchScopesList())
   }, [])
 
   useEffect(() => {