diff --git a/package-lock.json b/package-lock.json
index 930eed9c..b7093409 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -62,7 +62,7 @@
 				"@types/node-fetch": "^2.5.12",
 				"@types/pg": "^8.6.1",
 				"@types/qrcode.react": "^1.0.2",
-				"@types/react": "^16.14.11",
+				"@types/react": "^18.0.8",
 				"@types/react-dom": "^16.9.14",
 				"@types/react-router-dom": "^5.1.8",
 				"@types/request-promise": "^4.1.48",
@@ -2477,10 +2477,9 @@
 			"dev": true
 		},
 		"node_modules/@types/react": {
-			"version": "16.14.11",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.11.tgz",
-			"integrity": "sha512-Don0MtsZZ3fjwTJ2BsoqkyOy7e176KplEAKOpr/4XDdzinlyJBn9yfsKn5mcSgn4kh1B22+3tBnzBC1z63ybtQ==",
-			"dev": true,
+			"version": "18.0.8",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.8.tgz",
+			"integrity": "sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw==",
 			"dependencies": {
 				"@types/prop-types": "*",
 				"@types/scheduler": "*",
@@ -2496,6 +2495,17 @@
 				"@types/react": "^16"
 			}
 		},
+		"node_modules/@types/react-dom/node_modules/@types/react": {
+			"version": "16.14.25",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.25.tgz",
+			"integrity": "sha512-cXRVHd7vBT5v1is72mmvmsg9stZrbJO04DJqFeh3Yj2tVKO6vmxg5BI+ybI6Ls7ROXRG3aFbZj9x0WA3ZAoDQw==",
+			"dev": true,
+			"dependencies": {
+				"@types/prop-types": "*",
+				"@types/scheduler": "*",
+				"csstype": "^3.0.2"
+			}
+		},
 		"node_modules/@types/react-router": {
 			"version": "5.1.16",
 			"resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.16.tgz",
@@ -2525,16 +2535,6 @@
 				"@types/react": "*"
 			}
 		},
-		"node_modules/@types/react-transition-group/node_modules/@types/react": {
-			"version": "17.0.15",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.15.tgz",
-			"integrity": "sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw==",
-			"dependencies": {
-				"@types/prop-types": "*",
-				"@types/scheduler": "*",
-				"csstype": "^3.0.2"
-			}
-		},
 		"node_modules/@types/request": {
 			"version": "2.48.7",
 			"resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.7.tgz",
@@ -10867,16 +10867,6 @@
 				"react-dom": ">=16.8.0"
 			}
 		},
-		"node_modules/react-bootstrap/node_modules/@types/react": {
-			"version": "17.0.15",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.15.tgz",
-			"integrity": "sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw==",
-			"dependencies": {
-				"@types/prop-types": "*",
-				"@types/scheduler": "*",
-				"csstype": "^3.0.2"
-			}
-		},
 		"node_modules/react-codemirror2": {
 			"version": "7.2.1",
 			"resolved": "https://registry.npmjs.org/react-codemirror2/-/react-codemirror2-7.2.1.tgz",
@@ -12856,16 +12846,6 @@
 				"react": ">=15.0.0"
 			}
 		},
-		"node_modules/uncontrollable/node_modules/@types/react": {
-			"version": "17.0.15",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.15.tgz",
-			"integrity": "sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw==",
-			"dependencies": {
-				"@types/prop-types": "*",
-				"@types/scheduler": "*",
-				"csstype": "^3.0.2"
-			}
-		},
 		"node_modules/unicode-canonical-property-names-ecmascript": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -15495,10 +15475,9 @@
 			"dev": true
 		},
 		"@types/react": {
-			"version": "16.14.11",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.11.tgz",
-			"integrity": "sha512-Don0MtsZZ3fjwTJ2BsoqkyOy7e176KplEAKOpr/4XDdzinlyJBn9yfsKn5mcSgn4kh1B22+3tBnzBC1z63ybtQ==",
-			"dev": true,
+			"version": "18.0.8",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.8.tgz",
+			"integrity": "sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw==",
 			"requires": {
 				"@types/prop-types": "*",
 				"@types/scheduler": "*",
@@ -15512,6 +15491,19 @@
 			"dev": true,
 			"requires": {
 				"@types/react": "^16"
+			},
+			"dependencies": {
+				"@types/react": {
+					"version": "16.14.25",
+					"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.25.tgz",
+					"integrity": "sha512-cXRVHd7vBT5v1is72mmvmsg9stZrbJO04DJqFeh3Yj2tVKO6vmxg5BI+ybI6Ls7ROXRG3aFbZj9x0WA3ZAoDQw==",
+					"dev": true,
+					"requires": {
+						"@types/prop-types": "*",
+						"@types/scheduler": "*",
+						"csstype": "^3.0.2"
+					}
+				}
 			}
 		},
 		"@types/react-router": {
@@ -15541,18 +15533,6 @@
 			"integrity": "sha512-KibDWL6nshuOJ0fu8ll7QnV/LVTo3PzQ9aCPnRUYPfX7eZohHwLIdNHj7pftanREzHNP4/nJa8oeM73uSiavMQ==",
 			"requires": {
 				"@types/react": "*"
-			},
-			"dependencies": {
-				"@types/react": {
-					"version": "17.0.15",
-					"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.15.tgz",
-					"integrity": "sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw==",
-					"requires": {
-						"@types/prop-types": "*",
-						"@types/scheduler": "*",
-						"csstype": "^3.0.2"
-					}
-				}
 			}
 		},
 		"@types/request": {
@@ -22053,18 +22033,6 @@
 				"react-transition-group": "^4.4.1",
 				"uncontrollable": "^7.2.1",
 				"warning": "^4.0.3"
-			},
-			"dependencies": {
-				"@types/react": {
-					"version": "17.0.15",
-					"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.15.tgz",
-					"integrity": "sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw==",
-					"requires": {
-						"@types/prop-types": "*",
-						"@types/scheduler": "*",
-						"csstype": "^3.0.2"
-					}
-				}
 			}
 		},
 		"react-codemirror2": {
@@ -23600,18 +23568,6 @@
 				"@types/react": ">=16.9.11",
 				"invariant": "^2.2.4",
 				"react-lifecycles-compat": "^3.0.4"
-			},
-			"dependencies": {
-				"@types/react": {
-					"version": "17.0.15",
-					"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.15.tgz",
-					"integrity": "sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw==",
-					"requires": {
-						"@types/prop-types": "*",
-						"@types/scheduler": "*",
-						"csstype": "^3.0.2"
-					}
-				}
 			}
 		},
 		"unicode-canonical-property-names-ecmascript": {
diff --git a/package.json b/package.json
index 31e98dc1..2d99cdf7 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
 		"@types/node-fetch": "^2.5.12",
 		"@types/pg": "^8.6.1",
 		"@types/qrcode.react": "^1.0.2",
-		"@types/react": "^16.14.11",
+		"@types/react": "^18.0.8",
 		"@types/react-dom": "^16.9.14",
 		"@types/react-router-dom": "^5.1.8",
 		"@types/request-promise": "^4.1.48",