From e554adc7d890ed230ab5218f430bfe2236abd3ed Mon Sep 17 00:00:00 2001
From: cihatata <omercihatataa@gmail.com>
Date: Fri, 4 Apr 2025 01:02:26 +0300
Subject: [PATCH 01/34] 2002 fix: use available language

---
 src/App.jsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index feddfb60f..1d5709847 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -25,10 +25,14 @@ function App() {
 		if (authToken) {
 			dispatch(getAppSettings({ authToken })).then((action) => {
 				if (action.payload && action.payload.success) {
-					const { language } = action.payload.data;
-					if (language) {
+						const { language } = action.payload.data;
+				const availableLanguages = Object.keys(i18n.options.resources || {});
+					if (language && availableLanguages.includes(language)) {
 						dispatch(setLanguage(language));
 						i18n.changeLanguage(language);
+					} else {
+						dispatch(setLanguage(availableLanguages[0]));
+						i18n.changeLanguage(availableLanguages[0]);
 					}
 				}
 			});

From 57bd08b877800c74e5bb8a7ed4cdce77dbd8f998 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Fri, 4 Apr 2025 20:53:40 +0530
Subject: [PATCH 02/34] Fix: Minor UI Fix in Filters

---
 src/Components/FilterHeader/index.jsx | 16 +++++++++++++++-
 src/locales/gb.json                   |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Components/FilterHeader/index.jsx b/src/Components/FilterHeader/index.jsx
index 73c7d69ac..c41edf34d 100644
--- a/src/Components/FilterHeader/index.jsx
+++ b/src/Components/FilterHeader/index.jsx
@@ -47,12 +47,26 @@ const FilterHeader = ({ header, options, value, onChange, multiple = true }) =>
 						.filter(Boolean)
 						.join(", ");
 				}}
+				MenuProps={{
+					anchorOrigin: {
+						vertical: "bottom",
+						horizontal: "left",
+					},
+					transformOrigin: {
+						vertical: "top",
+						horizontal: "left",
+					},
+				}}
 			>
 				{options.map((option) => (
 					<MenuItem
 						key={option.value}
 						value={option.value}
-					>
+						sx={{
+							height: theme.spacing(20),
+							padding: 0,
+						}}
+					>cd
 						<Checkbox
 							checked={controlledValue.includes(option.value)}
 							size="small"
diff --git a/src/locales/gb.json b/src/locales/gb.json
index 5dfe9b4ca..a773e3029 100644
--- a/src/locales/gb.json
+++ b/src/locales/gb.json
@@ -62,6 +62,8 @@
   "settingsDisplayTimezone": "Display timezone",
   "settingsDisplayTimezoneDescription": "The timezone of the dashboard you publicly display.",
   "settingsAppearance": "Appearance",
+  "state": "State",
+  "reset": "Reset",
   "settingsAppearanceDescription": "Switch between light and dark mode, or change user interface language",
   "settingsThemeMode": "Theme Mode",
   "settingsLanguage": "Language",

From a185f822ce2557fd429d039abf71b8e9bc915b2a Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Fri, 4 Apr 2025 21:18:56 +0530
Subject: [PATCH 03/34] Fix: Minor UI Fix in Filters

---
 src/Components/FilterHeader/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/FilterHeader/index.jsx b/src/Components/FilterHeader/index.jsx
index c41edf34d..b39a61e18 100644
--- a/src/Components/FilterHeader/index.jsx
+++ b/src/Components/FilterHeader/index.jsx
@@ -66,7 +66,7 @@ const FilterHeader = ({ header, options, value, onChange, multiple = true }) =>
 							height: theme.spacing(20),
 							padding: 0,
 						}}
-					>cd
+					>
 						<Checkbox
 							checked={controlledValue.includes(option.value)}
 							size="small"

From 59a1cd6f86970de5d2b3484a303d2e6abaec8fd3 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Sun, 6 Apr 2025 15:04:06 -0400
Subject: [PATCH 04/34] add ref to <aside> to track sidebar DOM

---
 src/Components/Sidebar/index.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx
index 84fe9b33d..b2e4250a5 100644
--- a/src/Components/Sidebar/index.jsx
+++ b/src/Components/Sidebar/index.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useRef } from "react";
 import {
 	Box,
 	Collapse,
@@ -127,6 +127,8 @@ function Sidebar() {
 	const distributedUptimeEnabled = useSelector(
 		(state) => state.ui.distributedUptimeEnabled
 	);
+	const sidebarRef = useRef(null);
+
 
 	const renderAccountMenuItems = () => {
 		let filteredAccountMenuItems = [...accountMenuItems];
@@ -196,6 +198,7 @@ function Sidebar() {
 	return (
 		<Stack
 			component="aside"
+			ref={sidebarRef}
 			className={collapsed ? "collapsed" : "expanded"}
 			/* TODO general padding should be here */
 			py={theme.spacing(6)}

From c075c24630687e1a00773595e39565bedaccec7b Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Sun, 6 Apr 2025 15:06:51 -0400
Subject: [PATCH 05/34] add useffect to toggle sidebar-ready class after expand
 transition

---
 src/Components/Sidebar/index.jsx | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx
index b2e4250a5..91068a272 100644
--- a/src/Components/Sidebar/index.jsx
+++ b/src/Components/Sidebar/index.jsx
@@ -129,6 +129,21 @@ function Sidebar() {
 	);
 	const sidebarRef = useRef(null);
 
+	useEffect(() => {
+		const el = sidebarRef.current;
+		if (!el) return;
+	
+		const TRANSITION_DURATION = 650;
+	
+		if (!collapsed) {
+			const timeout = setTimeout(() => {
+				el.classList.add("sidebar-ready");
+			}, TRANSITION_DURATION);
+			return () => clearTimeout(timeout);
+		} else {
+			el.classList.remove("sidebar-ready");
+		}
+	}, [collapsed]);	
 
 	const renderAccountMenuItems = () => {
 		let filteredAccountMenuItems = [...accountMenuItems];

From 2f1ce06b53cb3f5ec0cae18c768aa9173aad4343 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Sun, 6 Apr 2025 15:08:32 -0400
Subject: [PATCH 06/34] add css for delaying fade-in

---
 src/Components/Sidebar/index.css | 11 +++++++++++
 src/Components/Sidebar/index.jsx |  1 +
 2 files changed, 12 insertions(+)

diff --git a/src/Components/Sidebar/index.css b/src/Components/Sidebar/index.css
index 58805c7f8..3dac59aba 100644
--- a/src/Components/Sidebar/index.css
+++ b/src/Components/Sidebar/index.css
@@ -79,6 +79,17 @@ aside .MuiListSubheader-root {
 	transition: padding 200ms ease;
 }
 
+.sidebar-delay-fade {
+	opacity: 0;
+	visibility: hidden;
+	transition: opacity 0.3s ease;
+}
+
+aside.sidebar-ready .sidebar-delay-fade {
+	opacity: 1;
+	visibility: visible;
+}
+
 @keyframes fadeIn {
 	0% {
 		opacity: 0;
diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx
index 91068a272..c3de1909d 100644
--- a/src/Components/Sidebar/index.jsx
+++ b/src/Components/Sidebar/index.jsx
@@ -743,6 +743,7 @@ function Sidebar() {
 							</Typography>
 						</Box>
 						<Stack
+							className="sidebar-delay-fade"
 							flexDirection={"row"}
 							marginLeft={"auto"}
 							columnGap={theme.spacing(2)}

From c05dec8537d13dfef23fffb8588b3c777fad77f3 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Sun, 6 Apr 2025 15:11:59 -0400
Subject: [PATCH 07/34] update transition duration

---
 src/Components/Sidebar/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx
index c3de1909d..0ec9b9a2a 100644
--- a/src/Components/Sidebar/index.jsx
+++ b/src/Components/Sidebar/index.jsx
@@ -133,7 +133,7 @@ function Sidebar() {
 		const el = sidebarRef.current;
 		if (!el) return;
 	
-		const TRANSITION_DURATION = 650;
+		const TRANSITION_DURATION = 200;
 	
 		if (!collapsed) {
 			const timeout = setTimeout(() => {

From 097d464bf3dc19093b0fdbc6eb6bf34e62c539c2 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Mon, 7 Apr 2025 14:06:26 +0530
Subject: [PATCH 08/34] Fix: Minor UI Fix in Filters

---
 src/Components/FilterHeader/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/FilterHeader/index.jsx b/src/Components/FilterHeader/index.jsx
index b39a61e18..4bb27646f 100644
--- a/src/Components/FilterHeader/index.jsx
+++ b/src/Components/FilterHeader/index.jsx
@@ -63,7 +63,7 @@ const FilterHeader = ({ header, options, value, onChange, multiple = true }) =>
 						key={option.value}
 						value={option.value}
 						sx={{
-							height: theme.spacing(20),
+							height: theme.spacing(17),
 							padding: 0,
 						}}
 					>

From 1db59640a485d42fe44b41e1bc2f583427b8b6e0 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 7 Apr 2025 16:12:32 +0000
Subject: [PATCH 09/34] Update dependency @solana/wallet-adapter-base to
 v0.9.24

---
 package-lock.json | 706 +---------------------------------------------
 package.json      |   2 +-
 2 files changed, 3 insertions(+), 705 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d5eb40f34..7308359b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
 				"@mui/x-data-grid": "7.28.3",
 				"@mui/x-date-pickers": "7.28.3",
 				"@reduxjs/toolkit": "2.6.1",
-				"@solana/wallet-adapter-base": "0.9.23",
+				"@solana/wallet-adapter-base": "0.9.24",
 				"@solana/wallet-adapter-material-ui": "0.16.35",
 				"@solana/wallet-adapter-react": "0.15.36",
 				"@solana/wallet-adapter-react-ui": "0.9.36",
@@ -6324,24 +6324,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-alpha/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-avana": {
 			"version": "0.1.14",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-avana/-/wallet-adapter-avana-0.1.14.tgz",
@@ -6357,7 +6339,7 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-avana/node_modules/@solana/wallet-adapter-base": {
+		"node_modules/@solana/wallet-adapter-base": {
 			"version": "0.9.24",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
 			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
@@ -6375,24 +6357,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.23",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.23.tgz",
-			"integrity": "sha512-apqMuYwFp1jFi55NxDfvXUX2x1T0Zh07MxhZ/nCCTGys5raSfYUh82zen2BLv8BSDj/JxZ2P/s7jrQZGrX8uAw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=16"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-base-ui": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base-ui/-/wallet-adapter-base-ui-0.1.3.tgz",
@@ -6424,24 +6388,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-bitkeep/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-bitpie": {
 			"version": "0.5.19",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-bitpie/-/wallet-adapter-bitpie-0.5.19.tgz",
@@ -6457,24 +6403,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-bitpie/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-clover": {
 			"version": "0.4.20",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-clover/-/wallet-adapter-clover-0.4.20.tgz",
@@ -6490,24 +6418,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-clover/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-coin98": {
 			"version": "0.5.21",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-coin98/-/wallet-adapter-coin98-0.5.21.tgz",
@@ -6524,24 +6434,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-coin98/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-coin98/node_modules/base-x": {
 			"version": "3.0.10",
 			"resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
@@ -6575,24 +6467,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-coinbase/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-coinhub": {
 			"version": "0.3.19",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-coinhub/-/wallet-adapter-coinhub-0.3.19.tgz",
@@ -6608,24 +6482,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-coinhub/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-fractal": {
 			"version": "0.1.9",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-fractal/-/wallet-adapter-fractal-0.1.9.tgz",
@@ -6642,24 +6498,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-fractal/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-huobi": {
 			"version": "0.1.16",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-huobi/-/wallet-adapter-huobi-0.1.16.tgz",
@@ -6675,24 +6513,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-huobi/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-hyperpay": {
 			"version": "0.1.15",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-hyperpay/-/wallet-adapter-hyperpay-0.1.15.tgz",
@@ -6708,24 +6528,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-hyperpay/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-keystone": {
 			"version": "0.1.16",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-keystone/-/wallet-adapter-keystone-0.1.16.tgz",
@@ -6742,24 +6544,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-keystone/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-krystal": {
 			"version": "0.1.13",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-krystal/-/wallet-adapter-krystal-0.1.13.tgz",
@@ -6775,24 +6559,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-krystal/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-ledger": {
 			"version": "0.9.26",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-ledger/-/wallet-adapter-ledger-0.9.26.tgz",
@@ -6812,24 +6578,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-ledger/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-material-ui": {
 			"version": "0.16.35",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-material-ui/-/wallet-adapter-material-ui-0.16.35.tgz",
@@ -6851,24 +6599,6 @@
 				"react-dom": "*"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-material-ui/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-mathwallet": {
 			"version": "0.9.19",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-mathwallet/-/wallet-adapter-mathwallet-0.9.19.tgz",
@@ -6884,24 +6614,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-mathwallet/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-neko": {
 			"version": "0.2.13",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-neko/-/wallet-adapter-neko-0.2.13.tgz",
@@ -6917,24 +6629,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-neko/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-nightly": {
 			"version": "0.1.17",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-nightly/-/wallet-adapter-nightly-0.1.17.tgz",
@@ -6950,24 +6644,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-nightly/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-nufi": {
 			"version": "0.1.18",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-nufi/-/wallet-adapter-nufi-0.1.18.tgz",
@@ -6983,24 +6659,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-nufi/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-onto": {
 			"version": "0.1.8",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-onto/-/wallet-adapter-onto-0.1.8.tgz",
@@ -7016,24 +6674,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-onto/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-particle": {
 			"version": "0.1.13",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-particle/-/wallet-adapter-particle-0.1.13.tgz",
@@ -7063,24 +6703,6 @@
 				"bs58": "^4.0.1"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-particle/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-particle/node_modules/base-x": {
 			"version": "3.0.10",
 			"resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
@@ -7116,24 +6738,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-phantom/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-react": {
 			"version": "0.15.36",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-react/-/wallet-adapter-react-0.15.36.tgz",
@@ -7171,42 +6775,6 @@
 				"react-dom": "*"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-react-ui/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
-		"node_modules/@solana/wallet-adapter-react/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-safepal": {
 			"version": "0.5.19",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-safepal/-/wallet-adapter-safepal-0.5.19.tgz",
@@ -7222,24 +6790,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-safepal/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-saifu": {
 			"version": "0.1.16",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-saifu/-/wallet-adapter-saifu-0.1.16.tgz",
@@ -7255,24 +6805,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-saifu/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-salmon": {
 			"version": "0.1.15",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-salmon/-/wallet-adapter-salmon-0.1.15.tgz",
@@ -7289,24 +6821,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-salmon/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-sky": {
 			"version": "0.1.16",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-sky/-/wallet-adapter-sky-0.1.16.tgz",
@@ -7322,24 +6836,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-sky/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-solflare": {
 			"version": "0.6.29",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-solflare/-/wallet-adapter-solflare-0.6.29.tgz",
@@ -7359,24 +6855,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-solflare/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-solong": {
 			"version": "0.9.19",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-solong/-/wallet-adapter-solong-0.9.19.tgz",
@@ -7392,24 +6870,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-solong/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-spot": {
 			"version": "0.1.16",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-spot/-/wallet-adapter-spot-0.1.16.tgz",
@@ -7425,24 +6885,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-spot/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-tokenary": {
 			"version": "0.1.13",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-tokenary/-/wallet-adapter-tokenary-0.1.13.tgz",
@@ -7458,24 +6900,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-tokenary/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-tokenpocket": {
 			"version": "0.4.20",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-tokenpocket/-/wallet-adapter-tokenpocket-0.4.20.tgz",
@@ -7491,24 +6915,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-tokenpocket/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-torus": {
 			"version": "0.11.29",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-torus/-/wallet-adapter-torus-0.11.29.tgz",
@@ -7529,24 +6935,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-torus/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-trezor": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-trezor/-/wallet-adapter-trezor-0.1.3.tgz",
@@ -7564,24 +6952,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-trezor/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-trust": {
 			"version": "0.1.14",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-trust/-/wallet-adapter-trust-0.1.14.tgz",
@@ -7597,24 +6967,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-trust/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-unsafe-burner": {
 			"version": "0.1.8",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-unsafe-burner/-/wallet-adapter-unsafe-burner-0.1.8.tgz",
@@ -7633,24 +6985,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-unsafe-burner/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-walletconnect": {
 			"version": "0.1.17",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-walletconnect/-/wallet-adapter-walletconnect-0.1.17.tgz",
@@ -7667,24 +7001,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-walletconnect/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-adapter-wallets": {
 			"version": "0.19.33",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-wallets/-/wallet-adapter-wallets-0.19.33.tgz",
@@ -7750,24 +7066,6 @@
 				"@solana/web3.js": "^1.77.3"
 			}
 		},
-		"node_modules/@solana/wallet-adapter-xdefi/node_modules/@solana/wallet-adapter-base": {
-			"version": "0.9.24",
-			"resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.24.tgz",
-			"integrity": "sha512-f3kwHF/2Lx3YgcO37B45MM46YLFy4QkdLemZ+N/0SwLAnSfhq3+Vb9bC5vuoupMJ/onos09TIDeIxRdg/+51kw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@solana/wallet-standard-features": "^1.1.0",
-				"@wallet-standard/base": "^1.0.1",
-				"@wallet-standard/features": "^1.0.3",
-				"eventemitter3": "^4.0.7"
-			},
-			"engines": {
-				"node": ">=20"
-			},
-			"peerDependencies": {
-				"@solana/web3.js": "^1.77.3"
-			}
-		},
 		"node_modules/@solana/wallet-standard": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/@solana/wallet-standard/-/wallet-standard-1.1.4.tgz",
diff --git a/package.json b/package.json
index aca603466..0771b8fa1 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
 		"@mui/lab": "6.0.0-dev.240424162023-9968b4889d",
 		"@mui/material": "6.4.10",
 		"@reduxjs/toolkit": "2.6.1",
-		"@solana/wallet-adapter-base": "0.9.23",
+		"@solana/wallet-adapter-base": "0.9.24",
 		"@solana/wallet-adapter-material-ui": "0.16.35",
 		"@solana/wallet-adapter-react": "0.15.36",
 		"@solana/wallet-adapter-react-ui": "0.9.36",

From 79cabb770aa88f55350e17e3e0d6f3200804d8e5 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Mon, 7 Apr 2025 14:55:43 -0400
Subject: [PATCH 10/34] add sidebarReady state and update useffect

---
 src/Components/Sidebar/index.jsx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx
index 0ec9b9a2a..d04e41451 100644
--- a/src/Components/Sidebar/index.jsx
+++ b/src/Components/Sidebar/index.jsx
@@ -128,20 +128,17 @@ function Sidebar() {
 		(state) => state.ui.distributedUptimeEnabled
 	);
 	const sidebarRef = useRef(null);
+	const [sidebarReady, setSidebarReady] = useState(!collapsed);
 
 	useEffect(() => {
-		const el = sidebarRef.current;
-		if (!el) return;
-	
-		const TRANSITION_DURATION = 200;
-	
 		if (!collapsed) {
+			setSidebarReady(false);
 			const timeout = setTimeout(() => {
-				el.classList.add("sidebar-ready");
-			}, TRANSITION_DURATION);
+				setSidebarReady(true);
+			}, 200);
 			return () => clearTimeout(timeout);
 		} else {
-			el.classList.remove("sidebar-ready");
+			setSidebarReady(false);
 		}
 	}, [collapsed]);	
 

From 58a51d8a3fdf1324c406243111e4e222948cb25d Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Mon, 7 Apr 2025 14:57:00 -0400
Subject: [PATCH 11/34] update sidebar stack classname to include sidebarReady

---
 src/Components/Sidebar/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx
index d04e41451..b81f889dd 100644
--- a/src/Components/Sidebar/index.jsx
+++ b/src/Components/Sidebar/index.jsx
@@ -211,7 +211,7 @@ function Sidebar() {
 		<Stack
 			component="aside"
 			ref={sidebarRef}
-			className={collapsed ? "collapsed" : "expanded"}
+			className={`${collapsed ? "collapsed" : "expanded"} ${sidebarReady ? "sidebar-ready" : ""}`}
 			/* TODO general padding should be here */
 			py={theme.spacing(6)}
 			gap={theme.spacing(6)}

From 8f92f8e97f155f80f9e0175e975c5b3153120650 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Mon, 7 Apr 2025 14:59:00 -0400
Subject: [PATCH 12/34] update css to fix icon visibility

---
 src/Components/Sidebar/index.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Components/Sidebar/index.css b/src/Components/Sidebar/index.css
index 3dac59aba..51ede5a36 100644
--- a/src/Components/Sidebar/index.css
+++ b/src/Components/Sidebar/index.css
@@ -82,12 +82,12 @@ aside .MuiListSubheader-root {
 .sidebar-delay-fade {
 	opacity: 0;
 	visibility: hidden;
-	transition: opacity 0.3s ease;
 }
 
-aside.sidebar-ready .sidebar-delay-fade {
+aside.expanded.sidebar-ready .sidebar-delay-fade {
 	opacity: 1;
 	visibility: visible;
+	transition: opacity 0.3s ease;
 }
 
 @keyframes fadeIn {

From 2f97269de5e93e34ad076e47c2e4f755b2e10d9f Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Mon, 7 Apr 2025 15:21:37 -0400
Subject: [PATCH 13/34] move transition to sidebar-delay fade class

---
 src/Components/Sidebar/index.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Sidebar/index.css b/src/Components/Sidebar/index.css
index 51ede5a36..ef921acca 100644
--- a/src/Components/Sidebar/index.css
+++ b/src/Components/Sidebar/index.css
@@ -82,12 +82,12 @@ aside .MuiListSubheader-root {
 .sidebar-delay-fade {
 	opacity: 0;
 	visibility: hidden;
+	transition: opacity 0.3s ease;
 }
 
 aside.expanded.sidebar-ready .sidebar-delay-fade {
 	opacity: 1;
 	visibility: visible;
-	transition: opacity 0.3s ease;
 }
 
 @keyframes fadeIn {

From ac57e1ec27296f333b8440b876f5b4a050b5cd59 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Mon, 7 Apr 2025 15:23:23 -0400
Subject: [PATCH 14/34] initialise sidebarReady state to false

---
 src/Components/Sidebar/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx
index b81f889dd..0d760661f 100644
--- a/src/Components/Sidebar/index.jsx
+++ b/src/Components/Sidebar/index.jsx
@@ -128,7 +128,7 @@ function Sidebar() {
 		(state) => state.ui.distributedUptimeEnabled
 	);
 	const sidebarRef = useRef(null);
-	const [sidebarReady, setSidebarReady] = useState(!collapsed);
+	const [sidebarReady, setSidebarReady] = useState(false);
 
 	useEffect(() => {
 		if (!collapsed) {

From 865140a2059fff07ba6e3117ff939e84e8944891 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Mon, 7 Apr 2025 15:29:18 -0400
Subject: [PATCH 15/34] create sidebarClassName variable and update in jsx

---
 src/Components/Sidebar/index.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx
index 0d760661f..8d65acdde 100644
--- a/src/Components/Sidebar/index.jsx
+++ b/src/Components/Sidebar/index.jsx
@@ -129,13 +129,14 @@ function Sidebar() {
 	);
 	const sidebarRef = useRef(null);
 	const [sidebarReady, setSidebarReady] = useState(false);
+	const TRANSITION_DURATION = 200;
 
 	useEffect(() => {
 		if (!collapsed) {
 			setSidebarReady(false);
 			const timeout = setTimeout(() => {
 				setSidebarReady(true);
-			}, 200);
+			}, TRANSITION_DURATION);
 			return () => clearTimeout(timeout);
 		} else {
 			setSidebarReady(false);
@@ -205,13 +206,14 @@ function Sidebar() {
 	}, [location]);
 
 	const iconColor = theme.palette.primary.contrastTextTertiary;
+	const sidebarClassName = `${collapsed ? "collapsed" : "expanded"} ${sidebarReady ? "sidebar-ready" : ""}`;
 
 	/* TODO refactor this, there are a some ternaries and comments in the return  */
 	return (
 		<Stack
 			component="aside"
 			ref={sidebarRef}
-			className={`${collapsed ? "collapsed" : "expanded"} ${sidebarReady ? "sidebar-ready" : ""}`}
+			className={sidebarClassName}
 			/* TODO general padding should be here */
 			py={theme.spacing(6)}
 			gap={theme.spacing(6)}

From 099affd2e4eee50c93c8609292b3f2bfd50d24a9 Mon Sep 17 00:00:00 2001
From: GitHub Action <github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 00:28:59 +0000
Subject: [PATCH 16/34] feat: translations updated from POEditor

---
 src/locales/gb.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/locales/gb.json b/src/locales/gb.json
index a773e3029..5dfe9b4ca 100644
--- a/src/locales/gb.json
+++ b/src/locales/gb.json
@@ -62,8 +62,6 @@
   "settingsDisplayTimezone": "Display timezone",
   "settingsDisplayTimezoneDescription": "The timezone of the dashboard you publicly display.",
   "settingsAppearance": "Appearance",
-  "state": "State",
-  "reset": "Reset",
   "settingsAppearanceDescription": "Switch between light and dark mode, or change user interface language",
   "settingsThemeMode": "Theme Mode",
   "settingsLanguage": "Language",

From 475b0df684c42608efaf0bcc8cb542d9f3ce4de0 Mon Sep 17 00:00:00 2001
From: Aryaman Kumar Sharma <kumararyaman26@gmail.com>
Date: Wed, 9 Apr 2025 00:13:45 +0530
Subject: [PATCH 17/34] Fix: Uptime UI Fixes

---
 src/Components/Sidebar/index.jsx | 15 ---------------
 src/Components/Table/index.jsx   |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx
index 8d65acdde..c3534786f 100644
--- a/src/Components/Sidebar/index.jsx
+++ b/src/Components/Sidebar/index.jsx
@@ -359,21 +359,6 @@ function Sidebar() {
 					component="nav"
 					aria-labelledby="nested-menu-subheader"
 					disablePadding
-					subheader={
-						<ListSubheader
-							component="div"
-							id="nested-menu-subheader"
-							sx={{
-								py: theme.spacing(4),
-								/* TODO px should be centralized in container */
-								px: collapsed ? theme.spacing(2) : theme.spacing(4),
-								backgroundColor: "transparent",
-								position: "static",
-							}}
-						>
-							Menu
-						</ListSubheader>
-					}
 					sx={{
 						px: theme.spacing(6),
 						height: "100%",
diff --git a/src/Components/Table/index.jsx b/src/Components/Table/index.jsx
index 93772a712..199e548d7 100644
--- a/src/Components/Table/index.jsx
+++ b/src/Components/Table/index.jsx
@@ -65,7 +65,7 @@ const DataTable = ({
 						backgroundColor: theme.palette.secondary.main,
 						color: theme.palette.secondary.contrastText,
 						fontWeight: 600,
-						fontSize: "12px",
+						fontSize: "13px",
 					},
 					"& :is(td)": {
 						backgroundColor: theme.palette.primary.main,

From a32f8dd8a477b9abc0d42b28c82ac0c894da31eb Mon Sep 17 00:00:00 2001
From: Trial <trial@h-mhsb-nyyd-sl-Trial.local>
Date: Wed, 9 Apr 2025 11:06:26 +0300
Subject: [PATCH 18/34] Added side menu close on click

---
 src/Components/Sidebar/index.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx
index 84fe9b33d..88df029dd 100644
--- a/src/Components/Sidebar/index.jsx
+++ b/src/Components/Sidebar/index.jsx
@@ -148,7 +148,10 @@ function Sidebar() {
 		return filteredAccountMenuItems.map((item) => (
 			<MenuItem
 				key={item.name}
-				onClick={() => navigate(item.path)}
+				onClick={() => {
+				     closePopup();
+					 navigate(item.path)
+				}}
 				sx={{
 					gap: theme.spacing(2),
 					borderRadius: theme.shape.borderRadius,

From e167b7619110f6017416414dc88dc3e6ee81d5d2 Mon Sep 17 00:00:00 2001
From: Trial <trial@h-mhsb-nyyd-sl-Trial.local>
Date: Wed, 9 Apr 2025 11:09:23 +0300
Subject: [PATCH 19/34] removed semicolon

---
 src/Components/Sidebar/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx
index 88df029dd..12f7e1717 100644
--- a/src/Components/Sidebar/index.jsx
+++ b/src/Components/Sidebar/index.jsx
@@ -149,7 +149,7 @@ function Sidebar() {
 			<MenuItem
 				key={item.name}
 				onClick={() => {
-				     closePopup();
+				     closePopup()
 					 navigate(item.path)
 				}}
 				sx={{

From 65e1b686cc9e569a40db0e9041367efb2bcf5985 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 9 Apr 2025 22:34:59 +0530
Subject: [PATCH 20/34] Feat: New Monitor Header UI

---
 src/Components/MonitorCountHeader/index.jsx | 26 +++++++++++++++------
 src/Pages/Infrastructure/Monitors/index.jsx |  1 -
 src/Pages/PageSpeed/Monitors/index.jsx      |  1 -
 src/Pages/Uptime/Monitors/index.jsx         |  3 +--
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/Components/MonitorCountHeader/index.jsx b/src/Components/MonitorCountHeader/index.jsx
index f7c31a5a0..0b3478df5 100644
--- a/src/Components/MonitorCountHeader/index.jsx
+++ b/src/Components/MonitorCountHeader/index.jsx
@@ -1,6 +1,4 @@
-import { Stack } from "@mui/material";
-import { Heading } from "../Heading";
-import CircularCount from "../CircularCount";
+import { Stack, Typography } from "@mui/material";
 import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
 import SkeletonLayout from "./skeleton";
@@ -8,22 +6,36 @@ import SkeletonLayout from "./skeleton";
 const MonitorCountHeader = ({
 	shouldRender = true,
 	monitorCount,
-	heading,
+	heading = "monitors",
 	sx,
 	children,
 }) => {
 	const theme = useTheme();
 	if (!shouldRender) return <SkeletonLayout />;
 
+	if (monitorCount === 1) {
+		heading = "monitor";
+	}
+
 	return (
 		<Stack
 			direction="row"
 			alignItems="center"
+			display="flex"
+			width="fit-content"
+			height={theme.spacing(18)}
 			gap={theme.spacing(2)}
-			sx={{ ...sx }}
+			mt={theme.spacing(2)}
+			px={theme.spacing(4)}
+			pt={theme.spacing(2)}
+			pb={theme.spacing(3)}
+			borderRadius={theme.spacing(1)}
+			sx={{
+				...sx,
+				backgroundColor: theme.palette.secondary.main,
+			}}
 		>
-			<Heading component="h2">{heading}</Heading>
-			<CircularCount count={monitorCount} />
+			{monitorCount} <Typography component="h2">{heading}</Typography>
 			{children}
 		</Stack>
 	);
diff --git a/src/Pages/Infrastructure/Monitors/index.jsx b/src/Pages/Infrastructure/Monitors/index.jsx
index 1c511fea3..b679e04b7 100644
--- a/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/src/Pages/Infrastructure/Monitors/index.jsx
@@ -87,7 +87,6 @@ const InfrastructureMonitors = () => {
 			/>
 			<MonitorCountHeader
 				shouldRender={!isLoading}
-				heading="Infrastructure monitors"
 				monitorCount={summary?.totalMonitors ?? 0}
 			/>
 			<MonitorsTable
diff --git a/src/Pages/PageSpeed/Monitors/index.jsx b/src/Pages/PageSpeed/Monitors/index.jsx
index 8ebb3f1b1..68cc12c48 100644
--- a/src/Pages/PageSpeed/Monitors/index.jsx
+++ b/src/Pages/PageSpeed/Monitors/index.jsx
@@ -67,7 +67,6 @@ const PageSpeed = () => {
 			<MonitorCountHeader
 				shouldRender={!isLoading}
 				monitorCount={summary?.totalMonitors}
-				heading="PageSpeed monitors"
 				sx={{ mb: theme.spacing(8) }}
 			/>
 			<MonitorGrid
diff --git a/src/Pages/Uptime/Monitors/index.jsx b/src/Pages/Uptime/Monitors/index.jsx
index 8c25e1d82..19b39c64a 100644
--- a/src/Pages/Uptime/Monitors/index.jsx
+++ b/src/Pages/Uptime/Monitors/index.jsx
@@ -120,7 +120,7 @@ const UptimeMonitors = () => {
 
 	const filterLookup = new Map([
 		[toFilterStatus, "status"],
-		[toFilterActive, "isActive"]
+		[toFilterActive, "isActive"],
 	]);
 
 	const activeFilter = [...filterLookup].find(([key]) => key !== undefined);
@@ -202,7 +202,6 @@ const UptimeMonitors = () => {
 				<MonitorCountHeader
 					shouldRender={monitors?.length > 0 && !monitorsWithSummaryIsLoading}
 					monitorCount={monitorsSummary?.totalMonitors}
-					heading={"Uptime monitors"}
 				></MonitorCountHeader>
 				<Filter
 					selectedTypes={selectedTypes}

From 2292e8f6fc94129aba473ea5d70a7ffa738552ae Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 9 Apr 2025 18:57:32 +0000
Subject: [PATCH 21/34] Update material-ui monorepo to v6.4.11

---
 package-lock.json | 44 ++++++++++++++++++++++----------------------
 package.json      |  4 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7308359b1..47cc52407 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,9 +12,9 @@
 				"@emotion/styled": "^11.13.0",
 				"@fontsource/roboto": "^5.0.13",
 				"@hello-pangea/dnd": "^18.0.0",
-				"@mui/icons-material": "6.4.10",
+				"@mui/icons-material": "6.4.11",
 				"@mui/lab": "6.0.0-dev.240424162023-9968b4889d",
-				"@mui/material": "6.4.10",
+				"@mui/material": "6.4.11",
 				"@mui/x-charts": "^7.5.1",
 				"@mui/x-data-grid": "7.28.3",
 				"@mui/x-date-pickers": "7.28.3",
@@ -4129,9 +4129,9 @@
 			}
 		},
 		"node_modules/@mui/core-downloads-tracker": {
-			"version": "6.4.10",
-			"resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.4.10.tgz",
-			"integrity": "sha512-cblGjlM6+xsptwyaALw8RbRIUoqmKxOqLxlk2LkTDhxqUuql1YSOKKLH3w+Yd2QLz28b7MR65sx1OjsRZUfOSQ==",
+			"version": "6.4.11",
+			"resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.4.11.tgz",
+			"integrity": "sha512-CzAQs9CTzlwbsF9ZYB4o4lLwBv1/qNE264NjuYao+ctAXsmlPtYa8RtER4UsUXSMxNN9Qi+aQdYcKl2sUpnmAw==",
 			"license": "MIT",
 			"funding": {
 				"type": "opencollective",
@@ -4139,9 +4139,9 @@
 			}
 		},
 		"node_modules/@mui/icons-material": {
-			"version": "6.4.10",
-			"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.4.10.tgz",
-			"integrity": "sha512-c2KdFl4KZ0QYC+JSDTMCNjcuOL2rVSdIx/beo7FwJDh2e9XqC1MoLCjw6L1Jo40zbArkgJyg3oFORbXcRfgZOA==",
+			"version": "6.4.11",
+			"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.4.11.tgz",
+			"integrity": "sha512-+jjJGIrB1awNbMv4ZVPPdN/p7O1UKFZ+xqRvNIQ8B1KnlID5hPMPBLM6UUbRF4bu3UDCbu79rn9Nye5LGNzmeA==",
 			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.26.0"
@@ -4154,7 +4154,7 @@
 				"url": "https://opencollective.com/mui-org"
 			},
 			"peerDependencies": {
-				"@mui/material": "^6.4.10",
+				"@mui/material": "^6.4.11",
 				"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
 				"react": "^17.0.0 || ^18.0.0 || ^19.0.0"
 			},
@@ -4239,14 +4239,14 @@
 			}
 		},
 		"node_modules/@mui/material": {
-			"version": "6.4.10",
-			"resolved": "https://registry.npmjs.org/@mui/material/-/material-6.4.10.tgz",
-			"integrity": "sha512-L1B0+Vg9NFjo3NcfODH3bohl6fIkzjyDBHBHb3Al4QI7owaJrFm2sSDyfz++iatzICug6U6q5tHLQrCLO71xkg==",
+			"version": "6.4.11",
+			"resolved": "https://registry.npmjs.org/@mui/material/-/material-6.4.11.tgz",
+			"integrity": "sha512-k2D3FLJS+/qD0qnd6ZlAjGFvaaxe1Dl10NyvpeDzIebMuYdn8VqYe6XBgGueEAtnzSJM4V03VD9kb5Fi24dnTA==",
 			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.26.0",
-				"@mui/core-downloads-tracker": "^6.4.10",
-				"@mui/system": "^6.4.10",
+				"@mui/core-downloads-tracker": "^6.4.11",
+				"@mui/system": "^6.4.11",
 				"@mui/types": "~7.2.24",
 				"@mui/utils": "^6.4.9",
 				"@popperjs/core": "^2.11.8",
@@ -4267,7 +4267,7 @@
 			"peerDependencies": {
 				"@emotion/react": "^11.5.0",
 				"@emotion/styled": "^11.3.0",
-				"@mui/material-pigment-css": "^6.4.10",
+				"@mui/material-pigment-css": "^6.4.11",
 				"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
 				"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
 				"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -4321,9 +4321,9 @@
 			}
 		},
 		"node_modules/@mui/styled-engine": {
-			"version": "6.4.9",
-			"resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.4.9.tgz",
-			"integrity": "sha512-qZRWO0cT407NI4ZRjZcH+1SOu8f3JzLHqdMlg52GyEufM9pkSZFnf7xjpwnlvkixcGjco6wLlMD0VB43KRcBuA==",
+			"version": "6.4.11",
+			"resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.4.11.tgz",
+			"integrity": "sha512-74AUmlHXaGNbyUqdK/+NwDJOZqgRQw6BcNvhoWYLq3LGbLTkE+khaJ7soz6cIabE4CPYqO2/QAIU1Z/HEjjpcw==",
 			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.26.0",
@@ -4355,14 +4355,14 @@
 			}
 		},
 		"node_modules/@mui/system": {
-			"version": "6.4.10",
-			"resolved": "https://registry.npmjs.org/@mui/system/-/system-6.4.10.tgz",
-			"integrity": "sha512-RyBGQwP3tgo4JEibK+RwVu1a6nQ6y8urMCNsb2aiN/nvTxxumq6P26aoG4GTUf8L4O1sthC4lMXlP4r8ixDkMg==",
+			"version": "6.4.11",
+			"resolved": "https://registry.npmjs.org/@mui/system/-/system-6.4.11.tgz",
+			"integrity": "sha512-gibtsrZEwnDaT5+I/KloOj/yHluX5G8heknuxBpQOdEQ3Gc0avjSImn5hSeKp8D4thiwZiApuggIjZw1dQguUA==",
 			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.26.0",
 				"@mui/private-theming": "^6.4.9",
-				"@mui/styled-engine": "^6.4.9",
+				"@mui/styled-engine": "^6.4.11",
 				"@mui/types": "~7.2.24",
 				"@mui/utils": "^6.4.9",
 				"clsx": "^2.1.1",
diff --git a/package.json b/package.json
index 0771b8fa1..b1452d1d5 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,9 @@
 		"@mui/x-charts": "^7.5.1",
 		"@mui/x-data-grid": "7.28.3",
 		"@mui/x-date-pickers": "7.28.3",
-		"@mui/icons-material": "6.4.10",
+		"@mui/icons-material": "6.4.11",
 		"@mui/lab": "6.0.0-dev.240424162023-9968b4889d",
-		"@mui/material": "6.4.10",
+		"@mui/material": "6.4.11",
 		"@reduxjs/toolkit": "2.6.1",
 		"@solana/wallet-adapter-base": "0.9.24",
 		"@solana/wallet-adapter-material-ui": "0.16.35",

From 951605cb6307aec3673e574137108effe535cb0b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 10 Apr 2025 11:27:12 +0000
Subject: [PATCH 22/34] Update dependency vite to v5.4.18

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7308359b1..ca2b803c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19212,9 +19212,9 @@
 			}
 		},
 		"node_modules/vite": {
-			"version": "5.4.17",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.17.tgz",
-			"integrity": "sha512-5+VqZryDj4wgCs55o9Lp+p8GE78TLVg0lasCH5xFZ4jacZjtqZa6JUw9/p0WeAojaOfncSM6v77InkFPGnvPvg==",
+			"version": "5.4.18",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.18.tgz",
+			"integrity": "sha512-1oDcnEp3lVyHCuQ2YFelM4Alm2o91xNoMncRm1U7S+JdYfYOvbiGZ3/CxGttrOu2M/KcGz7cRC2DoNUA6urmMA==",
 			"license": "MIT",
 			"dependencies": {
 				"esbuild": "^0.21.3",

From 238cb07322ef102e1c3c2478a23dd70923c28d69 Mon Sep 17 00:00:00 2001
From: Owaiseimdad <owaiseimdad@gmail.com>
Date: Thu, 10 Apr 2025 21:54:29 +0530
Subject: [PATCH 23/34] FIX in the charts background color to main instead of a
 low contrast.

---
 src/Components/Charts/ChartBox/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Charts/ChartBox/index.jsx b/src/Components/Charts/ChartBox/index.jsx
index f9f35f4b2..4b72fe16a 100644
--- a/src/Components/Charts/ChartBox/index.jsx
+++ b/src/Components/Charts/ChartBox/index.jsx
@@ -25,7 +25,7 @@ const ChartBox = ({
 			flex={1}
 			direction="row"
 			sx={{
-				backgroundColor: theme.palette.tertiary.main,
+				backgroundColor: theme.palette.primary.main,
 
 				border: 1,
 				borderStyle: "solid",

From 6b5a531559c7877f56fcdbc160a40f484e637359 Mon Sep 17 00:00:00 2001
From: Owaiseimdad <owaiseimdad@gmail.com>
Date: Thu, 10 Apr 2025 22:33:15 +0530
Subject: [PATCH 24/34] Fix for memory title in infra.

---
 .../Infrastructure/Monitors/Components/MonitorsTable/index.jsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx b/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
index 450aee424..817e414b6 100644
--- a/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
+++ b/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
@@ -68,7 +68,7 @@ const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete
 			),
 		},
 		{ id: "cpu", content: t("cpu"), render: (row) => <CustomGauge progress={row.cpu} /> },
-		{ id: "mem", content: t("mem"), render: (row) => <CustomGauge progress={row.mem} /> },
+		{ id: "memory", content: t("memory"), render: (row) => <CustomGauge progress={row.mem} /> },
 		{ id: "disk", content: t("disk"), render: (row) => <CustomGauge progress={row.disk} /> },
 		{
 			id: "actions",

From 6421080a95a0911f89c7d18d76b5a54569680cea Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Thu, 10 Apr 2025 14:48:10 -0400
Subject: [PATCH 25/34] create new Tablistwrapper component

---
 src/Components/Tab/index.jsx | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/Components/Tab/index.jsx

diff --git a/src/Components/Tab/index.jsx b/src/Components/Tab/index.jsx
new file mode 100644
index 000000000..40f075a5b
--- /dev/null
+++ b/src/Components/Tab/index.jsx
@@ -0,0 +1,28 @@
+import { Box, useTheme } from "@mui/material";
+import { TabList } from "@mui/lab";
+import PropTypes from "prop-types";
+
+const TabListWrapper = ({ value, onChange, children, ...props }) => {
+	const theme = useTheme();
+
+	return (
+		<Box
+			sx={{
+				borderBottom: `1px solid ${theme.palette.primary.lowContrast}`,
+				"& .MuiTabs-root": { height: "fit-content", minHeight: "0" },
+			}}
+		>
+			<TabList value={value} onChange={onChange} {...props}>
+				{children}
+			</TabList>
+		</Box>
+	);
+};
+
+TabListWrapper.propTypes = {
+	value: PropTypes.string,
+	onChange: PropTypes.func,
+	children: PropTypes.node,
+};
+
+export default TabListWrapper;

From d8678bb772d3e0b907da39465f5de1eca056aa3f Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Thu, 10 Apr 2025 14:50:06 -0400
Subject: [PATCH 26/34] update accounts page to use new Tab component

---
 src/Pages/Account/index.jsx | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/Pages/Account/index.jsx b/src/Pages/Account/index.jsx
index 48b0984f5..429b8dd4d 100644
--- a/src/Pages/Account/index.jsx
+++ b/src/Pages/Account/index.jsx
@@ -3,6 +3,7 @@ import PropTypes from "prop-types";
 import { useNavigate } from "react-router";
 import { useSelector } from "react-redux";
 import { Box, Tab, useTheme } from "@mui/material";
+import TabListWrapper from "../../Components/Tab";
 import TabContext from "@mui/lab/TabContext";
 import TabList from "@mui/lab/TabList";
 import ProfilePanel from "../../Components/TabPanels/Account/ProfilePanel";
@@ -59,29 +60,18 @@ const Account = ({ open = "profile" }) => {
 			py={theme.spacing(12)}
 		>
 			<TabContext value={tab}>
-				<Box
-					sx={{
-						borderBottom: 1,
-						borderColor: theme.palette.primary.lowContrast,
-						"& .MuiTabs-root": { height: "fit-content", minHeight: "0" },
-					}}
-				>
-					<TabList
-						onChange={handleTabChange}
-						aria-label="account tabs"
-					>
-						{tabList.map((label, index) => (
-							<Tab
-								label={label}
-								key={index}
-								value={label.toLowerCase()}
-								onKeyDown={handleKeyDown}
-								onFocus={() => handleFocus(label.toLowerCase())}
-								tabIndex={index}
-							/>
-						))}
-					</TabList>
-				</Box>
+				<TabListWrapper value={tab} onChange={handleTabChange} aria-label="account tabs">
+					{tabList.map((label, index) => (
+						<Tab
+							label={label}
+							key={index}
+							value={label.toLowerCase()}
+							onKeyDown={handleKeyDown}
+							onFocus={() => handleFocus(label.toLowerCase())}
+							tabIndex={index}
+						/>
+					))}
+				</TabListWrapper>
 				<ProfilePanel />
 				{user.role.includes("superadmin") && <PasswordPanel />}
 				{!hideTeams && <TeamPanel />}

From d93c9c3bc9a8f4648441ff6b1af072230d6adf82 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Thu, 10 Apr 2025 14:52:04 -0400
Subject: [PATCH 27/34] update status create page to use Tab component

---
 .../Create/Components/Tabs/index.jsx          | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/Pages/StatusPage/Create/Components/Tabs/index.jsx b/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
index da2da9acf..5ad27622d 100644
--- a/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
+++ b/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
@@ -1,11 +1,13 @@
 // Components
 import { TabContext, TabList } from "@mui/lab";
 import { Box, Tab, useTheme } from "@mui/material";
+import TabListWrapper from "../../../../../Components/Tab";
 import Settings from "./Settings";
 import Content from "./Content";
 
 // Utils
 import PropTypes from "prop-types";
+import TabListWrapper from "../../../../../Components/Tab";
 
 const Tabs = ({
 	isCreate,
@@ -26,28 +28,20 @@ const Tabs = ({
 	const theme = useTheme();
 	return (
 		<TabContext value={TAB_LIST[tab]}>
-			<Box
-				sx={{
-					borderBottom: `1px solid ${theme.palette.primary.lowContrast}`,
-					"& .MuiTabs-root": { height: "fit-content", minHeight: "0" },
+			<TabListWrapper
+				onChange={(_, selected) => {
+					setTab(TAB_LIST.indexOf(selected));
 				}}
+				aria-label="status page tabs"
 			>
-				<TabList
-					onChange={(_, tab) => {
-						setTab(TAB_LIST.indexOf(tab));
-					}}
-				>
-					{TAB_LIST.map((tab, idx) => {
-						return (
-							<Tab
-								key={tab}
-								label={TAB_LIST[idx]}
-								value={TAB_LIST[idx]}
-							/>
-						);
-					})}
-				</TabList>
-			</Box>
+				{TAB_LIST.map((tabLabel, idx) => (
+					<Tab
+						key={tabLabel}
+						label={tabLabel}
+						value={tabLabel}
+					/>
+				))}
+			</TabListWrapper>
 			{tab === 0 ? (
 				<Settings
 					tabValue={TAB_LIST[0]}

From c3f24a1693be76fd89c69bb5080a35155b2096fe Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Thu, 10 Apr 2025 15:25:47 -0400
Subject: [PATCH 28/34] fix tab component import

---
 src/Pages/StatusPage/Create/Components/Tabs/index.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Pages/StatusPage/Create/Components/Tabs/index.jsx b/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
index 5ad27622d..32305f1af 100644
--- a/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
+++ b/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
@@ -1,7 +1,6 @@
 // Components
 import { TabContext, TabList } from "@mui/lab";
 import { Box, Tab, useTheme } from "@mui/material";
-import TabListWrapper from "../../../../../Components/Tab";
 import Settings from "./Settings";
 import Content from "./Content";
 

From 8af4fd8e3ea47284c8ad6e93648edf01d527ec3d Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Thu, 10 Apr 2025 17:41:54 -0400
Subject: [PATCH 29/34] change component name for clarity

---
 src/Components/Tab/index.jsx                          | 6 +++---
 src/Pages/Account/index.jsx                           | 6 +++---
 src/Pages/StatusPage/Create/Components/Tabs/index.jsx | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Components/Tab/index.jsx b/src/Components/Tab/index.jsx
index 40f075a5b..c2267de3d 100644
--- a/src/Components/Tab/index.jsx
+++ b/src/Components/Tab/index.jsx
@@ -2,7 +2,7 @@ import { Box, useTheme } from "@mui/material";
 import { TabList } from "@mui/lab";
 import PropTypes from "prop-types";
 
-const TabListWrapper = ({ value, onChange, children, ...props }) => {
+const CustomTabList = ({ value, onChange, children, ...props }) => {
 	const theme = useTheme();
 
 	return (
@@ -19,10 +19,10 @@ const TabListWrapper = ({ value, onChange, children, ...props }) => {
 	);
 };
 
-TabListWrapper.propTypes = {
+CustomTabList.propTypes = {
 	value: PropTypes.string,
 	onChange: PropTypes.func,
 	children: PropTypes.node,
 };
 
-export default TabListWrapper;
+export default CustomTabList;
diff --git a/src/Pages/Account/index.jsx b/src/Pages/Account/index.jsx
index 429b8dd4d..d39d8c4cb 100644
--- a/src/Pages/Account/index.jsx
+++ b/src/Pages/Account/index.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import { useNavigate } from "react-router";
 import { useSelector } from "react-redux";
 import { Box, Tab, useTheme } from "@mui/material";
-import TabListWrapper from "../../Components/Tab";
+import CustomTabList from "../../Components/Tab";
 import TabContext from "@mui/lab/TabContext";
 import TabList from "@mui/lab/TabList";
 import ProfilePanel from "../../Components/TabPanels/Account/ProfilePanel";
@@ -60,7 +60,7 @@ const Account = ({ open = "profile" }) => {
 			py={theme.spacing(12)}
 		>
 			<TabContext value={tab}>
-				<TabListWrapper value={tab} onChange={handleTabChange} aria-label="account tabs">
+				<CustomTabList value={tab} onChange={handleTabChange} aria-label="account tabs">
 					{tabList.map((label, index) => (
 						<Tab
 							label={label}
@@ -71,7 +71,7 @@ const Account = ({ open = "profile" }) => {
 							tabIndex={index}
 						/>
 					))}
-				</TabListWrapper>
+				</CustomTabList>
 				<ProfilePanel />
 				{user.role.includes("superadmin") && <PasswordPanel />}
 				{!hideTeams && <TeamPanel />}
diff --git a/src/Pages/StatusPage/Create/Components/Tabs/index.jsx b/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
index 32305f1af..7e54850eb 100644
--- a/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
+++ b/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
@@ -6,7 +6,7 @@ import Content from "./Content";
 
 // Utils
 import PropTypes from "prop-types";
-import TabListWrapper from "../../../../../Components/Tab";
+import CustomTabList from "../../../../../Components/Tab";
 
 const Tabs = ({
 	isCreate,
@@ -27,7 +27,7 @@ const Tabs = ({
 	const theme = useTheme();
 	return (
 		<TabContext value={TAB_LIST[tab]}>
-			<TabListWrapper
+			<CustomTabList
 				onChange={(_, selected) => {
 					setTab(TAB_LIST.indexOf(selected));
 				}}
@@ -40,7 +40,7 @@ const Tabs = ({
 						value={tabLabel}
 					/>
 				))}
-			</TabListWrapper>
+			</CustomTabList>
 			{tab === 0 ? (
 				<Settings
 					tabValue={TAB_LIST[0]}

From 6e115052c62940ac2363c2f648699ee49747d572 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Thu, 10 Apr 2025 17:46:37 -0400
Subject: [PATCH 30/34] remove ununsed imports

---
 src/Pages/Account/index.jsx                           | 1 -
 src/Pages/StatusPage/Create/Components/Tabs/index.jsx | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Pages/Account/index.jsx b/src/Pages/Account/index.jsx
index d39d8c4cb..c3e2be2f1 100644
--- a/src/Pages/Account/index.jsx
+++ b/src/Pages/Account/index.jsx
@@ -5,7 +5,6 @@ import { useSelector } from "react-redux";
 import { Box, Tab, useTheme } from "@mui/material";
 import CustomTabList from "../../Components/Tab";
 import TabContext from "@mui/lab/TabContext";
-import TabList from "@mui/lab/TabList";
 import ProfilePanel from "../../Components/TabPanels/Account/ProfilePanel";
 import PasswordPanel from "../../Components/TabPanels/Account/PasswordPanel";
 import TeamPanel from "../../Components/TabPanels/Account/TeamPanel";
diff --git a/src/Pages/StatusPage/Create/Components/Tabs/index.jsx b/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
index 7e54850eb..5f5433bb6 100644
--- a/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
+++ b/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
@@ -1,6 +1,6 @@
 // Components
-import { TabContext, TabList } from "@mui/lab";
-import { Box, Tab, useTheme } from "@mui/material";
+import { TabContext } from "@mui/lab";
+import { Tab, useTheme } from "@mui/material";
 import Settings from "./Settings";
 import Content from "./Content";
 

From b300c1b8300bba1cf023f0e1d510b39bc6ee30f0 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Thu, 10 Apr 2025 17:51:14 -0400
Subject: [PATCH 31/34] add json doc for customtablist component

---
 src/Components/Tab/index.jsx | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/Components/Tab/index.jsx b/src/Components/Tab/index.jsx
index c2267de3d..6edfc8340 100644
--- a/src/Components/Tab/index.jsx
+++ b/src/Components/Tab/index.jsx
@@ -2,6 +2,26 @@ import { Box, useTheme } from "@mui/material";
 import { TabList } from "@mui/lab";
 import PropTypes from "prop-types";
 
+/**
+ * CustomTabList component
+ *
+ * Wraps MUI's TabList inside a Box to apply consistent styling, specifically a bottom border,
+ * while avoiding the default top, left, and right borders applied through global MuiTabs overrides.
+ * This is used to match our tab layout across pages like Account and StatusPage.
+ *
+ * @component
+ * @example
+ * <CustomTabList value={value} onChange={handleChange}>
+ *   <Tab label="General" value="general" />
+ *   <Tab label="Settings" value="settings" />
+ * </CustomTabList>
+ *
+ * @param {string} value - The currently selected tab's value.
+ * @param {function} onChange - Callback when a different tab is selected.
+ * @param {React.ReactNode} children - Tab components to render inside the TabList.
+ * @param {object} props - Additional props passed to the TabList component.
+ */
+
 const CustomTabList = ({ value, onChange, children, ...props }) => {
 	const theme = useTheme();
 

From 71b71b4ee90c28ce8a39a26f62dc577954798696 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Thu, 10 Apr 2025 18:29:04 -0400
Subject: [PATCH 32/34] remove borders and bg colors from tab

---
 src/Utils/Theme/globalTheme.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Utils/Theme/globalTheme.js b/src/Utils/Theme/globalTheme.js
index 306ed3466..adf2a35f5 100644
--- a/src/Utils/Theme/globalTheme.js
+++ b/src/Utils/Theme/globalTheme.js
@@ -386,7 +386,6 @@ const baseTheme = (palette) => ({
 				  borderRightColor: theme.palette.primary.lowContrast,
 				},
 				"&.Mui-selected": {
-				  backgroundColor: theme.palette.secondary.main,
 				  color: theme.palette.secondary.contrastText,
 				  borderColor: theme.palette.secondary.contrastText,
 				  borderRightColor: theme.palette.primary.lowContrast,

From 6b5460c75cca1d56f38fabf31f9476848d194942 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Thu, 10 Apr 2025 18:29:31 -0400
Subject: [PATCH 33/34] update global theme

---
 src/Utils/Theme/globalTheme.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Utils/Theme/globalTheme.js b/src/Utils/Theme/globalTheme.js
index adf2a35f5..5e3030d6c 100644
--- a/src/Utils/Theme/globalTheme.js
+++ b/src/Utils/Theme/globalTheme.js
@@ -368,7 +368,6 @@ const baseTheme = (palette) => ({
 			  root: ({ theme }) => ({
 				fontSize: theme.typography.fontSize - 1,
 				color: theme.palette.tertiary.contrastText,
-				backgroundColor: theme.palette.primary.main,
 				height: '34px',
 				minHeight: '34px',
 				borderRadius: 0,
@@ -376,10 +375,6 @@ const baseTheme = (palette) => ({
 				minWidth: "fit-content",
 				padding: `${theme.spacing(6)}px ${theme.spacing(4)}px`,
 				fontWeight: 400,
-				borderBottom: `${theme.shape.borderThick}px solid transparent`, 
-				borderRight: `${theme.shape.borderRadius / 2}px solid ${theme.palette.primary.lowContrast}`, 
-				"&:first-of-type": { borderTopLeftRadius: theme.shape.borderRadius * 4 },
-				"&:last-child": { borderTopRightRadius: theme.shape.borderRadius * 4, borderRight: 0 }, 
 				"&:focus-visible": {
 				  color: theme.palette.primary.contrastText,
 				  borderColor: theme.palette.tertiary.contrastText,
@@ -387,9 +382,6 @@ const baseTheme = (palette) => ({
 				},
 				"&.Mui-selected": {
 				  color: theme.palette.secondary.contrastText,
-				  borderColor: theme.palette.secondary.contrastText,
-				  borderRightColor: theme.palette.primary.lowContrast,
-				  borderRadius: 0,
 				},
 				"&:hover": {
 				  borderColor: theme.palette.primary.lowContrast,
@@ -441,11 +433,7 @@ const baseTheme = (palette) => ({
 			styleOverrides: {
 			  root: ({ theme }) => ({
 				display: 'inline-flex',
-				borderTop: '1px solid',
-				borderLeft: '1px solid',
-				borderRight: '1px solid',
-				borderColor: theme.palette.primary.lowContrast,
-				borderRadius: `${theme.shape.borderRadius}px ${theme.shape.borderRadius}px 0 0`,
+				borderRadius: 0,
 				"& .MuiTabs-indicator": {
 				  backgroundColor: theme.palette.tertiary.contrastText,
 				},

From 5c160f184450b812c16d37d755ee4c282cc8de0d Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Thu, 10 Apr 2025 18:32:41 -0400
Subject: [PATCH 34/34] update json doc for customtablist

---
 src/Components/Tab/index.jsx | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/Components/Tab/index.jsx b/src/Components/Tab/index.jsx
index 6edfc8340..97bb25c7f 100644
--- a/src/Components/Tab/index.jsx
+++ b/src/Components/Tab/index.jsx
@@ -4,18 +4,6 @@ import PropTypes from "prop-types";
 
 /**
  * CustomTabList component
- *
- * Wraps MUI's TabList inside a Box to apply consistent styling, specifically a bottom border,
- * while avoiding the default top, left, and right borders applied through global MuiTabs overrides.
- * This is used to match our tab layout across pages like Account and StatusPage.
- *
- * @component
- * @example
- * <CustomTabList value={value} onChange={handleChange}>
- *   <Tab label="General" value="general" />
- *   <Tab label="Settings" value="settings" />
- * </CustomTabList>
- *
  * @param {string} value - The currently selected tab's value.
  * @param {function} onChange - Callback when a different tab is selected.
  * @param {React.ReactNode} children - Tab components to render inside the TabList.