Merge branch 'main' into feature/calculate-working-days-in-export

# Conflicts:
#	src/components/CreateExport/CreateExportModal.tsx
#	src/components/CreateExport/exportHelper.ts

package.json

@@ -38,7 +38,7 @@
     "@types/file-saver": "^2.0.5",
     "@types/lodash": "^4.14.202",
     "axios": "^1.6.1",
-    "cross-fetch": "^3.1.5",
+    "cross-fetch": "^4.0.0",
     "dayjs": "^1.11.7",
     "dotenv": "^16.0.3",
     "electron-fetch": "^1.9.1",

yarn.lock

@@ -2905,10 +2905,10 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-cross-fetch@^3.1.5:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82"
-  integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==
+cross-fetch@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-4.0.0.tgz#f037aef1580bb3a1a35164ea2a848ba81b445983"
+  integrity sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==
   dependencies:
     node-fetch "^2.6.12"