diff --git a/.eslintrc.js b/.eslintrc.js
index e7a0cf53b2..396aaebdfb 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -12,7 +12,7 @@ const {
 module.exports = {
   settings: {
     react: {
-      version: '17.0.2', // note: remember to always keep this in sync with `"react": "^17.0.2",` which is present in any package.json of a project using React.
+      version: '18.2.0',
     },
   },
   parser: '@typescript-eslint/parser',
@@ -118,7 +118,6 @@ module.exports = {
     'react/jsx-max-props-per-line': [ERROR, { maximum: 1, when: 'multiline' }],
     'react/jsx-uses-react': ERROR,
     'react/jsx-uses-vars': ERROR,
-    'react/jsx-indent': [ERROR, 2],
     'react/jsx-indent-props': [ERROR, 2],
     'react/prop-types': OFF(UNKNOWN),
     'react/function-component-definition': [ERROR, {
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a8ec408ca0..8b990f267a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,5 +8,5 @@
   "files.insertFinalNewline": true,
   "editor.formatOnSave": true,
   "editor.formatOnSaveMode": "modifications",
-  "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+  "editor.defaultFormatter": "vscode.typescript-language-features",
 }