diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 8af9b10b49d..a49980a38f2 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -16,10 +16,10 @@
 				"@fullcalendar/interaction": "^5.10.0",
 				"@fullcalendar/react": "^5.10.0",
 				"@mattermost/compass-icons": "^0.1.10",
-				"@reduxjs/toolkit": "^1.6.0",
+				"@reduxjs/toolkit": "^2.0.0",
 				"color": "^4.0.0",
 				"draft-js": "^0.11.7",
-				"emoji-mart": "^3.0.1",
+				"emoji-mart": "^5.0.0",
 				"fullcalendar": "^5.10.0",
 				"imagemin-gifsicle": "^7.0.0",
 				"imagemin-mozjpeg": "^9.0.0",
@@ -41,8 +41,8 @@
 				"react-hot-keys": "^2.6.2",
 				"react-hotkeys-hook": "^3.3.0",
 				"react-intl": "^5.13.5",
-				"react-redux": "^7.2.4",
-				"react-router-dom": "^5.2.0",
+				"react-redux": "^9.0.0",
+				"react-router-dom": "^6.4.0",
 				"react-select": "^4.3.0"
 			},
 			"devDependencies": {
@@ -1669,14 +1669,36 @@
 			"integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg=="
 		},
 		"node_modules/@reduxjs/toolkit": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.6.0.tgz",
-			"integrity": "sha512-eGL50G+Vj5AG5uD0lineb6rRtbs96M8+hxbcwkHpZ8LQcmt0Bm33WyBSnj5AweLkjQ7ZP+KFRDHiLMznljRQ3A==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.0.0.tgz",
+			"integrity": "sha512-Kq/a+aO28adYdPoNEu9p800MYPKoUc0tlkYfv035Ief9J7MPq8JvmT7UdpYhvXsoMtOdt567KwZjc9H3Rf8yjg==",
+			"license": "MIT",
 			"dependencies": {
-				"immer": "^9.0.1",
-				"redux": "^4.1.0",
-				"redux-thunk": "^2.3.0",
-				"reselect": "^4.0.0"
+				"immer": "^10.0.3",
+				"redux": "^5.0.0",
+				"redux-thunk": "^3.0.1",
+				"reselect": "^5.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.9.0 || ^17.0.0 || ^18",
+				"react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
+			},
+			"peerDependenciesMeta": {
+				"react": {
+					"optional": true
+				},
+				"react-redux": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@remix-run/router": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.0.0.tgz",
+			"integrity": "sha512-SCR1cxRSMNKjaVYptCzBApPDqGwa3FGdjVHc+rOToocNPHQdIYLZBfv/3f+KvYuXDkUGVIW9IAzmPNZDRL1I4A==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=14"
 			}
 		},
 		"node_modules/@samverschueren/stream-to-observable": {
@@ -2250,7 +2272,7 @@
 			"version": "17.0.3",
 			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.3.tgz",
 			"integrity": "sha512-4NnJbCeWE+8YBzupn/YrJxZ8VnjcJq5iR1laqQ1vkpQgBiA7bwk0Rp24fxsdNinzJY2U+HHS4dJJDPdoMjdJ7w==",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"@types/react": "*"
 			}
@@ -2268,6 +2290,7 @@
 			"version": "7.1.16",
 			"resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.16.tgz",
 			"integrity": "sha512-f/FKzIrZwZk7YEO9E1yoxIuDNRiDducxkFlkw/GNMGEnK9n4K8wJzlJBghpSuOVDgEUHoDkDF7Gi9lHNQR4siw==",
+			"dev": true,
 			"dependencies": {
 				"@types/hoist-non-react-statics": "^3.3.0",
 				"@types/react": "*",
@@ -2275,6 +2298,16 @@
 				"redux": "^4.0.0"
 			}
 		},
+		"node_modules/@types/react-redux/node_modules/redux": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+			"integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/runtime": "^7.9.2"
+			}
+		},
 		"node_modules/@types/react-router": {
 			"version": "5.1.12",
 			"resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.12.tgz",
@@ -2326,6 +2359,16 @@
 				"redux": "^4.0.5"
 			}
 		},
+		"node_modules/@types/redux-mock-store/node_modules/redux": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+			"integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/runtime": "^7.9.2"
+			}
+		},
 		"node_modules/@types/scheduler": {
 			"version": "0.16.1",
 			"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.1.tgz",
@@ -2364,6 +2407,12 @@
 			"integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
 			"dev": true
 		},
+		"node_modules/@types/use-sync-external-store": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
+			"integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==",
+			"license": "MIT"
+		},
 		"node_modules/@types/yargs": {
 			"version": "15.0.8",
 			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.8.tgz",
@@ -5961,6 +6010,15 @@
 				"redux": "^4.0.5"
 			}
 		},
+		"node_modules/dnd-core/node_modules/redux": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+			"integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/runtime": "^7.9.2"
+			}
+		},
 		"node_modules/doctrine": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -6236,13 +6294,13 @@
 			}
 		},
 		"node_modules/emoji-mart": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/emoji-mart/-/emoji-mart-3.0.1.tgz",
-			"integrity": "sha512-sxpmMKxqLvcscu6mFn9ITHeZNkGzIvD0BSNFE/LJESPbCA8s1jM6bCDPjWbV31xHq7JXaxgpHxLB54RCbBZSlg==",
-			"dependencies": {
-				"@babel/runtime": "^7.0.0",
-				"prop-types": "^15.6.0"
-			}
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-mart/-/emoji-mart-5.0.0.tgz",
+			"integrity": "sha512-4O75LxV/RPOrtC9+0qhHhfPgJgW/Kwc4zv15h190liC3vJ/5RVibIrnPlDZ0xqYx0bPVOy3W/QcDTZY+jq1qOw==",
+			"license": "BSD-3-Clause",
+			"workspaces": [
+				"packages/*"
+			]
 		},
 		"node_modules/emoji-regex": {
 			"version": "8.0.0",
@@ -8875,19 +8933,6 @@
 				"he": "bin/he"
 			}
 		},
-		"node_modules/history": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
-			"integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
-			"dependencies": {
-				"@babel/runtime": "^7.1.2",
-				"loose-envify": "^1.2.0",
-				"resolve-pathname": "^3.0.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0",
-				"value-equal": "^1.0.1"
-			}
-		},
 		"node_modules/hmac-drbg": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -9476,9 +9521,10 @@
 			}
 		},
 		"node_modules/immer": {
-			"version": "9.0.6",
-			"resolved": "https://registry.npmjs.org/immer/-/immer-9.0.6.tgz",
-			"integrity": "sha512-G95ivKpy+EvVAnAab4fVa4YGYn24J1SpEktnJX7JJ45Bd7xqME/SCplFzYFmTbrkwZbQ4xJK1xMTUYBkN6pWsQ==",
+			"version": "10.1.1",
+			"resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
+			"integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
+			"license": "MIT",
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/immer"
@@ -12347,15 +12393,6 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/mini-create-react-context": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz",
-			"integrity": "sha512-b0TytUgFSbgFJGzJqXPKCFCBWigAjpjo+Fl7Vf7ZbKRDptszpppKxXH6DRXEABZ/gcEQczeb0iZ7JvL8e8jjCA==",
-			"dependencies": {
-				"@babel/runtime": "^7.5.5",
-				"tiny-warning": "^1.0.3"
-			}
-		},
 		"node_modules/minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -13380,14 +13417,6 @@
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
 		},
-		"node_modules/path-to-regexp": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-			"integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-			"dependencies": {
-				"isarray": "0.0.1"
-			}
-		},
 		"node_modules/path-type": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -14785,47 +14814,69 @@
 			}
 		},
 		"node_modules/react-redux": {
-			"version": "7.2.4",
-			"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.4.tgz",
-			"integrity": "sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA==",
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.0.0.tgz",
+			"integrity": "sha512-/X/wiza+G2IXbz1Ow9Gs5qK7KNdoEnzzsR7ne7jcOWJMBOx9wvraPZwFddCs84xqwilvYaoENHowQMiW0axbsQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.12.1",
-				"@types/react-redux": "^7.1.16",
-				"hoist-non-react-statics": "^3.3.2",
-				"loose-envify": "^1.4.0",
-				"prop-types": "^15.7.2",
-				"react-is": "^16.13.1"
+				"@types/use-sync-external-store": "^0.0.3",
+				"use-sync-external-store": "^1.0.0"
+			},
+			"peerDependencies": {
+				"@types/react": "^18.2.41",
+				"@types/react-dom": "^18.2.17",
+				"react": "^18.0",
+				"react-dom": "^18.0",
+				"react-native": ">=0.71",
+				"redux": "^5.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				},
+				"react-dom": {
+					"optional": true
+				},
+				"react-native": {
+					"optional": true
+				},
+				"redux": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/react-router": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
-			"integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==",
+			"version": "6.4.0",
+			"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.4.0.tgz",
+			"integrity": "sha512-B+5bEXFlgR1XUdHYR6P94g299SjrfCBMmEDJNcFbpAyRH1j1748yt9NdDhW3++nw1lk3zQJ6aOO66zUx3KlTZg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.1.2",
-				"history": "^4.9.0",
-				"hoist-non-react-statics": "^3.1.0",
-				"loose-envify": "^1.3.1",
-				"mini-create-react-context": "^0.4.0",
-				"path-to-regexp": "^1.7.0",
-				"prop-types": "^15.6.2",
-				"react-is": "^16.6.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
+				"@remix-run/router": "1.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"react": ">=16.8"
 			}
 		},
 		"node_modules/react-router-dom": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
-			"integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
+			"version": "6.4.0",
+			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.4.0.tgz",
+			"integrity": "sha512-4Aw1xmXKeleYYQ3x0Lcl2undHR6yMjXZjd9DKZd53SGOYqirrUThyUb0wwAX5VZAyvSuzjNJmZlJ3rR9+/vzqg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.1.2",
-				"history": "^4.9.0",
-				"loose-envify": "^1.3.1",
-				"prop-types": "^15.6.2",
-				"react-router": "5.2.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
+				"react-router": "6.4.0"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"react": ">=16.8",
+				"react-dom": ">=16.8"
 			}
 		},
 		"node_modules/react-select": {
@@ -14961,12 +15012,10 @@
 			}
 		},
 		"node_modules/redux": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/redux/-/redux-4.1.0.tgz",
-			"integrity": "sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g==",
-			"dependencies": {
-				"@babel/runtime": "^7.9.2"
-			}
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+			"integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
+			"license": "MIT"
 		},
 		"node_modules/redux-mock-store": {
 			"version": "1.5.4",
@@ -14978,9 +15027,13 @@
 			}
 		},
 		"node_modules/redux-thunk": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz",
-			"integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw=="
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+			"integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
+			"license": "MIT",
+			"peerDependencies": {
+				"redux": "^5.0.0"
+			}
 		},
 		"node_modules/regenerator-runtime": {
 			"version": "0.13.7",
@@ -15369,9 +15422,10 @@
 			"dev": true
 		},
 		"node_modules/reselect": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz",
-			"integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
+			"integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
+			"license": "MIT"
 		},
 		"node_modules/resolve": {
 			"version": "1.17.0",
@@ -15402,11 +15456,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/resolve-pathname": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
-			"integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
-		},
 		"node_modules/resolve-url": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -17807,16 +17856,6 @@
 				"node": ">=0.6.0"
 			}
 		},
-		"node_modules/tiny-invariant": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz",
-			"integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw=="
-		},
-		"node_modules/tiny-warning": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
-			"integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
-		},
 		"node_modules/tmp": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
@@ -18623,6 +18662,15 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/use-sync-external-store": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz",
+			"integrity": "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==",
+			"license": "MIT",
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+			}
+		},
 		"node_modules/util": {
 			"version": "0.11.1",
 			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
@@ -18708,11 +18756,6 @@
 				"spdx-expression-parse": "^3.0.0"
 			}
 		},
-		"node_modules/value-equal": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
-			"integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
-		},
 		"node_modules/verror": {
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
@@ -20852,16 +20895,21 @@
 			"integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg=="
 		},
 		"@reduxjs/toolkit": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.6.0.tgz",
-			"integrity": "sha512-eGL50G+Vj5AG5uD0lineb6rRtbs96M8+hxbcwkHpZ8LQcmt0Bm33WyBSnj5AweLkjQ7ZP+KFRDHiLMznljRQ3A==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.0.0.tgz",
+			"integrity": "sha512-Kq/a+aO28adYdPoNEu9p800MYPKoUc0tlkYfv035Ief9J7MPq8JvmT7UdpYhvXsoMtOdt567KwZjc9H3Rf8yjg==",
 			"requires": {
-				"immer": "^9.0.1",
-				"redux": "^4.1.0",
-				"redux-thunk": "^2.3.0",
-				"reselect": "^4.0.0"
+				"immer": "^10.0.3",
+				"redux": "^5.0.0",
+				"redux-thunk": "^3.0.1",
+				"reselect": "^5.0.0"
 			}
 		},
+		"@remix-run/router": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.0.0.tgz",
+			"integrity": "sha512-SCR1cxRSMNKjaVYptCzBApPDqGwa3FGdjVHc+rOToocNPHQdIYLZBfv/3f+KvYuXDkUGVIW9IAzmPNZDRL1I4A=="
+		},
 		"@samverschueren/stream-to-observable": {
 			"version": "0.3.1",
 			"resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz",
@@ -21380,7 +21428,7 @@
 			"version": "17.0.3",
 			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.3.tgz",
 			"integrity": "sha512-4NnJbCeWE+8YBzupn/YrJxZ8VnjcJq5iR1laqQ1vkpQgBiA7bwk0Rp24fxsdNinzJY2U+HHS4dJJDPdoMjdJ7w==",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"@types/react": "*"
 			}
@@ -21398,11 +21446,23 @@
 			"version": "7.1.16",
 			"resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.16.tgz",
 			"integrity": "sha512-f/FKzIrZwZk7YEO9E1yoxIuDNRiDducxkFlkw/GNMGEnK9n4K8wJzlJBghpSuOVDgEUHoDkDF7Gi9lHNQR4siw==",
+			"dev": true,
 			"requires": {
 				"@types/hoist-non-react-statics": "^3.3.0",
 				"@types/react": "*",
 				"hoist-non-react-statics": "^3.3.0",
 				"redux": "^4.0.0"
+			},
+			"dependencies": {
+				"redux": {
+					"version": "4.2.1",
+					"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+					"integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+					"dev": true,
+					"requires": {
+						"@babel/runtime": "^7.9.2"
+					}
+				}
 			}
 		},
 		"@types/react-router": {
@@ -21454,6 +21514,17 @@
 			"dev": true,
 			"requires": {
 				"redux": "^4.0.5"
+			},
+			"dependencies": {
+				"redux": {
+					"version": "4.2.1",
+					"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+					"integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+					"dev": true,
+					"requires": {
+						"@babel/runtime": "^7.9.2"
+					}
+				}
 			}
 		},
 		"@types/scheduler": {
@@ -21494,6 +21565,11 @@
 			"integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
 			"dev": true
 		},
+		"@types/use-sync-external-store": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
+			"integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA=="
+		},
 		"@types/yargs": {
 			"version": "15.0.8",
 			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.8.tgz",
@@ -24502,6 +24578,16 @@
 				"@react-dnd/asap": "^4.0.0",
 				"@react-dnd/invariant": "^2.0.0",
 				"redux": "^4.0.5"
+			},
+			"dependencies": {
+				"redux": {
+					"version": "4.2.1",
+					"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+					"integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+					"requires": {
+						"@babel/runtime": "^7.9.2"
+					}
+				}
 			}
 		},
 		"doctrine": {
@@ -24751,13 +24837,9 @@
 			"dev": true
 		},
 		"emoji-mart": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/emoji-mart/-/emoji-mart-3.0.1.tgz",
-			"integrity": "sha512-sxpmMKxqLvcscu6mFn9ITHeZNkGzIvD0BSNFE/LJESPbCA8s1jM6bCDPjWbV31xHq7JXaxgpHxLB54RCbBZSlg==",
-			"requires": {
-				"@babel/runtime": "^7.0.0",
-				"prop-types": "^15.6.0"
-			}
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-mart/-/emoji-mart-5.0.0.tgz",
+			"integrity": "sha512-4O75LxV/RPOrtC9+0qhHhfPgJgW/Kwc4zv15h190liC3vJ/5RVibIrnPlDZ0xqYx0bPVOy3W/QcDTZY+jq1qOw=="
 		},
 		"emoji-regex": {
 			"version": "8.0.0",
@@ -26877,19 +26959,6 @@
 			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
 			"dev": true
 		},
-		"history": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
-			"integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
-			"requires": {
-				"@babel/runtime": "^7.1.2",
-				"loose-envify": "^1.2.0",
-				"resolve-pathname": "^3.0.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0",
-				"value-equal": "^1.0.1"
-			}
-		},
 		"hmac-drbg": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -27362,9 +27431,9 @@
 			}
 		},
 		"immer": {
-			"version": "9.0.6",
-			"resolved": "https://registry.npmjs.org/immer/-/immer-9.0.6.tgz",
-			"integrity": "sha512-G95ivKpy+EvVAnAab4fVa4YGYn24J1SpEktnJX7JJ45Bd7xqME/SCplFzYFmTbrkwZbQ4xJK1xMTUYBkN6pWsQ=="
+			"version": "10.1.1",
+			"resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
+			"integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw=="
 		},
 		"immutable": {
 			"version": "3.7.6",
@@ -29638,15 +29707,6 @@
 			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
 			"dev": true
 		},
-		"mini-create-react-context": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz",
-			"integrity": "sha512-b0TytUgFSbgFJGzJqXPKCFCBWigAjpjo+Fl7Vf7ZbKRDptszpppKxXH6DRXEABZ/gcEQczeb0iZ7JvL8e8jjCA==",
-			"requires": {
-				"@babel/runtime": "^7.5.5",
-				"tiny-warning": "^1.0.3"
-			}
-		},
 		"minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -30468,14 +30528,6 @@
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
 		},
-		"path-to-regexp": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-			"integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-			"requires": {
-				"isarray": "0.0.1"
-			}
-		},
 		"path-type": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -31610,47 +31662,28 @@
 			}
 		},
 		"react-redux": {
-			"version": "7.2.4",
-			"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.4.tgz",
-			"integrity": "sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA==",
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.0.0.tgz",
+			"integrity": "sha512-/X/wiza+G2IXbz1Ow9Gs5qK7KNdoEnzzsR7ne7jcOWJMBOx9wvraPZwFddCs84xqwilvYaoENHowQMiW0axbsQ==",
 			"requires": {
-				"@babel/runtime": "^7.12.1",
-				"@types/react-redux": "^7.1.16",
-				"hoist-non-react-statics": "^3.3.2",
-				"loose-envify": "^1.4.0",
-				"prop-types": "^15.7.2",
-				"react-is": "^16.13.1"
+				"@types/use-sync-external-store": "^0.0.3",
+				"use-sync-external-store": "^1.0.0"
 			}
 		},
 		"react-router": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
-			"integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==",
+			"version": "6.4.0",
+			"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.4.0.tgz",
+			"integrity": "sha512-B+5bEXFlgR1XUdHYR6P94g299SjrfCBMmEDJNcFbpAyRH1j1748yt9NdDhW3++nw1lk3zQJ6aOO66zUx3KlTZg==",
 			"requires": {
-				"@babel/runtime": "^7.1.2",
-				"history": "^4.9.0",
-				"hoist-non-react-statics": "^3.1.0",
-				"loose-envify": "^1.3.1",
-				"mini-create-react-context": "^0.4.0",
-				"path-to-regexp": "^1.7.0",
-				"prop-types": "^15.6.2",
-				"react-is": "^16.6.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
+				"@remix-run/router": "1.0.0"
 			}
 		},
 		"react-router-dom": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
-			"integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
+			"version": "6.4.0",
+			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.4.0.tgz",
+			"integrity": "sha512-4Aw1xmXKeleYYQ3x0Lcl2undHR6yMjXZjd9DKZd53SGOYqirrUThyUb0wwAX5VZAyvSuzjNJmZlJ3rR9+/vzqg==",
 			"requires": {
-				"@babel/runtime": "^7.1.2",
-				"history": "^4.9.0",
-				"loose-envify": "^1.3.1",
-				"prop-types": "^15.6.2",
-				"react-router": "5.2.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
+				"react-router": "6.4.0"
 			}
 		},
 		"react-select": {
@@ -31772,12 +31805,9 @@
 			}
 		},
 		"redux": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/redux/-/redux-4.1.0.tgz",
-			"integrity": "sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g==",
-			"requires": {
-				"@babel/runtime": "^7.9.2"
-			}
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+			"integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
 		},
 		"redux-mock-store": {
 			"version": "1.5.4",
@@ -31789,9 +31819,10 @@
 			}
 		},
 		"redux-thunk": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz",
-			"integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw=="
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+			"integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
+			"requires": {}
 		},
 		"regenerator-runtime": {
 			"version": "0.13.7",
@@ -32089,9 +32120,9 @@
 			"dev": true
 		},
 		"reselect": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz",
-			"integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
+			"integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="
 		},
 		"resolve": {
 			"version": "1.17.0",
@@ -32116,11 +32147,6 @@
 			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
 			"dev": true
 		},
-		"resolve-pathname": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
-			"integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
-		},
 		"resolve-url": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -34076,16 +34102,6 @@
 				"setimmediate": "^1.0.4"
 			}
 		},
-		"tiny-invariant": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz",
-			"integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw=="
-		},
-		"tiny-warning": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
-			"integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
-		},
 		"tmp": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
@@ -34728,6 +34744,12 @@
 			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
 			"dev": true
 		},
+		"use-sync-external-store": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz",
+			"integrity": "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==",
+			"requires": {}
+		},
 		"util": {
 			"version": "0.11.1",
 			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
@@ -34808,11 +34830,6 @@
 				"spdx-expression-parse": "^3.0.0"
 			}
 		},
-		"value-equal": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
-			"integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
-		},
 		"verror": {
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
diff --git a/webapp/package.json b/webapp/package.json
index 2e706ecaef1..fcf29618c0c 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -31,10 +31,10 @@
 		"@fullcalendar/interaction": "^5.10.0",
 		"@fullcalendar/react": "^5.10.0",
 		"@mattermost/compass-icons": "^0.1.10",
-		"@reduxjs/toolkit": "^1.6.0",
+		"@reduxjs/toolkit": "^2.0.0",
 		"color": "^4.0.0",
 		"draft-js": "^0.11.7",
-		"emoji-mart": "^3.0.1",
+		"emoji-mart": "^5.0.0",
 		"fullcalendar": "^5.10.0",
 		"imagemin-gifsicle": "^7.0.0",
 		"imagemin-mozjpeg": "^9.0.0",
@@ -56,8 +56,8 @@
 		"react-hot-keys": "^2.6.2",
 		"react-hotkeys-hook": "^3.3.0",
 		"react-intl": "^5.13.5",
-		"react-redux": "^7.2.4",
-		"react-router-dom": "^5.2.0",
+		"react-redux": "^9.0.0",
+		"react-router-dom": "^6.4.0",
 		"react-select": "^4.3.0"
 	},
 	"jest": {