diff --git a/webapp/.npmrc b/webapp/.npmrc
index 1b78f1c6f2..48d79633db 100644
--- a/webapp/.npmrc
+++ b/webapp/.npmrc
@@ -1,2 +1,3 @@
 save-exact=true
 legacy-peer-deps=true
+global-style=true
\ No newline at end of file
diff --git a/webapp/channels/package.json b/webapp/channels/package.json
index cdbd790a37..7f33c6b05f 100644
--- a/webapp/channels/package.json
+++ b/webapp/channels/package.json
@@ -161,7 +161,6 @@
     "babel-plugin-typescript-to-proptypes": "1.4.2",
     "bundle-loader": "0.2.0",
     "copy-webpack-plugin": "11.0.0",
-    "eslint-plugin-mattermost": "github:mattermost/eslint-plugin-mattermost#5b0c972eacf19286e4c66221b39113bf8728a99e",
     "cross-env": "7.0.3",
     "css-loader": "5.2.6",
     "dotenv-webpack": "8.0.1",
@@ -174,6 +173,7 @@
     "eslint-plugin-formatjs": "4.3.4",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.23.4",
+    "eslint-plugin-mattermost": "github:mattermost/eslint-plugin-mattermost#5b0c972eacf19286e4c66221b39113bf8728a99e",
     "eslint-plugin-no-only-tests": "2.6.0",
     "eslint-plugin-react": "7.31.10",
     "eslint-plugin-react-hooks": "4.6.0",
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 9df283f9db..923fdfd0e4 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -998,51 +998,6 @@
         "@sinonjs/commons": "^2.0.0"
       }
     },
-    "boards/node_modules/@testing-library/dom": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.0.1.tgz",
-      "integrity": "sha512-fTOVsMY9QLFCCXRHG3Ese6cMH5qIWwSbgxZsgeF5TNsy81HKaZ4kgehnSF8FsR3OF+numlIV2YcU79MzbnhSig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^5.0.1",
-        "aria-query": "^5.0.0",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.5.0",
-        "pretty-format": "^27.0.2"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "boards/node_modules/@testing-library/dom/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "boards/node_modules/@testing-library/dom/node_modules/pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
     "boards/node_modules/@testing-library/jest-dom": {
       "version": "5.16.5",
       "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz",
@@ -1108,51 +1063,6 @@
         "react-dom": "<18.0.0"
       }
     },
-    "boards/node_modules/@testing-library/react/node_modules/@testing-library/dom": {
-      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.0.tgz",
-      "integrity": "sha512-d9ULIT+a4EXLX3UU8FBjauG9NnsZHkHztXoIcTsOKoOw030fyjheN9svkTULjJxtYag9DZz5Jz5qkWZDPxTFwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^5.0.1",
-        "aria-query": "^5.0.0",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.4.4",
-        "pretty-format": "^27.0.2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "boards/node_modules/@testing-library/react/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "boards/node_modules/@testing-library/react/node_modules/pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
     "boards/node_modules/@tootallnate/once": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
@@ -4048,6 +3958,17 @@
         "npm": ">=7.0.0"
       }
     },
+    "channels/node_modules/@types/react-select": {
+      "version": "3.0.19",
+      "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.19.tgz",
+      "integrity": "sha512-d+6qtfFXZeIOAABlVL1e50RZn8ctOABE4tFDxM6KW4lKuXgTTgLVrSik5AX9XjBjV7N80FtS6GTN/WeoXL9Jww==",
+      "dev": true,
+      "dependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "@types/react-transition-group": "*"
+      }
+    },
     "channels/node_modules/jest": {
       "version": "27.1.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-27.1.0.tgz",
@@ -11734,17 +11655,6 @@
         "@types/react-router-dom": "*"
       }
     },
-    "node_modules/@types/react-select": {
-      "version": "3.0.19",
-      "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.19.tgz",
-      "integrity": "sha512-d+6qtfFXZeIOAABlVL1e50RZn8ctOABE4tFDxM6KW4lKuXgTTgLVrSik5AX9XjBjV7N80FtS6GTN/WeoXL9Jww==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "@types/react-transition-group": "*"
-      }
-    },
     "node_modules/@types/react-test-renderer": {
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-17.0.1.tgz",
@@ -42440,17 +42350,6 @@
         "@types/react-router-dom": "*"
       }
     },
-    "@types/react-select": {
-      "version": "3.0.19",
-      "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.19.tgz",
-      "integrity": "sha512-d+6qtfFXZeIOAABlVL1e50RZn8ctOABE4tFDxM6KW4lKuXgTTgLVrSik5AX9XjBjV7N80FtS6GTN/WeoXL9Jww==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "@types/react-transition-group": "*"
-      }
-    },
     "@types/react-test-renderer": {
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-17.0.1.tgz",
@@ -45280,40 +45179,6 @@
             "@sinonjs/commons": "^2.0.0"
           }
         },
-        "@testing-library/dom": {
-          "version": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.0.1.tgz",
-          "integrity": "sha512-fTOVsMY9QLFCCXRHG3Ese6cMH5qIWwSbgxZsgeF5TNsy81HKaZ4kgehnSF8FsR3OF+numlIV2YcU79MzbnhSig==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/runtime": "^7.12.5",
-            "@types/aria-query": "^5.0.1",
-            "aria-query": "^5.0.0",
-            "chalk": "^4.1.0",
-            "dom-accessibility-api": "^0.5.9",
-            "lz-string": "^1.5.0",
-            "pretty-format": "^27.0.2"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-              "dev": true
-            },
-            "pretty-format": {
-              "version": "27.5.1",
-              "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-              "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^5.0.1",
-                "ansi-styles": "^5.0.0",
-                "react-is": "^17.0.1"
-              }
-            }
-          }
-        },
         "@testing-library/jest-dom": {
           "version": "5.16.5",
           "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz",
@@ -45361,41 +45226,6 @@
             "@babel/runtime": "^7.12.5",
             "@testing-library/dom": "^8.0.0",
             "@types/react-dom": "<18.0.0"
-          },
-          "dependencies": {
-            "@testing-library/dom": {
-              "version": "8.20.0",
-              "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.0.tgz",
-              "integrity": "sha512-d9ULIT+a4EXLX3UU8FBjauG9NnsZHkHztXoIcTsOKoOw030fyjheN9svkTULjJxtYag9DZz5Jz5qkWZDPxTFwA==",
-              "dev": true,
-              "requires": {
-                "@babel/code-frame": "^7.10.4",
-                "@babel/runtime": "^7.12.5",
-                "@types/aria-query": "^5.0.1",
-                "aria-query": "^5.0.0",
-                "chalk": "^4.1.0",
-                "dom-accessibility-api": "^0.5.9",
-                "lz-string": "^1.4.4",
-                "pretty-format": "^27.0.2"
-              }
-            },
-            "ansi-styles": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-              "dev": true
-            },
-            "pretty-format": {
-              "version": "27.5.1",
-              "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-              "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^5.0.1",
-                "ansi-styles": "^5.0.0",
-                "react-is": "^17.0.1"
-              }
-            }
           }
         },
         "@tootallnate/once": {
@@ -55412,6 +55242,17 @@
         "zen-observable": "0.9.0"
       },
       "dependencies": {
+        "@types/react-select": {
+          "version": "3.0.19",
+          "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.19.tgz",
+          "integrity": "sha512-d+6qtfFXZeIOAABlVL1e50RZn8ctOABE4tFDxM6KW4lKuXgTTgLVrSik5AX9XjBjV7N80FtS6GTN/WeoXL9Jww==",
+          "dev": true,
+          "requires": {
+            "@types/react": "*",
+            "@types/react-dom": "*",
+            "@types/react-transition-group": "*"
+          }
+        },
         "jest": {
           "version": "27.1.0",
           "resolved": "https://registry.npmjs.org/jest/-/jest-27.1.0.tgz",