Merge branch 'master' into dev

package.json

@@ -82,9 +82,10 @@
     "moment-timezone": "^0.5.33",
     "next": "12.1.4",
     "node-fetch": "^3.2.3",
+    "npm-run-all": "^4.1.5",
     "prop-types": "^15.7.2",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^17.0.0",
+    "react-dom": "^17.0.0",
     "react-intl": "^5.24.7",
     "react-simple-maps": "^2.3.0",
     "react-spring": "^9.4.4",
@@ -110,7 +111,6 @@
     "extract-react-intl-messages": "^4.1.1",
     "husky": "^7.0.0",
     "lint-staged": "^11.0.0",
-    "npm-run-all": "^4.1.5",
     "postcss": "^8.4.12",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^14.0.2",