Merge branch 'develop' into issues/9394/use-sonner-notifications

ohcnetwork · Dec 19, 2024 · 0761bc7 · 0761bc7
2 parents 9434c27 + 213e114
commit 0761bc7
Show file tree

Hide file tree

Showing 126 changed files with 2,668 additions and 7,219 deletions.
diff --git a/.cursorrules b/.cursorrules
@@ -31,5 +31,5 @@ UI and Styling
 
 General Guidelines
 
-- Care uses a custom useQuery hook to fetch data from the API. (Docs @ /Utils/request/useQuery)
+- Care uses TanStack Query for data fetching from the API along with query and mutate utilities for the queryFn and mutationFn. (Docs @ /Utils/request/README.md)
 - APIs are defined in the api.tsx file.
diff --git a/cypress/e2e/assets_spec/AssetHomepage.cy.ts b/cypress/e2e/assets_spec/AssetHomepage.cy.ts
@@ -113,7 +113,6 @@ rolesToTest.forEach((role) => {
     it("Export the list of assets in CSV & Json", () => {
       if (role === "districtAdmin") {
         assetHome.selectAssetImportButton("click");
-        cy.wait(2000);
         assetHome.selectJsonExportButton();
         assetHome.selectAssetImportButton("click");
         assetHome.selectCsvExportButton();