diff --git a/src/actions/userManagement.js b/src/actions/userManagement.js
index 86d59e420c..31b21892bc 100644
--- a/src/actions/userManagement.js
+++ b/src/actions/userManagement.js
@@ -19,6 +19,9 @@ import { ENDPOINTS } from '~/utils/URL';
 import { UserStatus, UserStatusOperations, InactiveReason } from '~/utils/enums';
 import { COMPANY_TZ } from '~/utils/formatDate';
 
+/** Used when callers request all basic profiles without a named source (e.g. LB/BM dashboards). */
+const DEFAULT_USER_PROFILE_BASIC_INFO_SOURCE = 'UserManagement';
+
 /**
  * Set a flag that fetching user profiles
  */
@@ -368,12 +371,17 @@ export const updateUserFinalDayStatusIsSet = (user, status, finalDayDate, isSet)
 export const getUserProfileBasicInfo = ({ userId, source } = {}) => {
   // API request to fetch basic user profile information
   let userProfileBasicInfoPromise;
-  if (userId)
-    userProfileBasicInfoPromise = axios.get(`${ENDPOINTS.USER_PROFILE_BASIC_INFO}?userId=${userId}`);
-  else if (source)
+  if (userId) {
+    userProfileBasicInfoPromise = axios.get(
+      `${ENDPOINTS.APIEndpoint()}/userProfile/basicInfo?userId=${userId}`,
+    );
+  } else if (source) {
     userProfileBasicInfoPromise = axios.get(ENDPOINTS.USER_PROFILE_BASIC_INFO(source));
-  else
-    userProfileBasicInfoPromise = axios.get(ENDPOINTS.USER_PROFILE_BASIC_INFO);
+  } else {
+    userProfileBasicInfoPromise = axios.get(
+      ENDPOINTS.USER_PROFILE_BASIC_INFO(DEFAULT_USER_PROFILE_BASIC_INFO_SOURCE),
+    );
+  }
 
   return async dispatch => {
     // Dispatch action indicating the start of the fetch process
diff --git a/src/components/BMDashboard/ItemList/ItemListView.module.css b/src/components/BMDashboard/ItemList/ItemListView.module.css
index da43cce100..f6c50e2894 100644
--- a/src/components/BMDashboard/ItemList/ItemListView.module.css
+++ b/src/components/BMDashboard/ItemList/ItemListView.module.css
@@ -49,7 +49,7 @@
 
 :global(.dark-mode) .items_list_container {
   background-color: #0d1117 !important;
-  color: #ffffff !important;
+  color: #fff !important;
   min-height: 100vh;
   padding-bottom: 2rem;
 }
@@ -60,19 +60,19 @@
 
 :global(.dark-mode) .items_list_container table {
   background-color: #161b22;
-  color: #ffffff;
+  color: #fff;
   border: 1px solid #30363d;
 }
 
 :global(.dark-mode) .items_list_container th {
   background-color: #1f2937;
-  color: #ffffff;
+  color: #fff;
   border-bottom: 1px solid #30363d;
 }
 
 :global(.dark-mode) .items_list_container td {
   border-bottom: 1px solid #30363d;
-  color: #ffffff;
+  color: #fff;
 }
 
 :global(.dark-mode) .items_list_container tr:hover {
@@ -80,29 +80,29 @@
 }
 
 :global(.dark-mode) .items_cell svg {
-  color: #ffffff;
+  color: #fff;
 }
 
 :global(.dark-mode) .items_cell svg:hover {
-  color: #ffffff;
+  color: #fff;
 }
 
 :global(.dark-mode) .select_input {
   background-color: #1e2632;
-  color: #ffffff;
+  color: #fff;
   border: 1px solid #30363d;
 }
 
 :global(.dark-mode) select,
 :global(.dark-mode) input {
   background-color: #1e2632;
-  color: #ffffff;
+  color: #fff;
   border: 1px solid #30363d;
 }
 
 :global(.dark-mode) option {
   background-color: #111827;
-  color: #ffffff;
+  color: #fff;
 }
 
 :global(.dark-mode) body,
@@ -113,13 +113,13 @@
 
 .items_list_container.dark_mode {
   background-color: #1b1f27 !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border-color: #2a2f3a !important;
 }
 
 .dark-mode .items_table_container .table thead th {
   background-color: #1c2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border-color: #555 !important;
 }
 
diff --git a/src/components/BMDashboard/ItemList/RecordsModal.module.css b/src/components/BMDashboard/ItemList/RecordsModal.module.css
index c4bc05a405..afafaf2670 100644
--- a/src/components/BMDashboard/ItemList/RecordsModal.module.css
+++ b/src/components/BMDashboard/ItemList/RecordsModal.module.css
@@ -10,7 +10,7 @@
 :global(.dark-mode) .records_modal_table_container,
 :global(.dark-mode) .recordsModalTableContainer {
   background-color: #3a506b;
-  color: #ffffff;
+  color: #fff;
 }
 
 :global(.dark-mode) .records_modal_table_container a,
@@ -27,24 +27,24 @@
 :global(.dark-mode) .records_modal_table_container thead tr th,
 :global(.dark-mode) .recordsModalTableContainer thead tr th {
   background-color: #1c2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border-color: #3a506b !important;
 }
 
 :global(.dark-mode) .records_modal_table_container tbody tr td,
 :global(.dark-mode) .recordsModalTableContainer tbody tr td {
   background-color: #3a506b !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border-color: #1c2541 !important;
 }
 
 :global(.dark-mode) .records_modal_table_container tbody tr:hover td,
 :global(.dark-mode) .recordsModalTableContainer tbody tr:hover td {
   background-color: #1c2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
 }
 
-@media (min-width: 1200px) {
+@media (width >= 1200px) {
   .records_modal_table_container,
   .recordsModalTableContainer {
     font-size: medium;
@@ -88,7 +88,7 @@
 :global(.dark-mode) .reject_button,
 :global(.dark-mode) .rejectButton {
   background-color: #1c2541;
-  color: #ffffff;
+  color: #fff;
   border: 1px solid #3a506b;
 }
 
diff --git a/src/components/BMDashboard/Lesson/LessonForm.module.css b/src/components/BMDashboard/Lesson/LessonForm.module.css
index cbe454527b..2d38700aa2 100644
--- a/src/components/BMDashboard/Lesson/LessonForm.module.css
+++ b/src/components/BMDashboard/Lesson/LessonForm.module.css
@@ -3,11 +3,12 @@
     color: #e9ecef !important;
   }
 }
+
 .masterContainer {
   display: flex;
   flex-direction: column;
   height: 100%;
-  padding: 5% 10% 10% 10%;
+  padding: 5% 10% 10%;
   background-color: #E8F4F9;
 }
 
@@ -22,17 +23,18 @@
 
 .darkModeForm {
   background-color: #1C2541 !important; /* Space Cadet */
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.5);
+  box-shadow: 0 4px 8px rgb(0 0 0 / 50%);
 }
 
 .formControl {
   width: 25%;
   flex: 0 0 25%;
+  max-width: unset !important;
   padding: 0.375rem 0.75rem;
   font-size: 1rem;
   line-height: 1.5;
   color: #212529;
-  background-color: #ffffff;
+  background-color: #fff;
   border: 1px solid #ced4da;
   border-radius: 0.375rem;
   outline: none;
@@ -47,17 +49,6 @@
   box-shadow: none;
 }
 
-.masterContainer{
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  padding-left: 10%;
-  padding-right: 10%;
-  padding-top: 5%;
-  padding-bottom: 10%;
-  background-color: #E8F4F9;
-}
-
 /* Dark Mode Input Fields (Yinmn Blue) */
 .darkModeInput {
   background-color: #3A506B !important; /* Yinmn Blue */
@@ -69,10 +60,6 @@
   color: #ADB5BD !important;
 }
 
-.formControl {
-  max-width: unset !important;
-}
-
 .lessonLabel {
   font-size: larger;
   font-weight: bold;
@@ -99,7 +86,7 @@
 }
 
 .dragAndDropStyle {
-  border: 2px dashed #cccccc;
+  border: 2px dashed #ccc;
   padding: 0.5%;
   text-align: center;
   cursor: pointer;
@@ -137,7 +124,7 @@
 .lessonFormButtonCancel {
   width: 25%;
   height: 50px;
-  background-color: #FFFFFF !important;
+  background-color: #FFF !important;
   color: #2E5061 !important;
   border-color: #2E5061 !important;
 }
@@ -152,7 +139,7 @@
   width: 25%;
   height: 50px;
   background-color: #2E5061 !important;
-  color: #FFFFFF !important;
+  color: #FFF !important;
   border-color: #2E5061 !important;
 }
 
@@ -241,18 +228,21 @@
   width: 100%;
 }
 
-@media (max-width: 570px) {
+@media (width <= 570px) {
   .formSelectContainer {
     align-items: center;
     flex-direction: column;
   }
+
   .singleFormSelect {
     width: 90%;
   }
+
   .lessonFormButtonSubmit,
   .lessonFormButtonCancel {
     width: 45%;
   }
+
   .masterContainer {
     padding-bottom: 20%;
 
@@ -272,23 +262,24 @@
   color: black;
 }
 
-.darkFormContainer{
-  background-color: '#1e2433';
-  /* color: '#f5f7fa' */
+.darkFormContainer {
+  background-color: #1e2433;
 }
 
 /* ===================== */
+
 /* Dark Mode Styles */
+
 /* ===================== */
 
 .masterContainerDark {
   background-color: #1B2A41;
-  color: #ffffff;
+  color: #fff;
 }
 
 .formContainerDark {
   background-color: #1C2541;
-  color: #ffffff;
+  color: #fff;
 }
 
 .suppressInitialFocus :global(:focus) {
@@ -311,20 +302,22 @@
 .noFocusShadow :global(input[type='text']),
 .noFocusShadow :global(textarea) {
   box-shadow: none !important;
-  -webkit-box-shadow: none !important;
 }
 
 .noFocusShadow :global(input.form-control:focus),
 .noFocusShadow :global(textarea.form-control:focus),
 .noFocusShadow :global(input[type='text']:focus),
 .noFocusShadow :global(textarea:focus) {
-  -webkit-box-shadow: 0 0 0 1000px #1C2541 inset !important;
   box-shadow: 0 0 0 1000px #1C2541 inset !important;
 }
 
+/* Dark-mode input cascade: specificity order is intentional for Bootstrap overrides */
+
+/* stylelint-disable no-descending-specificity */
+
 /* Force no shadow unless focused */
-.formContainerDark .lessonTitleInputDark:not(:focus):not(:active):not(:focus-visible),
-.formContainerDark .lessonPlaceholderTextDark:not(:focus):not(:active):not(:focus-visible),
+.formContainerDark .lessonTitleInputDark:not(:focus, :active, :focus-visible),
+.formContainerDark .lessonPlaceholderTextDark:not(:focus, :active, :focus-visible),
 :global(body.dark-mode) .formContainerDark :global(input.form-control:not(:focus)),
 :global(body.bm-dashboard-dark) .formContainerDark :global(input.form-control:not(:focus)),
 :global(body.dark-mode) .formContainerDark :global(textarea.form-control:not(:focus)),
@@ -334,19 +327,18 @@
 :global(body.dark-mode) .formContainerDark :global(textarea:not(:focus)),
 :global(body.bm-dashboard-dark) .formContainerDark :global(textarea:not(:focus)) {
   box-shadow: none !important;
-  -webkit-box-shadow: none !important;
 }
 
 .lessonLabelDark {
-  color: #ffffff;
+  color: #fff;
 }
 
 .lessonPlaceholderTextDark {
   background-color: #1C2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border: 1px solid #404040 !important;
   color-scheme: dark;
-  -webkit-text-fill-color: #ffffff;
+  -webkit-text-fill-color: #fff;
   box-shadow: none !important;
 }
 
@@ -356,10 +348,9 @@
 
 .lessonTitleInputDark {
   color-scheme: dark;
-  caret-color: #ffffff;
+  caret-color: #fff;
   appearance: none;
-  -webkit-appearance: none;
-  -webkit-text-fill-color: #ffffff;
+  -webkit-text-fill-color: #fff;
   box-shadow: none !important;
 }
 
@@ -368,7 +359,6 @@
 .lessonTitleInputDark:focus-visible {
   background-color: #1C2541 !important;
   border-color: #2563eb !important;
-  -webkit-box-shadow: 0 0 0 1000px #1C2541 inset !important;
   background-clip: padding-box !important;
   box-shadow: 0 0 0 1000px #1C2541 inset !important;
   outline: none !important;
@@ -377,9 +367,8 @@
 .formContainerDark .lessonTitleInputDark,
 .formContainerDark .lessonPlaceholderTextDark {
   background-color: #1C2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border-color: #404040 !important;
-  -webkit-box-shadow: none !important;
   background-clip: padding-box !important;
   box-shadow: none !important;
   outline: none !important;
@@ -393,9 +382,8 @@
 .lessonPlaceholderTextDark:global(.form-control):active,
 .lessonPlaceholderTextDark:global(.form-control):focus-visible {
   background-color: #1C2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border-color: #2563eb !important;
-  -webkit-box-shadow: 0 0 0 1000px #1C2541 inset !important;
   background-clip: padding-box !important;
   box-shadow: 0 0 0 1000px #1C2541 inset !important;
   outline: none !important;
@@ -405,7 +393,6 @@
 .lessonPlaceholderTextDark:active {
   border-color: #2563eb !important;
   background-color: #1C2541 !important;
-  -webkit-box-shadow: 0 0 0 1000px #1C2541 inset !important;
   background-clip: padding-box !important;
   box-shadow: 0 0 0 1000px #1C2541 inset !important;
   outline: none !important;
@@ -417,26 +404,25 @@
 :global(body.dark-mode) .formContainerDark .lessonPlaceholderTextDark,
 :global(body.bm-dashboard-dark) .formContainerDark .lessonPlaceholderTextDark {
   background-color: #1C2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border-color: #404040 !important;
-  -webkit-box-shadow: none !important;
   box-shadow: none !important;
 }
 
 .formSelectContainerDark {
-  color: #ffffff;
+  color: #fff;
 }
 
  .singleFormSelectDark {
    background-color: #1C2541 !important;
-   color: #ffffff !important;
+   color: #fff !important;
    border: 1px solid #444;
  }
 
  .singleFormSelectDark:focus,
  .singleFormSelectDark:active {
    background-color: #1C2541 !important;
-   color: #ffffff !important;
+   color: #fff !important;
    border-color: #2563eb !important;
    box-shadow: none !important;
    outline: none !important;
@@ -445,7 +431,7 @@
 .dragAndDropStyleDark {
   border: 2px dashed #555;
   background-color: #1f1f1f;
-  color: #ffffff;
+  color: #fff;
 }
 
 .dragandDropTextDark {
@@ -453,49 +439,49 @@
 }
 
 .fileSelectedDark {
-  border-color: #ffffff;
+  border-color: #fff;
 }
 
 .lessonFormButtonCancelDark {
   background-color: #2a2a2a !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border-color: #666 !important;
 }
 
 .lessonFormButtonSubmitDark {
   background-color: #2563eb !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border-color: #2563eb !important;
 }
 
 /* Tags - Dark Mode */
 
 .tagsDivDark {
-  color: #ffffff;
+  color: #fff;
 }
 
 .tagDark {
   background-color: #2a2a2a;
-  color: #ffffff;
+  color: #fff;
   border: 1px solid #555;
 }
 
 .removeTagBTNDark {
-  color: #ffffff;
+  color: #fff;
 }
 
 .tagDropdownDark {
   background-color: #1e1e1e;
-  color: #ffffff !important;
+  color: #fff !important;
   border: 1px solid #444;
 }
 
 .tagDropdownDark * {
-  color: #ffffff !important;
+  color: #fff !important;
 }
 
 .tagOptionDark {
-  color: #ffffff !important;
+  color: #fff !important;
   background-color: transparent;
 }
 
@@ -503,14 +489,14 @@
 .tagOptionDark:focus,
 .tagOptionDark:active {
   background-color: #2d3b66;
-  color: #ffffff !important;
+  color: #fff !important;
   outline: none;
 }
 
 .tagOptionDark:hover *,
 .tagOptionDark:focus *,
 .tagOptionDark:active * {
-  color: #ffffff !important;
+  color: #fff !important;
   background-color: transparent !important;
 }
 
@@ -520,7 +506,7 @@
 
 .formControlDark {
   background-color: #1C2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border: 1px solid #404040 !important;
   box-shadow: none !important;
 }
@@ -529,7 +515,7 @@
 .formControlDark:active,
 .formControlDark:focus-visible {
   background-color: #1C2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border-color: #2563eb !important;
   box-shadow: none !important;
   outline: none !important;
@@ -542,6 +528,7 @@
 .deleteTagBtnDark:hover {
   color: #ff3b3b;
 }
+
 /* Remove default arrow in all browsers */
 .formSelectDark {
   background-color: #1C2541;
@@ -550,35 +537,27 @@
 
   /* Remove default arrows */
   appearance: none;
-  -webkit-appearance: none;
-  -moz-appearance: none;
 
   /* Add custom arrow spacing */
   padding-right: 32px;
-
   background-image: url("data:image/svg+xml;utf8,<svg fill='%23e8f0fe' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/></svg>");
   background-repeat: no-repeat;
   background-position: right 10px center;
   background-size: 18px;
 }
+
 /* Fix selected text background in dark mode */
 .lessonPlaceholderTextDark::selection,
-.lessonPlaceholderTextDark::-moz-selection,
 .lessonPlaceholderTextDark.form-control::selection,
-.lessonPlaceholderTextDark.form-control::-moz-selection,
 .lessonTitleInput::selection,
-.lessonTitleInput::-moz-selection,
-.lessonTitleInputDark::selection,
-.lessonTitleInputDark::-moz-selection {
+.lessonTitleInputDark::selection {
   background-color: #1C2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
 }
 
 /* Hide selection when the field is not focused */
 .lessonTitleInputDark:not(:focus)::selection,
-.lessonTitleInputDark:not(:focus)::-moz-selection,
-.lessonPlaceholderTextDark:not(:focus)::selection,
-.lessonPlaceholderTextDark:not(:focus)::-moz-selection {
+.lessonPlaceholderTextDark:not(:focus)::selection {
   background-color: #1C2541 !important;
   color: #1C2541 !important;
 }
@@ -593,7 +572,7 @@
 :global(body.dark-mode) .formContainerDark :global(textarea)::selection,
 :global(body.bm-dashboard-dark) .formContainerDark :global(textarea)::selection {
   background-color: #1C2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
 }
 
 :global(body.dark-mode) .formContainerDark :global(input.form-control:not(:focus))::selection,
@@ -613,8 +592,8 @@
 .formControlDark:-webkit-autofill:hover,
 .formControlDark:-webkit-autofill:focus,
 .formControlDark:-webkit-autofill:active {
-  -webkit-box-shadow: 0 0 0 1000px #1C2541 inset !important;
-  -webkit-text-fill-color: #ffffff !important;
+  box-shadow: 0 0 0 1000px #1C2541 inset !important;
+  -webkit-text-fill-color: #fff !important;
   transition: background-color 9999s ease-in-out 0s;
 }
 
@@ -623,18 +602,18 @@
 .lessonTitleInputDark:-webkit-autofill:hover,
 .lessonTitleInputDark:-webkit-autofill:focus,
 .lessonTitleInputDark:-webkit-autofill:active {
-  -webkit-box-shadow: 0 0 0 1000px #1C2541 inset !important;
-  -webkit-text-fill-color: #ffffff !important;
-  caret-color: #ffffff !important;
+  box-shadow: 0 0 0 1000px #1C2541 inset !important;
+  -webkit-text-fill-color: #fff !important;
+  caret-color: #fff !important;
 }
 
 :global(body.dark-mode) .formContainerDark :global(input.form-control:-webkit-autofill),
 :global(body.bm-dashboard-dark) .formContainerDark :global(input.form-control:-webkit-autofill),
 :global(body.dark-mode) .formContainerDark :global(input[type='text']:-webkit-autofill),
 :global(body.bm-dashboard-dark) .formContainerDark :global(input[type='text']:-webkit-autofill) {
-  -webkit-box-shadow: 0 0 0 1000px #1C2541 inset !important;
-  -webkit-text-fill-color: #ffffff !important;
-  caret-color: #ffffff !important;
+  box-shadow: 0 0 0 1000px #1C2541 inset !important;
+  -webkit-text-fill-color: #fff !important;
+  caret-color: #fff !important;
 }
 
 
@@ -647,8 +626,10 @@
 .lessonPlaceholderTextDark.form-control:active,
 .lessonPlaceholderTextDark.form-control:focus-visible {
   background-color: #1C2541 !important;
-  color: #ffffff !important;
+  color: #fff !important;
   border: 1px solid #404040 !important;
   box-shadow: none !important;
   outline: none !important;
 }
+
+/* stylelint-enable no-descending-specificity */
diff --git a/src/components/BMDashboard/RentalChart/ReturnedLateChart.module.css b/src/components/BMDashboard/RentalChart/ReturnedLateChart.module.css
index 2b6da5de3a..f242c24135 100644
--- a/src/components/BMDashboard/RentalChart/ReturnedLateChart.module.css
+++ b/src/components/BMDashboard/RentalChart/ReturnedLateChart.module.css
@@ -161,6 +161,7 @@
   background-color: #2a3f5f;
   border: 1px solid #555;
 }
+
 .background-red {
   background-color: #ff4d4f;
 }
@@ -168,6 +169,7 @@
 :global(.dark.rmsc ) {
   --rmsc-border: none;
   --rmsc-bg: none;
+
   border:transparent;
 }
 
@@ -186,6 +188,7 @@
 :global(.dark.rmsc .select-item.selected) {
   background-color: #253246;
 }
+
 :global(.rmsc.dark .options) {
   background-color: #2a3f5f;
   color: #fff;
@@ -196,6 +199,7 @@
   background-color: #2a3f5f;
   color: #fff;
 }
+
 :global(.rmsc.dark .search input:focus) {
   background-color: #223653;
 }
diff --git a/src/components/BMDashboard/UpdateMaterials/UpdateMaterial.module.css b/src/components/BMDashboard/UpdateMaterials/UpdateMaterial.module.css
index 86244bf231..79f2d7196c 100644
--- a/src/components/BMDashboard/UpdateMaterials/UpdateMaterial.module.css
+++ b/src/components/BMDashboard/UpdateMaterials/UpdateMaterial.module.css
@@ -7,7 +7,7 @@
   background-color: #E8F4F9;
   width: 100%;
   height: auto;
-  margin: 0px;
+  margin: 0;
   padding: 1rem 2rem;
   font-size: 15px;
 }
@@ -102,13 +102,13 @@
 /* Page background */
 :global(.dark-mode) .updateMaterialPage {
   background-color: #3A506B; /* Yinmn Blue */
-  color: #ffffff;
+  color: #fff;
 }
 
 /* Card container */
 :global(.dark-mode) .updateMaterial {
   background-color: #1B2A41; /* Muted Oxford Blue */
-  color: #ffffff;
+  color: #fff;
   border: 1px solid #2a2f3a;
 }
 
@@ -119,32 +119,32 @@
 
 /* Values */
 :global(.dark-mode) .materialFormValue {
-  color: #ffffff;
+  color: #fff;
 }
 
 /* Buttons */
 :global(.dark-mode) .materialButtonOutline {
-  color: #ffffff !important;
-  border-color: #ffffff !important;
+  color: #fff !important;
+  border-color: #fff !important;
 }
 
 :global(.dark-mode) .materialButtonOutline:hover {
   background-color: #1C2541 !important; /* Space Cadet */
-  color: #ffffff !important;
+  color: #fff !important;
 }
 
 :global(.dark-mode) .materialButtonBg {
   background-color: #1C2541 !important; /* Space Cadet */
-  color: #ffffff !important;
+  color: #fff !important;
 }
 
 :global(.dark-mode) .materialButtonBg:hover {
   background-color: #3A506B !important; /* Yinmn Blue */
-  color: #ffffff !important;
+  color: #fff !important;
 }
 
 /* Modal container */
 :global(.dark-mode) .updateModalContainer {
   background-color: #1B2A41; /* Muted Oxford Blue */
-  color: #ffffff;
+  color: #fff;
 }
\ No newline at end of file
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/ProjectRiskProfileOverview.module.css b/src/components/BMDashboard/WeeklyProjectSummary/ProjectRiskProfileOverview.module.css
index de8ed50350..ed4647b5a3 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/ProjectRiskProfileOverview.module.css
+++ b/src/components/BMDashboard/WeeklyProjectSummary/ProjectRiskProfileOverview.module.css
@@ -1,5 +1,5 @@
 .chartCard {
-  background-color: #ffffff;
+  background-color: #fff;
   color: #232323;
   border-radius: 8px;
   box-shadow: 0 2px 8px #eee;
@@ -62,10 +62,6 @@
   padding: 0;
 }
 
-.darkMode .dropdownButton {
-  color: #e5e5e5;
-}
-
 .dropdownMenu {
   position: absolute;
   left: 0;
@@ -146,24 +142,20 @@
   background: #2b2b2b;
   border: 1px solid #555;
 }
+
 .darkMode .dropdownButton:hover {
   background: #3a3a3a;
 }
 
 .darkMode .dropdownMenu {
-  background: #2c2c2c;
-  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.5);
+  background-color: #1c2541;
+  box-shadow: 2px 2px 4px 1px black;
 }
 
 .darkMode .heading {
   color: #eee;
 }
 
-.darkMode .dropdownMenu {
-  background-color: #1c2541; /* --color-space-cadet */
-  box-shadow: 2px 2px 4px 1px black;
-}
-
 .chartContainer {
   width: 100%;
   margin: 0 -24px;
@@ -217,7 +209,7 @@
 }
 
 .trendTitle {
-  margin: 0 0 12px 0;
+  margin: 0 0 12px;
   font-size: 16px;
   font-weight: 600;
   color: #1a1a1a;
@@ -256,20 +248,42 @@
   color: #eee;
 }
 
-.trendRow { 
-  display: flex; 
-  align-items: center; 
-  gap: 8px; 
-  font-size: 13px; 
+.trendRow {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 13px;
   margin-bottom: 8px;
 }
 
-.trendRow span:first-child { flex: 1; color: #666; font-weight: 500; }
-.darkMode .trendRow span:first-child { color: #aaa; }
-.trendRow span:last-child { font-weight: 600; color: #1a1a1a; min-width: 50px; text-align: right; }
-.darkMode .trendRow span:last-child { color: #ddd; }
+.trendRow span:last-child {
+  font-weight: 600;
+  color: #1a1a1a;
+  min-width: 50px;
+  text-align: right;
+}
+
+.trendRow span:first-child {
+  flex: 1;
+  color: #666;
+  font-weight: 500;
+}
+
+.darkMode .trendRow span:first-child {
+  color: #aaa;
+}
 
-.trendIndicator { font-size: 16px; font-weight: 700; display: inline-block; width: 24px; text-align: center; }
+.darkMode .trendRow span:last-child {
+  color: #ddd;
+}
+
+.trendIndicator {
+  font-size: 16px;
+  font-weight: 700;
+  display: inline-block;
+  width: 24px;
+  text-align: center;
+}
 
 .attributeRow {
   display: flex;
@@ -311,6 +325,16 @@
   color: #ddd;
 }
 
-.timelineSection { margin-top: 28px; padding: 18px; background: #fafafa; border-radius: 8px; border: 1px solid #e8e8e8; }
-.darkMode .timelineSection { background: #252525; border-color: #404040; }
+.timelineSection {
+  margin-top: 28px;
+  padding: 18px;
+  background: #fafafa;
+  border-radius: 8px;
+  border: 1px solid #e8e8e8;
+}
+
+.darkMode .timelineSection {
+  background: #252525;
+  border-color: #404040;
+}
 
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/WeeklyProjectSummary.module.css b/src/components/BMDashboard/WeeklyProjectSummary/WeeklyProjectSummary.module.css
index 4b0e5eb7b4..53c201e3b6 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/WeeklyProjectSummary.module.css
+++ b/src/components/BMDashboard/WeeklyProjectSummary/WeeklyProjectSummary.module.css
@@ -42,7 +42,7 @@
   max-width: 1280px;
   padding: 12px 16px;
   background: var(--section-bg);
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 4px rgb(0 0 0 / 10%);
   border-radius: 8px;
   gap: 12px;
 }
@@ -109,6 +109,7 @@
 }
 
 /* Share Button — override Bootstrap .btn so it lines up with .form-control selects */
+
 /* Bootstrap .btn defaults to flex-shrink: 1; when the row is tight the button shrinks and
    the label overflows outside the painted background (overlapping the last dropdown). */
 .weeklySummaryShareBtn {
@@ -141,15 +142,15 @@
   vertical-align: middle;
 }
 
-.weeklySummaryShareBtn:hover:not(:disabled) {
-  background-color: var(--button-hover) !important;
-}
-
 .weeklySummaryShareBtn:disabled {
   opacity: 0.7;
   cursor: not-allowed;
 }
 
+.weeklySummaryShareBtn:hover:not(:disabled) {
+  background-color: var(--button-hover) !important;
+}
+
 /* Spinner for PDF generation */
 .spinner {
   display: inline-block;
@@ -205,7 +206,7 @@
 
 .darkMode .weeklyProjectSummaryCard {
   background: var(--card-bg);
-  box-shadow: 0 2px 5px rgba(255, 255, 255, 0.1);
+  box-shadow: 0 2px 5px rgb(255 255 255 / 10%);
 }
 
 .financialSmall {
@@ -222,7 +223,7 @@
   padding: 0;
   background: white;
   border-radius: 12px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 8px rgb(0 0 0 / 10%);
   overflow: hidden;
   margin-bottom: 20px;
 }
@@ -298,6 +299,11 @@
   background: var(--section-bg);
 }
 
+.darkMode .weeklyProjectSummaryDashboardCategoryContent {
+  background-color: var(--section-bg);
+  border-top: 1px solid rgb(255 255 255 / 20%);
+}
+
 /* Adjust grid columns based on section size */
 .weeklyProjectSummaryDashboardSection.half .weeklyProjectSummaryDashboardCategoryContent {
   grid-template-columns: repeat(2, 1fr);
@@ -309,10 +315,10 @@
 
 /* ---------------- DARK MODE VARIABLES ---------------- */
 :root {
-  --bg-color: #ffffff;
-  --text-color: #000000;
+  --bg-color: #fff;
+  --text-color: #000;
   --card-bg: #fafafa;
-  --card-shadow: rgba(0, 0, 0, 0.1);
+  --card-shadow: rgb(0 0 0 / 10%);
   --section-bg: white;
   --section-title-bg: white;
   --section-title-hover: #e0e0e0;
@@ -323,9 +329,9 @@
 /* ---------------- DARK MODE STYLES ---------------- */
 .darkMode {
   --bg-color: #1b2a41;
-  --text-color: #ffffff;
+  --text-color: #fff;
   --card-bg: #2b3e59;
-  --card-shadow: rgba(255, 255, 255, 0.1);
+  --card-shadow: rgb(255 255 255 / 10%);
   --section-bg: #253342;
   --section-title-bg: #2d4059;
   --section-title-hover: #3a506b;
@@ -338,7 +344,7 @@
 /* MERGED: keep background + FORCE all title text visible in dark mode */
 .darkMode .weeklyProjectSummaryDashboardCategoryTitle {
   background: #2d4059;
-  color: #ffffff;
+  color: #fff;
 }
 
 .darkMode .weeklyProjectSummaryDashboardCategoryTitle:hover {
@@ -346,16 +352,11 @@
 }
 
 .darkMode .weeklyProjectSummaryDashboardCategoryTitle span {
-  color: #ffffff;
+  color: #fff;
 }
 
 .darkMode .weeklyProjectSummaryDashboardCategoryTitle * {
-  color: #ffffff;
-}
-
-.darkMode .weeklyProjectSummaryDashboardCategoryContent {
-  background-color: var(--section-bg);
-  border-top: 1px solid rgba(255, 255, 255, 0.2);
+  color: #fff;
 }
 
 .darkMode .weeklySummaryHeaderContainer {
@@ -371,7 +372,7 @@
 
   /* Firefox */
   scrollbar-width: thin;
-  scrollbar-color: rgba(0, 0, 0, 0.3) rgba(0, 0, 0, 0.1);
+  scrollbar-color: rgb(0 0 0 / 30%) rgb(0 0 0 / 10%);
 }
 
 /* Chrome/Safari scrollbar */
@@ -380,30 +381,30 @@
 }
 
 .quantityOfMaterialsUsedChartTooltip::-webkit-scrollbar-track {
-  background: rgba(0, 0, 0, 0.1);
+  background: rgb(0 0 0 / 10%);
   border-radius: 4px;
 }
 
 .quantityOfMaterialsUsedChartTooltip::-webkit-scrollbar-thumb {
-  background: rgba(0, 0, 0, 0.3);
+  background: rgb(0 0 0 / 30%);
   border-radius: 4px;
 }
 
 /* Additional adjustments for dark mode if needed */
 .darkMode .quantityOfMaterialsUsedChartTooltip::-webkit-scrollbar-track {
-  background: rgba(255, 255, 255, 0.1);
+  background: rgb(255 255 255 / 10%);
 }
 
 .darkMode .quantityOfMaterialsUsedChartTooltip::-webkit-scrollbar-thumb {
-  background: rgba(255, 255, 255, 0.3);
+  background: rgb(255 255 255 / 30%);
 }
 
 .darkMode .quantityOfMaterialsUsedChartTooltip {
-  scrollbar-color: rgba(255, 255, 255, 0.3) rgba(255, 255, 255, 0.1);
+  scrollbar-color: rgb(255 255 255 / 30%) rgb(255 255 255 / 10%);
 }
 
 /* ---------------- RESPONSIVE DESIGN ---------------- */
-@media (max-width: 1024px) {
+@media (width <= 1024px) {
   .weeklySummaryHeaderContainer {
     flex-direction: column;
     align-items: stretch;
@@ -421,7 +422,7 @@
   }
 }
 
-@media (max-width: 768px) {
+@media (width <= 768px) {
   .weeklySummaryHeaderContainer {
     flex-direction: column;
     align-items: stretch;
@@ -469,13 +470,14 @@
   max-width: 284px;
   height: 190px;
   text-align: center;
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 4px 8px rgb(0 0 0 / 15%);
   padding: 20px;
-  border: 1px solid rgba(0, 0, 0, 0.1);
+  border: 1px solid rgb(0 0 0 / 10%);
   position: relative;
 }
 
 /* ---------------- RESPONSIVE GRID LAYOUT ---------------- */
+
 /* MERGED: keep ONLY one projectStatusGrid */
 .projectStatusGrid {
   display: grid;
@@ -487,6 +489,7 @@
   max-width: 1600px;
   margin: auto;
 }
+
 /* .projectStatusGrid {
   display: grid;
   grid-template-columns: repeat(6, 1fr);
@@ -502,7 +505,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 2px 5px rgb(0 0 0 / 15%);
   margin: 12px 0;
 }
 
@@ -519,31 +522,31 @@
 }
 
 /* ---------------- RESPONSIVE BREAKPOINTS ---------------- */
-@media (min-width: 1600px) {
+@media (width >= 1600px) {
   .projectStatusGrid {
     grid-template-columns: repeat(6, 1fr);
   }
 }
 
-@media (max-width: 1400px) {
+@media (width <= 1400px) {
   .projectStatusGrid {
     grid-template-columns: repeat(4, 1fr);
   }
 }
 
-@media (max-width: 1024px) {
+@media (width <= 1024px) {
   .projectStatusGrid {
     grid-template-columns: repeat(3, 1fr);
   }
 }
 
-@media (max-width: 768px) {
+@media (width <= 768px) {
   .projectStatusGrid {
     grid-template-columns: repeat(2, 1fr);
   }
 }
 
-@media (max-width: 576px) {
+@media (width <= 576px) {
   .projectStatusGrid {
     grid-template-columns: repeat(1, 1fr);
   }
diff --git a/src/components/CommunityPortal/Activities/ActivityList.module.css b/src/components/CommunityPortal/Activities/ActivityList.module.css
index da9ae4a4eb..c4093629cf 100644
--- a/src/components/CommunityPortal/Activities/ActivityList.module.css
+++ b/src/components/CommunityPortal/Activities/ActivityList.module.css
@@ -145,11 +145,6 @@
   border-radius: 0;
 }
 
-.activityList.darkActivityList li strong {
-  color: #00f3ff;
-  font-size: 1.2rem;
-}
-
 .activityList li:hover {
   transform: translateY(-3px);
   box-shadow: 0 4px 8px rgb(0 0 0 / 10%);
@@ -169,6 +164,11 @@
   color: #5c9ce6 !important;
 }
 
+.activityList.darkActivityList li strong {
+  color: #00f3ff;
+  font-size: 1.2rem;
+}
+
 .activityItem span {
   color: #4b5563;
 }
@@ -288,11 +288,6 @@
   accent-color: #3b82f6;
 }
 
-.showPastToggle input[type="checkbox"]:focus-visible {
-  outline: none;
-  border-radius: 4px;
-}
-
 .darkShowPastToggle {
   color: #f1f5f9;
 }
@@ -301,6 +296,11 @@
   accent-color: #60a5fa;
 }
 
+.showPastToggle input[type="checkbox"]:focus-visible {
+  outline: none;
+  border-radius: 4px;
+}
+
 /* Responsive */
 @media (width <= 768px) {
   .filters {
diff --git a/src/components/CommunityPortal/Reports/Participation/Participation.module.css b/src/components/CommunityPortal/Reports/Participation/Participation.module.css
index 3c5392b1ae..1e88f4da37 100644
--- a/src/components/CommunityPortal/Reports/Participation/Participation.module.css
+++ b/src/components/CommunityPortal/Reports/Participation/Participation.module.css
@@ -1,6 +1,6 @@
 /* ---------- General Styling ---------- */
 .body {
-  font-family: 'Arial', sans-serif;
+  font-family: Arial, sans-serif;
   margin: 0;
   padding: 0;
   background-color: #f5f5f5;
@@ -15,7 +15,7 @@
   max-width: 90%;
   margin: 0 auto;
   background-color: #1b2a41;
-  color: #ffffff;
+  color: #fff;
 }
 
 /* ---------- Page Header ---------- */
@@ -38,7 +38,7 @@
 .landingPageHeaderDark {
   font-size: 2.2rem;
   font-weight: 700;
-  color: #ffffff !important;
+  color: #fff !important;
   letter-spacing: 0.5px;
 }
 
@@ -75,7 +75,7 @@
   transform: translateY(-1px);
 }
 
-@media (max-width: 768px) {
+@media (width <= 768px) {
   .landingPageHeaderContainer {
     flex-direction: column;
     align-items: center;
@@ -138,7 +138,7 @@
   background: white;
   border: 1px solid #ddd;
   border-radius: 5px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 4px rgb(0 0 0 / 10%);
 }
 
 /* ---------- Analytics Section ---------- */
@@ -155,9 +155,9 @@
 .insights {
   flex: 1;
   min-width: 48%;
-  background-color: #ffffff;
+  background-color: #fff;
   border-radius: 10px;
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4px 8px rgb(0 0 0 / 10%);
   padding: 20px;
   box-sizing: border-box;
 }
@@ -167,15 +167,15 @@
   flex: 1;
   min-width: 48%;
   background-color: #1c2541;
-  color: #ffffff;
+  color: #fff;
   border-radius: 10px;
   border: 1px solid #ddd;
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4px 8px rgb(0 0 0 / 10%);
   padding: 20px;
   box-sizing: border-box;
 }
 
-@media (max-width: 768px) {
+@media (width <= 768px) {
   .analyticsSection {
     flex-wrap: wrap;
   }
@@ -199,7 +199,7 @@
   justify-content: space-between;
   align-items: center;
   margin-bottom: 20px;
-  color: #ffffff;
+  color: #fff;
 }
 
 .trackingHeader h3 {
@@ -209,7 +209,7 @@
 }
 
 .trackingHeaderDark h3 {
-  color: #ffffff;
+  color: #fff;
   font-size: 1.3rem;
   margin: 0;
 }
@@ -276,13 +276,14 @@
 
 .trackingRateDark .trackingRateSubheading span,
 .trackingRateDark .trackingRateValue span {
-  color: #ffffff;
+  color: #fff;
 }
 
 .trackingRateValue {
   font-size: 0.9rem;
   display: inline-block;
 }
+
 .trackingRate .trackingRateValue span.trackingRateValuePositive,
 .trackingRateDark .trackingRateValue span.trackingRateValuePositive {
   color: #f44336 !important;
@@ -302,6 +303,7 @@
   padding: 10px;
   background: #fff;
 }
+
 .trackingListContainerDark {
   max-height: 600px;
   overflow-y: auto;
@@ -309,14 +311,14 @@
   border-radius: 10px;
   padding: 10px;
   background: #3a506b;
-  color: #ffffff;
+  color: #fff;
 }
 
 .trackingTable {
   width: 100%;
   border-collapse: collapse;
   table-layout: fixed;
-  word-wrap: break-word;
+  overflow-wrap: break-word;
 }
 
 .trackingTable thead th {
@@ -327,7 +329,7 @@
 
 .trackingTableDark thead th {
   background: #1c2541;
-  color: #ffffff;
+  color: #fff;
 }
 
 .trackingTable tbody td {
@@ -352,8 +354,9 @@
   display: flex;
   justify-content: space-between;
 }
+
 .insightsHeaderDark {
-  color: #ffffff;
+  color: #fff;
   font-weight: bold;
   margin-bottom: 15px;
   display: flex;
@@ -365,8 +368,9 @@
   color: #333;
   margin: 0;
 }
+
 .insightsHeaderDark h3 {
-  color: #ffffff;
+  color: #fff;
   font-size: 1.3rem;
   margin: 0;
 }
@@ -462,7 +466,7 @@
 
 .insightsDark .insightsTab {
   background-color: #3A506B;
-  color: #ffffff;
+  color: #fff;
   border-right: 1px solid #555;
 }
 
@@ -494,12 +498,14 @@
   color: #555;
   margin-right: 10px;
 }
+
 .insightLabelDark {
-  color: #ffffff;
+  color: #fff;
   font-size: 0.9rem;
   flex: 1;
   margin-right: 10px;
 }
+
 .insightBar {
   flex: 2;
   height: 8px;
@@ -525,7 +531,7 @@
 }
 
 .insightsPercentageDark {
-    color: #ffffff;
+    color: #fff;
   }
 
 .tooltipWrapper {
@@ -559,7 +565,7 @@
 .modalOverlay {
   position: fixed;
   inset: 0;
-  background: rgba(0, 0, 0, 0.45);
+  background: rgb(0 0 0 / 45%);
   display: flex;
   justify-content: center;
   align-items: center;
@@ -655,9 +661,17 @@
 
 
 /* ---------- PDF/Print helpers ---------- */
-.pageBreakBefore { break-before: page; page-break-before: always; }
-.pageBreakAfter  { break-after: page;  page-break-after: always; }
-.avoidBreak       { break-inside: avoid; page-break-inside: avoid; }
+.pageBreakBefore {
+  break-before: page;
+}
+
+.pageBreakAfter {
+  break-after: page;
+}
+
+.avoidBreak {
+  break-inside: avoid;
+}
 
 :global(html[data-exporting="true"]) .caseCards:global(.expanded),
 :global(html[data-exporting="true"]) .caseList:global(.expanded),
@@ -672,6 +686,7 @@
   border: 1px solid #555;
   background-color: #1e293b; /* Dark background */
 }
+
 /* Dark mode tab */
 .insightsTabDarkMode {
   color: #ddd;
@@ -735,22 +750,22 @@
     display: grid !important;
     grid-template-columns: repeat(2, 1fr) !important;
     gap: 12px !important;
-    page-break-inside: auto !important;
+    break-inside: auto !important;
   }
 
   :global(.case-card-global) {
     break-inside: avoid-page !important;
-    page-break-inside: avoid !important;
+    break-inside: avoid !important;
     height: auto !important;
   }
 
   :global(.case-list-global) {
-    page-break-inside: auto !important;
+    break-inside: auto !important;
   }
 
   :global(.case-list-item-global) {
     break-inside: avoid-page !important;
-    page-break-inside: avoid !important;
+    break-inside: avoid !important;
   }
 
   .trackingListContainer,
@@ -762,12 +777,10 @@
 
   :global(.tracking-table-global) tr {
     break-inside: avoid;
-    page-break-inside: avoid;
   }
 
   .insightItem {
     break-inside: avoid;
-    page-break-inside: avoid;
   }
 
   :global(.view-switcher-global),
@@ -789,23 +802,19 @@
 
   :global(.tracking-table-global-dark) thead th {
     background: #1C2541 !important;
-    color: #ffffff !important;
+    color: #fff !important;
   }
 
   .printOnly {
     display: block !important;
   }
 
-  .participationLandingPage,
-  .participationLandingPage * {
+  :global(#root) .participationLandingPage,
+  :global(#root) .participationLandingPage * {
     -webkit-print-color-adjust: exact !important;
     print-color-adjust: exact !important;
   }
 
-  .participationLandingPage {
-    background: white !important;
-  }
-  
   :global(#root) .case-card-global {
     background: white !important;
     color: #333 !important;
@@ -827,40 +836,40 @@
   /* Dark mode styles for print */
   .participationLandingPageDark {
     background: #1B2A41 !important;
-    color: #ffffff !important;
+    color: #fff !important;
   }
 
   .participationLandingPageDark :global(.case-card-global) {
     background: #3A506B !important;
-    color: #ffffff !important;
+    color: #fff !important;
     border: 1px solid #555 !important;
   }
 
   .participationLandingPageDark .trackingContainerDark {
     background: #1C2541 !important;
-    color: #ffffff !important;
+    color: #fff !important;
     border: 1px solid #555 !important;
   }
 
   .participationLandingPageDark .insightsDark {
     background: #1C2541 !important;
-    color: #ffffff !important;
+    color: #fff !important;
     border: 1px solid #555 !important;
   }
 
   .participationLandingPageDark .trackingListContainerDark {
     background: #3A506B !important;
-    color: #ffffff !important;
+    color: #fff !important;
   }
 
   .participationLandingPageDark :global(.tracking-table-global-dark) thead th {
     background: #1C2541 !important;
-    color: #ffffff !important;
+    color: #fff !important;
   }
 
   .participationLandingPageDark .trackingRateDark {
     background: #3A506B !important;
-    color: #ffffff !important;
+    color: #fff !important;
   }
 
   /* Event badge colors for print */
@@ -907,9 +916,10 @@
   .participationLandingPageDark .attendeesCountDark,
   .participationLandingPageDark .insightsLabelDark,
   .participationLandingPageDark .insightsPercentageDark {
-    color: #ffffff !important;
+    color: #fff !important;
   }
 }
+
 /* Active tab dark mode */
 .activeTabDarkMode {
   background-color: #3b82f6;
@@ -931,18 +941,8 @@
 }
 
 /* ---------- Modal ---------- */
-.modalOverlay {
-  position: fixed;
-  inset: 0;
-  background: rgba(0, 0, 0, 0.45);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 1000;
-}
-
 .modalContent {
-  background: #ffffff;
+  background: #fff;
   width: 420px;
   max-height: 80vh;
   border-radius: 10px;
@@ -953,13 +953,7 @@
 
 .modalContentDark {
   background: #1C2541;
-  color: #ffffff;
-}
-
-.modalHeader {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+  color: #fff;
 }
 
 .closeBtn {
@@ -1030,41 +1024,30 @@
 /* ===== Dark mode fixes ===== */
 
 .participationLandingPageDark :global(button) {
-  color: #ffffff !important;
+  color: #fff !important;
 }
 
 .participationLandingPageDark :global(.btn),
 .participationLandingPageDark :global(.btn-light),
 .participationLandingPageDark :global(.btn-outline-secondary) {
-  color: #ffffff !important;
+  color: #fff !important;
   background-color: #3a506b !important;
   border-color: #3a506b !important;
 }
 
 .participationLandingPageDark :global(.btn-primary),
 .participationLandingPageDark :global(.active) {
-  color: #ffffff !important;
+  color: #fff !important;
 }
 
 .trackingContainerDark .trackingFilters select {
   background-color: #3A506B;
-  color: #ffffff;
+  color: #fff;
   border: 1px solid #3A506B;
 }
 
 .insightsDark .insightsFilters select {
   background-color: #3A506B;
-  color: #ffffff;
+  color: #fff;
   border: 1px solid #3A506B;
 }
-
-.insightsDark .insightsTab {
-  background-color: #3A506B;
-  color: #ffffff;
-  border-right: 1px solid #555;
-}
-
-.insightsDark .insightsTab.activeTab {
-  background-color: #007bff;
-  color: #ffffff;
-}
\ No newline at end of file
diff --git a/src/components/HGNHelpSkillsDashboard/FeedbackModal.module.css b/src/components/HGNHelpSkillsDashboard/FeedbackModal.module.css
index 2283cda43e..cb0351f272 100644
--- a/src/components/HGNHelpSkillsDashboard/FeedbackModal.module.css
+++ b/src/components/HGNHelpSkillsDashboard/FeedbackModal.module.css
@@ -62,7 +62,7 @@
   max-height: 200px;
   overflow-y: auto;
   z-index: 1000;
-  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4px 6px rgb(0 0 0 / 10%);
   margin-top: 4px;
 }
 
@@ -141,16 +141,13 @@ body.dark-mode .suggestion-link {
   color: #ccc;
 }
 
-body.dark-mode .star {
-  color: #555;
-}
-
-body.dark-mode .star:hover {
-  color: #ffc107;
+:global(body.dark-mode) .star {
+  color: #555 !important;
 }
 
-body.dark-mode .star.selected {
-  color: #ffc107;
+:global(body.dark-mode) .star:hover,
+:global(body.dark-mode) .star.selected {
+  color: #ffc107 !important;
 }
 
 body.dark-mode .autocomplete-dropdown {
@@ -158,6 +155,10 @@ body.dark-mode .autocomplete-dropdown {
   border-color: #444;
 }
 
+:global(body.dark-mode) .autocomplete-item {
+  border-bottom-color: #444 !important;
+}
+
 body.dark-mode .autocomplete-item {
   border-bottom-color: #444;
 }
@@ -177,6 +178,7 @@ body.dark-mode .user-details {
 body.dark-mode .loading {
   color: #fff;
 }
+
 /* Dark Mode Support - Issues #6 & #7 */
 :global(body.dark-mode) .feedback-modal :global(.modal-content) {
   background-color: #1e1e1e !important;
@@ -222,10 +224,6 @@ body.dark-mode .loading {
   border-color: #444 !important;
 }
 
-:global(body.dark-mode) .autocomplete-item {
-  border-bottom-color: #444 !important;
-}
-
 :global(body.dark-mode) .autocomplete-item:hover {
   background-color: #3d3d3d !important;
 }
@@ -248,13 +246,4 @@ body.dark-mode .loading {
 
 :global(body.dark-mode) .loading {
   color: #fff !important;
-}
-
-:global(body.dark-mode) .star {
-  color: #555 !important;
-}
-
-:global(body.dark-mode) .star:hover,
-:global(body.dark-mode) .star.selected {
-  color: #ffc107 !important;
 }
\ No newline at end of file
diff --git a/src/components/LBDashboard/Components/ImageCarousel.jsx b/src/components/LBDashboard/Components/ImageCarousel.jsx
index 2e254ed1e5..ff3337c4e1 100644
--- a/src/components/LBDashboard/Components/ImageCarousel.jsx
+++ b/src/components/LBDashboard/Components/ImageCarousel.jsx
@@ -1,10 +1,21 @@
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
 import styles from './ImageCarousel.module.css';
 
-export default function ImageCarousel({ images }) {
+const getClassNames = (baseClass, darkClass, darkMode) =>
+  `${baseClass} ${darkMode ? darkClass : ''}`;
+
+export default function ImageCarousel({ images, darkMode = false }) {
   const [currentIndex, setCurrentIndex] = useState(0);
 
-  if (!images || images.length === 0) return <p>No images available</p>;
+  useEffect(() => {
+    setCurrentIndex(0);
+  }, [images]);
+
+  if (!images || images.length === 0)
+    return (
+      <p className={getClassNames('', styles['no-images--dark'], darkMode)}>No images available</p>
+    );
 
   const handleNext = () => {
     setCurrentIndex(prev => (prev + 1) % images.length);
@@ -19,35 +30,57 @@ export default function ImageCarousel({ images }) {
   };
 
   return (
-    <div className={`${styles.carouselContainer}`}>
-      <div className={`${styles.carouselWrapper}`}>
+    <div
+      className={getClassNames(
+        styles.carouselContainer,
+        styles['carouselContainer--dark'],
+        darkMode,
+      )}
+    >
+      <div className={styles.carouselWrapper}>
         <div
-          className={`${styles.carouselTrack}`}
+          className={styles.carouselTrack}
           style={{ transform: `translateX(-${currentIndex * 100}%)` }}
         >
           {images.map((image, index) => (
             <img
-              key={image}
-              className={`${styles.carouselImage}`}
+              key={`slide-${index}-${image}`}
+              className={styles.carouselImage}
               src={image}
               alt={`Slide ${index + 1}`}
             />
           ))}
         </div>
       </div>
-      <button type="button" className={`${styles.imgArrow} ${styles.left}`} onClick={handlePrev}>
+      <button
+        type="button"
+        className={`${getClassNames(styles.imgArrow, styles['imgArrow--dark'], darkMode)} ${
+          styles.left
+        }`}
+        onClick={handlePrev}
+      >
         ❮
       </button>
-      <button type="button" className={`${styles.imgArrow} ${styles.right}`} onClick={handleNext}>
+      <button
+        type="button"
+        className={`${getClassNames(styles.imgArrow, styles['imgArrow--dark'], darkMode)} ${
+          styles.right
+        }`}
+        onClick={handleNext}
+      >
         ❯
       </button>
-      <div className={`${styles.carouselIndicators}`}>
+      <div className={styles.carouselIndicators}>
         {images.map((image, index) => (
           <span
-            key={image}
+            key={`dot-${index}-${image}`}
             role="button"
             tabIndex={0}
-            className={`${styles.indicator} ${index === currentIndex ? styles.active : ''}`}
+            className={`${getClassNames(styles.indicator, styles['indicator--dark'], darkMode)} ${
+              index === currentIndex
+                ? getClassNames(styles.active, styles['active--dark'], darkMode)
+                : ''
+            }`}
             onClick={() => handleIndicatorClick(index)}
             onKeyDown={e => {
               if (e.key === 'Enter' || e.key === ' ') {
@@ -60,3 +93,8 @@ export default function ImageCarousel({ images }) {
     </div>
   );
 }
+
+ImageCarousel.propTypes = {
+  images: PropTypes.arrayOf(PropTypes.string),
+  darkMode: PropTypes.bool,
+};
diff --git a/src/components/LBDashboard/Components/ImageCarousel.module.css b/src/components/LBDashboard/Components/ImageCarousel.module.css
index 4917163506..cbe5063c28 100644
--- a/src/components/LBDashboard/Components/ImageCarousel.module.css
+++ b/src/components/LBDashboard/Components/ImageCarousel.module.css
@@ -9,6 +9,7 @@
 
 .carouselWrapper {
   width: 100%;
+  min-height: 200px;
   overflow: hidden;
 }
 
@@ -29,7 +30,7 @@
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
-  background-color: rgba(0, 0, 0, 0.5);
+  background-color: rgb(0 0 0 / 50%);
   color: white;
   border: none;
   padding: 10px;
@@ -38,11 +39,11 @@
   z-index: 10;
 }
 
-.left {
+.imgArrow.left {
   left: 10px;
 }
 
-.right {
+.imgArrow.right {
   right: 10px;
 }
 
@@ -63,6 +64,36 @@
   transition: background-color 0.3s ease;
 }
 
-.active {
+.indicator.active {
   background-color: #333;
 }
+
+/* Dark mode styles */
+.carouselContainer--dark {
+  /* Container dark mode styles if needed */
+}
+
+.imgArrow--dark {
+  background-color: rgb(255 255 255 / 70%) !important;
+  color: #000 !important;
+}
+
+.imgArrow--dark:hover {
+  background-color: rgb(255 255 255 / 90%) !important;
+}
+
+.indicator--dark {
+  background-color: #666 !important;
+}
+
+.indicator--dark:hover {
+  background-color: #888 !important;
+}
+
+.active--dark {
+  background-color: #fff !important;
+}
+
+.no-images--dark {
+  color: #e1e1e1 !important;
+}
\ No newline at end of file
diff --git a/src/components/LBDashboard/Header.jsx b/src/components/LBDashboard/Header.jsx
index f6cc81473a..d1386fdcd4 100644
--- a/src/components/LBDashboard/Header.jsx
+++ b/src/components/LBDashboard/Header.jsx
@@ -1,5 +1,6 @@
-import { connect } from 'react-redux';
-import { useState } from 'react';
+import { connect, useSelector } from 'react-redux';
+import { useState, useCallback } from 'react';
+import { useHistory, Link } from 'react-router-dom';
 
 import Navbar from 'react-bootstrap/Navbar';
 import Container from 'react-bootstrap/Container';
@@ -7,45 +8,122 @@ import Nav from 'react-bootstrap/Nav';
 
 import { FiUser } from 'react-icons/fi';
 import { BsChat } from 'react-icons/bs';
-import { Link } from 'react-router-dom';
 import { IoNotificationsOutline } from 'react-icons/io5';
 
+import { FIXED_VILLAGES } from './Home/data.jsx';
+import itemStyles from './WishList/ItemOverview.module.css';
+
+const cx = (base, darkClass, darkMode) => `${base} ${darkMode ? darkClass : ''}`.trim();
+
 function LBDashboardHeader(props) {
   const [selectedVillage, setSelectedVillage] = useState('');
   const { authUser } = props;
+  const darkMode = useSelector(state => state.theme.darkMode);
+  const history = useHistory();
+
+  const selectorWrapperStyle = darkMode
+    ? {
+        backgroundColor: '#1c2541',
+        border: '1px solid #2f3b59',
+      }
+    : undefined;
+
+  const selectorStyle = darkMode
+    ? {
+        backgroundColor: 'transparent',
+        color: '#ffffff',
+      }
+    : undefined;
+
+  const goButtonStyle = darkMode
+    ? {
+        backgroundColor: '#4f6fdc',
+        borderColor: '#89a2ff',
+      }
+    : undefined;
+
+  const handleGoClick = useCallback(() => {
+    const qs = selectedVillage ? `?village=${encodeURIComponent(selectedVillage)}` : '';
+    history.push(`/lbdashboard/listingshome${qs}`);
+  }, [history, selectedVillage]);
 
   return (
-    <Navbar expand="lg" className="item__navbar">
+    <Navbar
+      expand="lg"
+      className={cx(itemStyles.item__navbar, itemStyles['item__navbar--dark'], darkMode)}
+    >
       <Container fluid>
-        {/* Left Section - Village Selector */}
-        <div className="item__navbar-left">
-          <div className="item__selector">
-            <select value={selectedVillage} onChange={e => setSelectedVillage(e.target.value)}>
-              <option value="Village 1">Village 1</option>
-              <option value="Village 2">Village 2</option>
-              <option value="Village 3">Village 3</option>
+        <div className={itemStyles['item__navbar-left']}>
+          <div className={itemStyles.item__selector} style={selectorWrapperStyle}>
+            <select
+              value={selectedVillage}
+              onChange={e => setSelectedVillage(e.target.value)}
+              style={selectorStyle}
+              aria-label="Filter by village"
+            >
+              <option value="">Select village</option>
+              {FIXED_VILLAGES.map(v => (
+                <option key={v} value={v}>
+                  {v}
+                  {v !== 'City Center' ? ' Village' : ''}
+                </option>
+              ))}
             </select>
           </div>
-          <div className="item__button">
+          <button
+            type="button"
+            className={itemStyles.item__button}
+            style={goButtonStyle}
+            onClick={handleGoClick}
+          >
             <p>Go</p>
-          </div>
+          </button>
         </div>
 
-        {/* Right Section - User Info and Icons */}
         <Navbar.Toggle aria-controls="basic-navbar-nav" />
         <Navbar.Collapse id="basic-navbar-nav">
-          <div className="item__navbar-right">
+          <div
+            className={cx(
+              itemStyles['item__navbar-right'],
+              itemStyles['item__navbar-right--dark'],
+              darkMode,
+            )}
+          >
             <h2>WELCOME {authUser?.name || 'USER_NAME'}</h2>
-            <div className="item__icons">
+            <div className={itemStyles.item__icons}>
               <Nav className="ml-auto">
-                <Nav.Link as={Link} to="/bidding" className="item__nav-link">
-                  <BsChat className="item__nav-icon" />
+                <Nav.Link
+                  as={Link}
+                  to="/lbdashboard/messaging"
+                  className={cx(
+                    itemStyles['item__nav-link'],
+                    itemStyles['item__nav-link--dark'],
+                    darkMode,
+                  )}
+                >
+                  <BsChat className={itemStyles['item__nav-icon']} />
                 </Nav.Link>
-                <Nav.Link as={Link} to="/bidding" className="item__nav-link">
-                  <IoNotificationsOutline className="item__nav-icon" />
+                <Nav.Link
+                  as={Link}
+                  to="/lbdashboard/bidding"
+                  className={cx(
+                    itemStyles['item__nav-link'],
+                    itemStyles['item__nav-link--dark'],
+                    darkMode,
+                  )}
+                >
+                  <IoNotificationsOutline className={itemStyles['item__nav-icon']} />
                 </Nav.Link>
-                <Nav.Link as={Link} to="/bidding" className="item__nav-link">
-                  <FiUser className="item__nav-icon" />
+                <Nav.Link
+                  as={Link}
+                  to={authUser?.userid ? `/userprofile/${authUser.userid}` : '/'}
+                  className={cx(
+                    itemStyles['item__nav-link'],
+                    itemStyles['item__nav-link--dark'],
+                    darkMode,
+                  )}
+                >
+                  <FiUser className={itemStyles['item__nav-icon']} />
                 </Nav.Link>
               </Nav>
             </div>
diff --git a/src/components/LBDashboard/Home/Home.jsx b/src/components/LBDashboard/Home/Home.jsx
index 7505916507..c67db69aec 100644
--- a/src/components/LBDashboard/Home/Home.jsx
+++ b/src/components/LBDashboard/Home/Home.jsx
@@ -22,7 +22,7 @@ import {
 import { BsSliders } from 'react-icons/bs';
 import { MapContainer, TileLayer, Marker, Popup } from 'react-leaflet';
 import 'leaflet/dist/leaflet.css';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import L from 'leaflet';
 import logo from '../../../assets/images/logo2.png';
 import { fetchVillages, fetchListings, fetchBiddings, FIXED_VILLAGES } from './data';
@@ -42,6 +42,51 @@ const unitIcon = new L.Icon({
   popupAnchor: [1, -34],
 });
 
+const VILLAGE_SUFFIX = 'village';
+
+const stripVillageSuffix = value => {
+  const input = String(value || '').trim();
+  if (!input) return '';
+  const lower = input.toLowerCase();
+  if (!lower.endsWith(VILLAGE_SUFFIX)) return input;
+  return input.slice(0, -VILLAGE_SUFFIX.length).trim();
+};
+
+const buildApiFilters = (selectedVillage, dateRange) => {
+  const filters = {};
+  if (selectedVillage) filters.village = selectedVillage;
+  if (dateRange.startDate) filters.availableFrom = dateRange.startDate;
+  if (dateRange.endDate) filters.availableTo = dateRange.endDate;
+  return filters;
+};
+
+const withVillageFallback = async (
+  fetcher,
+  currentPage,
+  pageSize,
+  filters,
+  selectedVillage,
+  villageFilterCandidates,
+) => {
+  let response = await fetcher(currentPage, pageSize, filters);
+  if (!selectedVillage || (response.items || []).length > 0) return response;
+
+  const fallbackVillages = villageFilterCandidates(selectedVillage).filter(
+    v => v !== filters.village,
+  );
+  for (const villageCandidate of fallbackVillages) {
+    const retryResponse = await fetcher(currentPage, pageSize, {
+      ...filters,
+      village: villageCandidate,
+    });
+    if ((retryResponse.items || []).length > 0) {
+      response = retryResponse;
+      break;
+    }
+  }
+  return response;
+};
+
 function Home() {
   const [viewMode, setViewMode] = useState('Grid');
   const [activeTab, setActiveTab] = useState('listings');
@@ -74,6 +119,28 @@ function Home() {
 
   const pageSizeOptions = [12, 24, 36, 48];
   const navigate = useHistory();
+  const location = useLocation();
+
+  const villageFilterCandidates = useCallback(village => {
+    const raw = String(village || '').trim();
+    if (!raw) return [];
+    const noSuffix = stripVillageSuffix(raw);
+    const withSuffix = `${noSuffix} Village`;
+    return Array.from(new Set([raw, noSuffix, withSuffix])).filter(Boolean);
+  }, []);
+
+  const normalizeVillageName = useCallback(
+    village => stripVillageSuffix(village).toLowerCase(),
+    [],
+  );
+
+  useEffect(() => {
+    const params = new URLSearchParams(location.search);
+    const village = params.get('village');
+    if (village) {
+      setSelectedVillage(village);
+    }
+  }, [location.search]);
 
   useEffect(() => {
     const fetchVillagesData = async () => {
@@ -106,69 +173,77 @@ function Home() {
   );
 
   useEffect(() => {
+    const loadListings = async filters => {
+      const listingsData = await withVillageFallback(
+        fetchListings,
+        pagination.currentPage,
+        pagination.pageSize,
+        filters,
+        selectedVillage,
+        villageFilterCandidates,
+      );
+      setAllListings(listingsData.items || []);
+      setPagination(prev => ({
+        ...prev,
+        totalPages: listingsData.pagination.totalPages || 1,
+      }));
+    };
+
+    const loadBiddings = async filters => {
+      const biddingsData = await withVillageFallback(
+        fetchBiddings,
+        pagination.currentPage,
+        pagination.pageSize,
+        filters,
+        selectedVillage,
+        villageFilterCandidates,
+      );
+      setAllBiddings(biddingsData.items || []);
+      setPagination(prev => ({
+        ...prev,
+        totalPages: biddingsData.pagination.totalPages || 1,
+      }));
+    };
+
     const fetchData = async () => {
       try {
         setIsLoading(true);
-
-        const filters = {};
-        if (selectedVillage) filters.village = selectedVillage;
-        if (dateRange.startDate) filters.availableFrom = dateRange.startDate;
-        if (dateRange.endDate) filters.availableTo = dateRange.endDate;
-
-        if (activeTab === 'listings') {
-          try {
-            const listingsData = await fetchListings(
-              pagination.currentPage,
-              pagination.pageSize,
-              filters,
-            );
-            setAllListings(listingsData.items || []);
-            console.log('fetching listings', listingsData.items);
-            setPagination(prev => ({
-              ...prev,
-              totalPages: listingsData.pagination.totalPages || 1,
-            }));
-          } catch (error) {
-            console.error('API Error (Listings):', error);
-            setError('Failed to fetch listings. Please try again later.');
-
-            setAllListings([]);
-          }
-        } else {
-          console.log('fetching biddings');
-          try {
-            const biddingsData = await fetchBiddings(
-              pagination.currentPage,
-              pagination.pageSize,
-              filters,
-            );
-
-            setAllBiddings(biddingsData.items || []);
-
-            setPagination(prev => ({
-              ...prev,
-              totalPages: biddingsData.pagination.totalPages || 1,
-            }));
-          } catch (error) {
-            console.error('API Error (Biddings):', error);
-            setError('Failed to fetch biddings. Please try again later.');
-
-            setAllBiddings([]);
-          }
-        }
+        const filters = buildApiFilters(selectedVillage, dateRange);
+        if (activeTab === 'listings') await loadListings(filters);
+        else await loadBiddings(filters);
 
         setIsLoading(false);
-      } catch (err) {
+      } catch (error) {
+        console.error(`API Error (${activeTab}):`, error);
+        if (activeTab === 'listings') setAllListings([]);
+        else setAllBiddings([]);
         setError('Failed to load data. Please try again later.');
         setIsLoading(false);
       }
     };
 
     fetchData();
-  }, [pagination.currentPage, pagination.pageSize, selectedVillage, dateRange, activeTab]);
-
-  const currentItems = activeTab === 'listings' ? allListings : allBiddings;
-  const allItems = activeTab === 'listings' ? allListings : allBiddings;
+  }, [
+    pagination.currentPage,
+    pagination.pageSize,
+    selectedVillage,
+    dateRange,
+    activeTab,
+    villageFilterCandidates,
+  ]);
+
+  const baseItems = activeTab === 'listings' ? allListings : allBiddings;
+  const currentItems = useMemo(() => {
+    if (!selectedVillage) return baseItems;
+    const selectedKey = normalizeVillageName(selectedVillage);
+    const strictMatches = baseItems.filter(
+      item => normalizeVillageName(item.village) === selectedKey,
+    );
+    // If backend returns unresolved village ids/names that do not match dropdown labels,
+    // avoid showing an empty page while data actually exists.
+    return strictMatches.length > 0 ? strictMatches : baseItems;
+  }, [baseItems, normalizeVillageName, selectedVillage]);
+  const allItems = currentItems;
 
   const handlePageChange = useCallback(
     newPage => {
@@ -397,7 +472,14 @@ function Home() {
                 onClick={() => handlePropertySelect(unit)}
               >
                 <div className={`${styles.lbPropertyImage}`}>
-                  <img src={unit.images[0]} alt={unit.title} />
+                  <img
+                    src={unit.images[0]}
+                    alt={unit.title}
+                    onError={e => {
+                      e.currentTarget.onerror = null;
+                      e.currentTarget.src = 'https://picsum.photos/seed/lb-fallback/600/400';
+                    }}
+                  />
                 </div>
                 <div className={`${styles.lbPropertyDetails}`}>
                   <div>
diff --git a/src/components/LBDashboard/Home/Home.module.css b/src/components/LBDashboard/Home/Home.module.css
index fd2bafa15b..50edf2a859 100644
--- a/src/components/LBDashboard/Home/Home.module.css
+++ b/src/components/LBDashboard/Home/Home.module.css
@@ -11,9 +11,6 @@
   transition: transform 0.3s ease;
 }
 
-.lbLogo img:hover {
-  transform: scale(1.05);
-}
 
 .lbOutsideContainer {
   width: 100%;
@@ -28,8 +25,9 @@
   margin: 0 auto;
   padding: 20px;
   background-color: #fff;
+
   /* border-radius: 8px; */
-  box-shadow: 0 2px 10px rgba(0,0,0,0.05);
+  box-shadow: 0 2px 10px rgb(0 0 0 / 5%);
 }
 
 /* Navbar Styling */
@@ -41,9 +39,10 @@
   align-items: center;
   padding: 0 20px;
   background-color: #9dd425;
+
   /* border-radius: 8px; */
   height: 60px;
-  box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+  box-shadow: 0 2px 10px rgb(0 0 0 / 10%);
 }
 
 .lbNavLeft {
@@ -274,13 +273,13 @@
   gap: 25px;
 }
 
-@media (max-width: 1100px) {
+@media (width <= 1100px) {
   .lbPropertiesContainer.lbGridView {
     grid-template-columns: repeat(2, 1fr);
   }
 }
 
-@media (max-width: 768px) {
+@media (width <= 768px) {
   .lbPropertiesContainer.lbGridView {
     grid-template-columns: 1fr;
   }
@@ -296,15 +295,16 @@
 .lbPropertyCard {
   background: #fff;
   border-radius: 8px;
-  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+  box-shadow: 0 2px 8px rgb(0 0 0 / 10%);
   overflow: hidden;
   transition: transform 0.3s, box-shadow 0.3s;
   cursor: pointer;
+  color: #1f2937;
 }
 
 .lbPropertyCard:hover {
   transform: translateY(-5px);
-  box-shadow: 0 5px 15px rgba(0,0,0,0.15);
+  box-shadow: 0 5px 15px rgb(0 0 0 / 15%);
 }
 
 .lbGridView .lbPropertyCard {
@@ -333,10 +333,6 @@
   transition: transform 0.5s;
 }
 
-.lbPropertyCard:hover .lbPropertyImage img {
-  transform: scale(1.05);
-}
-
 .lbListView .lbPropertyImage {
   width: 250px;
   height: 180px;
@@ -349,6 +345,8 @@
   flex-direction: column;
   justify-content: space-between;
   flex-grow: 1;
+  background: #fff;
+  color: #1f2937;
 }
 
 .lbListView .lbPropertyDetails {
@@ -361,17 +359,20 @@
   color: #2c4f3c;
   margin: 0 0 5px;
   font-size: 1.2rem;
+  text-shadow: none;
 }
 
 .lbPropertyDetails p {
   color: #666;
   margin: 0 0 10px;
+  text-shadow: none;
 }
 
 .lbPrice {
   font-weight: bold;
   color: #2c4f3c;
   font-size: 1.1rem;
+  text-shadow: none;
 }
 
 /* Loading and Error States */
@@ -419,8 +420,9 @@
   transition: all 0.3s;
 }
 
-.lbPaginationButton:hover:not(:disabled) {
-  background: #e0e0e0;
+.lbVillagePagination .lbPaginationButton {
+  padding: 5px 10px;
+  font-size: 14px;
 }
 
 .lbPaginationButton:disabled {
@@ -428,6 +430,10 @@
   cursor: not-allowed;
 }
 
+.lbPaginationButton:hover:not(:disabled) {
+  background: #e0e0e0;
+}
+
 .lbPaginationInfo {
   margin: 0 10px;
   color: #666;
@@ -450,11 +456,8 @@
 /* Modal Styles */
 .lbModalOverlay {
   position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
+  inset: 0;
+  background-color: rgb(0 0 0 / 50%);
   display: flex;
   justify-content: center;
   align-items: center;
@@ -472,15 +475,16 @@
   max-width: 800px;
   max-height: 90vh;
   overflow-y: auto;
-  box-shadow: 0 5px 20px rgba(0, 0, 0, 0.15);
-  animation: modalFadeIn 0.3s ease;
+  box-shadow: 0 5px 20px rgb(0 0 0 / 15%);
+  animation: modal-fade-in 0.3s ease;
 }
 
-@keyframes modalFadeIn {
+@keyframes modal-fade-in {
   from {
     opacity: 0;
     transform: translateY(-20px);
   }
+
   to {
     opacity: 1;
     transform: translateY(0);
@@ -719,11 +723,6 @@
   font-size: 14px;
 }
 
-.lbVillagePagination .lbPaginationButton {
-  padding: 5px 10px;
-  font-size: 14px;
-}
-
 .lbVillageChips {
   max-height: 300px;
   overflow-y: auto;
@@ -818,6 +817,14 @@
   object-fit: cover;
 }
 
+.lbLogo img:hover {
+  transform: scale(1.05);
+}
+
+.lbPropertyCard:hover .lbPropertyImage img {
+  transform: scale(1.05);
+}
+
 .lbPropertyDetailsInfo {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
@@ -903,7 +910,7 @@
 }
 
 /* Responsive Adjustments */
-@media (max-width: 768px) {
+@media (width <= 768px) {
   .lbNavbar {
     flex-direction: column;
     height: auto;
diff --git a/src/components/LBDashboard/Home/data.jsx b/src/components/LBDashboard/Home/data.jsx
index 2d774f1ccf..163a20d595 100644
--- a/src/components/LBDashboard/Home/data.jsx
+++ b/src/components/LBDashboard/Home/data.jsx
@@ -2,6 +2,8 @@ import { ENDPOINTS } from '~/utils/URL';
 import httpService from '../../../services/httpService';
 
 const API_BASE_URL = ENDPOINTS.LB_LISTINGS_BASE;
+const VILLAGES_URL = `${ENDPOINTS.APIEndpoint()}/villages`;
+const OBJECT_ID_REGEX = /^[a-f\d]{24}$/i;
 
 export const FIXED_VILLAGES = [
   'Earthbag',
@@ -14,7 +16,7 @@ export const FIXED_VILLAGES = [
   'City Center',
 ];
 
-const DEFAULT_IMAGE = 'https://via.placeholder.com/300x200?text=Unit';
+const DEFAULT_IMAGE = 'https://picsum.photos/seed/lb-unit/600/400';
 
 /**
  * Transform API listing to match the frontend data format
@@ -71,9 +73,9 @@ export const fetchVillages = async () => {
   try {
     ensureAuthentication();
 
-    const response = await httpService.get(`${API_BASE_URL}/villages`);
-
-    const apiVillages = response.data.data || [];
+    const response = await httpService.get(VILLAGES_URL);
+    const rawVillages = Array.isArray(response.data) ? response.data : response.data?.data || [];
+    const apiVillages = rawVillages.map(v => (typeof v === 'string' ? v : v?.name)).filter(Boolean);
 
     const allVillages = [...new Set([...FIXED_VILLAGES, ...apiVillages])];
 
@@ -99,17 +101,18 @@ export const fetchVillages = async () => {
 export const fetchListings = async (page = 1, size = 12, filters = {}) => {
   try {
     ensureAuthentication();
+    const headers = {
+      page: String(page),
+      size: String(size),
+    };
+    if (filters.availableFrom) headers.availableFrom = filters.availableFrom;
+    if (filters.availableTo) headers.availableTo = filters.availableTo;
+    // Backend expects village ObjectId in header; ignore display names.
+    if (filters.village && OBJECT_ID_REGEX.test(String(filters.village))) {
+      headers.village = String(filters.village);
+    }
 
-    const params = new URLSearchParams({
-      page,
-      size,
-    });
-
-    if (filters.village) params.append('village', filters.village);
-    if (filters.availableFrom) params.append('availableFrom', filters.availableFrom);
-    if (filters.availableTo) params.append('availableTo', filters.availableTo);
-
-    const response = await httpService.get(`${API_BASE_URL}/listing?${params.toString()}`);
+    const response = await httpService.get(`${API_BASE_URL}/listings`, { headers });
 
     const responseData = response.data;
     const items = responseData.data?.items || responseData.items || [];
@@ -156,17 +159,17 @@ export const fetchListings = async (page = 1, size = 12, filters = {}) => {
 export const fetchBiddings = async (page = 1, size = 12, filters = {}) => {
   try {
     ensureAuthentication();
+    const headers = {
+      page: String(page),
+      size: String(size),
+    };
+    if (filters.availableFrom) headers.availableFrom = filters.availableFrom;
+    if (filters.availableTo) headers.availableTo = filters.availableTo;
+    if (filters.village && OBJECT_ID_REGEX.test(String(filters.village))) {
+      headers.village = String(filters.village);
+    }
 
-    const params = new URLSearchParams({
-      page,
-      size,
-    });
-
-    if (filters.village) params.append('village', filters.village);
-    if (filters.availableFrom) params.append('availableFrom', filters.availableFrom);
-    if (filters.availableTo) params.append('availableTo', filters.availableTo);
-
-    const response = await httpService.get(`${API_BASE_URL}/biddings?${params.toString()}`);
+    const response = await httpService.get(`${API_BASE_URL}/biddings`, { headers });
 
     const responseData = response.data;
     const items = responseData.data?.items || responseData.items || [];
diff --git a/src/components/LBDashboard/Messaging/LBMessaging.jsx b/src/components/LBDashboard/Messaging/LBMessaging.jsx
index 46a048d089..3be697ca1b 100644
--- a/src/components/LBDashboard/Messaging/LBMessaging.jsx
+++ b/src/components/LBDashboard/Messaging/LBMessaging.jsx
@@ -1,17 +1,18 @@
-import { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef, useMemo, useCallback } from 'react';
+import { useLocation, useHistory } from 'react-router-dom';
 import styles from './LBMessaging.module.css';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faBell, faLocationArrow, faSearch } from '@fortawesome/free-solid-svg-icons';
 import { useDispatch, useSelector } from 'react-redux';
-import { getUserProfileBasicInfo } from '../../../actions/userManagement';
+import { getUserProfileBasicInfo } from '~/actions/userManagement';
 import {
   fetchUserPreferences,
   updateUserPreferences,
-} from '../../../actions/lbdashboard/userPreferenceActions';
+} from '~/actions/lbdashboard/userPreferenceActions';
 import { toast } from 'react-toastify';
-import { fetchExistingChats, fetchMessages } from '../../../actions/lbdashboard/messagingActions';
+import { fetchExistingChats, fetchMessages } from '~/actions/lbdashboard/messagingActions';
 import axios from 'axios';
-import { ENDPOINTS } from '../../../utils/URL';
+import { ENDPOINTS } from '~/utils/URL';
 import {
   initMessagingSocket,
   getMessagingSocket,
@@ -19,113 +20,12 @@ import {
   markMessagesAsReadViaSocket,
 } from '../../../utils/messagingSocket';
 import logo from '../../../assets/images/logo2.png';
-import Header from '../../Header/Header';
-
-const DEFAULT_PROFILE_PICTURE = '/pfp-default-header.png';
-
-function MessagingContactItem({ user, contactNameClassName, onSelect }) {
-  return (
-    <div
-      key={user.userId || user._id}
-      className={styles.lbMessagingContact}
-      role="button"
-      tabIndex={0}
-      onClick={() => onSelect(user)}
-      onKeyDown={event => {
-        if (event.key === 'Enter' || event.key === ' ') {
-          onSelect(user);
-        }
-      }}
-    >
-      <img
-        src={user.profilePic || DEFAULT_PROFILE_PICTURE}
-        alt="User Profile"
-        onError={event => {
-          event.target.onerror = null;
-          event.target.src = DEFAULT_PROFILE_PICTURE;
-        }}
-      />
-      <div className={styles.lbMessagingContactInfo}>
-        <div className={contactNameClassName}>
-          {user.firstName} {user.lastName}
-        </div>
-      </div>
-    </div>
-  );
-}
-
-function MessagingContactsPanel({
-  isSearchOpen,
-  placeholder,
-  searchQuery,
-  onSearchChange,
-  onToggleSearch,
-  searchResults,
-  existingChats,
-  onSelectUser,
-  headerClassName,
-  bodyClassName,
-  contactNameClassName,
-  searchIconClassName,
-}) {
-  const visibleUsers = isSearchOpen ? searchResults : existingChats;
-
-  return (
-    <>
-      {isSearchOpen ? (
-        <div className={headerClassName}>
-          <input
-            type="text"
-            placeholder={placeholder}
-            className={`lb-search-input ${styles.lbSearchInput}`}
-            value={searchQuery}
-            onChange={onSearchChange}
-          />
-          <div
-            role="button"
-            tabIndex={0}
-            onClick={onToggleSearch}
-            onKeyDown={event => {
-              if (event.key === 'Enter' || event.key === ' ') {
-                onToggleSearch();
-              }
-            }}
-          >
-            <img
-              src="https://img.icons8.com/metro/26/multiply.png"
-              alt="multiply"
-              className="lb-msg-icon"
-            />
-          </div>
-        </div>
-      ) : (
-        <div className={headerClassName}>
-          <h3 className={`lb-contact-msgs ${styles.lbContactMsgs}`}>Messages</h3>
-          <div className={searchIconClassName}>
-            <FontAwesomeIcon icon={faSearch} className="lb-msg-icon" onClick={onToggleSearch} />
-          </div>
-        </div>
-      )}
-      <div className={bodyClassName}>
-        {visibleUsers.length === 0 ? (
-          <p>No chats available.</p>
-        ) : (
-          visibleUsers.map(user => (
-            <MessagingContactItem
-              key={user.userId || user._id}
-              user={user}
-              contactNameClassName={contactNameClassName}
-              onSelect={onSelectUser}
-            />
-          ))
-        )}
-      </div>
-    </>
-  );
-}
 
 export default function LBMessaging() {
   const dispatch = useDispatch();
+  const location = useLocation();
+  const history = useHistory();
+  const darkMode = useSelector(state => state.theme.darkMode);
   const [selectedUser, updateSelectedUser] = useState({});
   const [searchQuery, setSearchQuery] = useState('');
   const [messageText, setMessageText] = useState('');
@@ -136,34 +36,38 @@ export default function LBMessaging() {
 
   const [bellDropdownActive, setBellDropdownActive] = useState(false);
   const [showContacts, setShowContacts] = useState(false);
-  const [notificationSettings, setNotificationSettings] = useState({
-    notifyInApp: false,
-    notifyEmail: false,
-    notifySms: false,
-    smsPhone: '',
-    smsPhoneMasked: '',
-  });
+  const [selectedOption, setSelectedOption] = useState({});
   const messageEndRef = useRef(null);
   const menuRef = useRef(null);
-  const lastSendAtRef = useRef(0);
-  const lastMessageRef = useRef('');
-  const lastNotificationCountRef = useRef(0);
-
-  const users = useSelector(state => state.allUserProfilesBasicInfo) || {
-    userProfilesBasicInfo: [],
-  };
-  const userProfilesBasicInfo = users.userProfilesBasicInfo || [];
-  const auth = useSelector(state => state.auth.user) || {};
-  const authUserId = auth?.userid || auth?.userId || auth?._id;
-  const messagesState = useSelector(state => state.messages) || {};
-  const existingChats = messagesState.existingChats || [];
-  const {
-    messages = [],
-    loading: messagesLoading = false,
-    notifications = [],
-    error,
-  } = messagesState;
-  const unreadNotificationsCount = notifications.length;
+  const appliedListingSelectionRef = useRef(null);
+
+  const users = useSelector(state => state.allUserProfilesBasicInfo);
+  const wishlists = useSelector(state => state.wishlistItem?.wishlists);
+  const auth = useSelector(state => state.auth.user);
+  const currentUserId = auth?.userid ?? auth?.userId ?? auth?._id;
+  const messagesState = useSelector(state => state.messages) ?? {};
+  const existingChats = Array.isArray(messagesState.existingChats)
+    ? messagesState.existingChats
+    : [];
+  const messages = Array.isArray(messagesState.messages) ? messagesState.messages : [];
+  const messagesLoading = messagesState.loading ?? false;
+  const safeSearchResults = Array.isArray(searchResults) ? searchResults : [];
+
+  const sidebarContacts = useMemo(() => {
+    const chats = [...existingChats];
+    const sid = selectedUser?.userId;
+    if (!sid) return chats;
+    const exists = chats.some(c => String(c.userId ?? c._id) === String(sid));
+    if (!exists) {
+      chats.unshift({
+        userId: sid,
+        firstName: selectedUser.firstName,
+        lastName: selectedUser.lastName,
+        profilePic: selectedUser.profilePic,
+      });
+    }
+    return chats;
+  }, [existingChats, selectedUser]);
 
   useEffect(() => {
     if (messageEndRef.current) {
@@ -171,26 +75,20 @@ export default function LBMessaging() {
     }
   }, [messages]);
 
-  useEffect(() => {
-    if (error) {
-      toast.error(error);
-    }
-  }, [error]);
-
   const searchUserProfiles = async query => {
     try {
       const { data } = await axios.get(`${ENDPOINTS.LB_SEARCH_USERS}?query=${query}`);
-      setSearchResults(data);
+      setSearchResults(Array.isArray(data) ? data : []);
     } catch (error) {
       Error('Error searching user profiles:', error);
     }
   };
 
   useEffect(() => {
-    if (userProfilesBasicInfo.length === 0) {
+    if ((users?.userProfilesBasicInfo?.length ?? 0) === 0) {
       dispatch(getUserProfileBasicInfo());
     }
-  }, [dispatch, userProfilesBasicInfo, authUserId]);
+  }, [dispatch, users?.userProfilesBasicInfo?.length, currentUserId]);
 
   useEffect(() => {
     const token = localStorage.getItem('token');
@@ -202,7 +100,7 @@ export default function LBMessaging() {
         socket.close();
       }
     };
-  }, [authUserId]);
+  }, [currentUserId]);
 
   useEffect(() => {
     if (selectedUser.userId) {
@@ -223,49 +121,33 @@ export default function LBMessaging() {
   }, [selectedUser]);
 
   useEffect(() => {
-    if (authUserId) {
-      dispatch(fetchExistingChats(authUserId));
+    if (currentUserId) {
+      dispatch(fetchExistingChats(currentUserId));
     }
-  }, [dispatch, authUserId]);
+  }, [dispatch, currentUserId]);
 
   useEffect(() => {
-    if (!authUserId) {
-      setNotificationSettings({
+    if (selectedUser.userId) {
+      dispatch(fetchUserPreferences(currentUserId, selectedUser.userId)).then(response => {
+        if (response) {
+          setSelectedOption({
+            notifyInApp: response.notifyInApp || false,
+            notifyEmail: response.notifyEmail || false,
+          });
+        } else {
+          setSelectedOption({
+            notifyInApp: false,
+            notifyEmail: false,
+          });
+        }
+      });
+    } else {
+      setSelectedOption({
         notifyInApp: false,
         notifyEmail: false,
-        notifySms: false,
-        smsPhone: '',
       });
-      return;
     }
-
-    dispatch(fetchUserPreferences(authUserId, null)).then(response => {
-      if (response) {
-        setNotificationSettings({
-          notifyInApp: response.notifyInApp || false,
-          notifyEmail: response.notifyEmail || false,
-          notifySms: response.notifySms || false,
-          smsPhone: '',
-          smsPhoneMasked: response.smsPhoneMasked || getMaskedPhone(response.smsPhone) || '',
-        });
-      } else {
-        setNotificationSettings({
-          notifyInApp: false,
-          notifyEmail: false,
-          notifySms: false,
-          smsPhone: '',
-          smsPhoneMasked: '',
-        });
-      }
-    });
-  }, [dispatch, authUserId]);
-
-  useEffect(() => {
-    if (notifications.length > lastNotificationCountRef.current) {
-      toast.info('New message received.');
-    }
-    lastNotificationCountRef.current = notifications.length;
-  }, [notifications]);
+  }, [dispatch, currentUserId, selectedUser.userId]);
 
   useEffect(() => {
     const handleClickOutside = event => {
@@ -280,133 +162,130 @@ export default function LBMessaging() {
     };
   }, []);
 
-  const updateSelection = user => {
-    const newSelectedUser = {
-      userId: user.userId || user._id,
-      firstName: user.firstName,
-      lastName: user.lastName,
-      profilePic: user.profilePic || '/pfp-default-header.png',
-    };
-
-    updateSelectedUser(newSelectedUser);
-
-    if (newSelectedUser.userId) {
-      if (authUserId) {
-        dispatch(fetchMessages(authUserId, newSelectedUser.userId));
+  const updateSelection = useCallback(
+    user => {
+      const newSelectedUser = {
+        userId: user.userId || user._id,
+        firstName: user.firstName,
+        lastName: user.lastName,
+        profilePic: user.profilePic || '/pfp-default-header.png',
+      };
+
+      updateSelectedUser(newSelectedUser);
+
+      if (newSelectedUser.userId && currentUserId) {
+        dispatch(fetchMessages(currentUserId, newSelectedUser.userId));
+      } else if (!newSelectedUser.userId) {
+        toast.error('Invalid user selected. Please try again.');
       }
-    } else {
-      Error('Invalid user selected:', user);
-      toast.error('Invalid user selected. Please try again.');
-    }
-  };
+    },
+    [currentUserId, dispatch],
+  );
 
-  const persistNotificationPreferences = () => {
-    if (!authUserId) {
-      toast.error('Unable to update preferences without a valid user.');
-      return Promise.reject(new Error('Missing user ID'));
-    }
-    const cleanedPhone = notificationSettings.smsPhone.replace(/[^\d+]/g, '');
-    const digits = cleanedPhone.replace(/\D/g, '');
-    if (notificationSettings.notifySms && digits.length > 0 && digits.length !== 10) {
-      toast.error('Please enter a valid 10-digit phone number for SMS notifications.');
-      return Promise.reject(new Error('Invalid phone number'));
+  useEffect(() => {
+    const params = new URLSearchParams(location.search);
+    const listingId = params.get('listingId');
+    if (!listingId) {
+      appliedListingSelectionRef.current = null;
+      return;
     }
+    if (!wishlists?.length || !currentUserId) return;
 
-    const payload = {
-      notifyInApp: notificationSettings.notifyInApp,
-      notifyEmail: notificationSettings.notifyEmail,
-      notifySms: notificationSettings.notifySms,
-    };
-    if (digits.length > 0) {
-      payload.smsPhone = cleanedPhone;
-    }
+    const wishItem = wishlists.find(w => String(w.id) === String(listingId));
+    const host = wishItem?.host;
+    if (!host?.userId) return;
 
-    return dispatch(updateUserPreferences(authUserId, null, payload)).then(() => {
-      // Refresh preferences after saving
-      return dispatch(fetchUserPreferences(authUserId, null)).then(response => {
-        const refreshed = response?.payload || response;
-        if (refreshed) {
-          setNotificationSettings(prev => ({
-            ...prev,
-            notifyInApp: refreshed.notifyInApp || false,
-            notifyEmail: refreshed.notifyEmail || false,
-            notifySms: refreshed.notifySms || false,
-            smsPhoneMasked: refreshed.smsPhoneMasked || getMaskedPhone(refreshed.smsPhone) || '',
-          }));
-        }
-      });
+    if (appliedListingSelectionRef.current === listingId) return;
+    appliedListingSelectionRef.current = listingId;
+
+    const profiles = users?.userProfilesBasicInfo ?? [];
+    const matched = profiles.find(p => String(p._id) === String(host.userId));
+
+    updateSelection({
+      userId: host.userId,
+      firstName: matched?.firstName ?? host.firstName,
+      lastName: matched?.lastName ?? host.lastName,
+      profilePic: matched?.profilePic || host.profilePic || '/pfp-default-header.png',
     });
-  };
+
+    params.delete('listingId');
+    const nextSearch = params.toString();
+    history.replace({
+      pathname: location.pathname,
+      search: nextSearch ? `?${nextSearch}` : '',
+      hash: location.hash,
+    });
+  }, [
+    location.search,
+    location.pathname,
+    location.hash,
+    wishlists,
+    users?.userProfilesBasicInfo,
+    currentUserId,
+    updateSelection,
+    history,
+  ]);
+
+  useEffect(() => {
+    const uid = selectedUser?.userId;
+    if (!uid) return;
+    const profiles = users?.userProfilesBasicInfo ?? [];
+    if (!profiles.length) return;
+    const matched = profiles.find(p => String(p._id) === String(uid));
+    if (!matched) return;
+    updateSelectedUser(prev => {
+      const nextPic = matched.profilePic || prev.profilePic;
+      const nextFirst = matched.firstName ?? prev.firstName;
+      const nextLast = matched.lastName ?? prev.lastName;
+      if (
+        prev.firstName === nextFirst &&
+        prev.lastName === nextLast &&
+        prev.profilePic === nextPic
+      ) {
+        return prev;
+      }
+      return {
+        ...prev,
+        firstName: nextFirst,
+        lastName: nextLast,
+        profilePic: nextPic,
+      };
+    });
+  }, [users?.userProfilesBasicInfo, selectedUser?.userId]);
 
   const saveUserPreferences = () => {
-    persistNotificationPreferences()
+    dispatch(updateUserPreferences(currentUserId, selectedUser.userId, selectedOption))
       .then(() => {
         toast.success('Preferences updated successfully!');
         setBellDropdownActive(false);
-      })
-      .catch(error => {
-        if (error?.message !== 'Missing user ID' && error?.message !== 'Invalid phone number') {
-          toast.error('Failed to update preferences. Please try again.');
-        }
-        Error('Error updating preferences:', error);
-      });
-  };
 
-  const saveSmsPreferences = () => {
-    if (!authUserId) {
-      toast.error('Unable to update SMS settings without a valid user.');
-      return;
-    }
-
-    persistNotificationPreferences()
-      .then(() => {
-        toast.success('SMS settings updated successfully!');
+        // Refresh preferences after saving
+        dispatch(fetchUserPreferences(currentUserId, selectedUser.userId)).then(response => {
+          if (response && response.payload) {
+            setSelectedOption({
+              notifyInApp: response.payload.notifyInApp || false,
+              notifyEmail: response.payload.notifyEmail || false,
+            });
+          }
+        });
       })
       .catch(error => {
-        if (error?.message !== 'Missing user ID' && error?.message !== 'Invalid phone number') {
-          toast.error('Failed to update SMS settings. Please try again.');
-        }
-        Error('Error updating SMS settings:', error);
+        toast.error('Failed to update preferences. Please try again.');
+        Error('Error updating preferences:', error);
       });
   };
 
   const handleSendMessage = () => {
     const socket = getMessagingSocket();
-    const trimmedMessage = messageText.trim();
-    if (!selectedUser.userId) {
-      toast.error('Select a user before sending a message.');
-      return;
-    }
-    if (!trimmedMessage) {
-      toast.error('Message cannot be empty.');
-      return;
-    }
-    if (trimmedMessage.length > 1000) {
-      toast.error('Message is too long. Please keep it under 1000 characters.');
-      return;
-    }
-
-    const now = Date.now();
-    if (now - lastSendAtRef.current < 1500) {
-      toast.error('You are sending messages too quickly. Please wait a moment.');
-      return;
-    }
-    if (trimmedMessage === lastMessageRef.current && now - lastSendAtRef.current < 10000) {
-      toast.error('Please avoid sending duplicate messages.');
-      return;
-    }
-
     if (socket && socket.readyState === WebSocket.OPEN) {
       socket.send(
         JSON.stringify({
           action: 'SEND_MESSAGE',
           receiver: selectedUser.userId,
-          content: trimmedMessage,
+          content: messageText.trim(),
         }),
       );
       setMessageText('');
-      lastSendAtRef.current = now;
-      lastMessageRef.current = trimmedMessage;
     } else {
       toast.error('WebSocket is not connected. Please try again later.');
       Error('WebSocket is not connected or is in an invalid state:', socket);
@@ -434,72 +313,74 @@ export default function LBMessaging() {
     return () => window.removeEventListener('resize', handleResize);
   }, []);
 
-  const getMaskedPhone = phone => {
-    if (!phone) return '';
-    const digits = phone.replace(/\D/g, '');
-    if (digits.length <= 4) {
-      return digits;
+  const renderContacts = () => {
+    if (sidebarContacts.length === 0) {
+      return (
+        <p className={styles.sidebarHint}>No contacts yet. Use the search icon to find someone.</p>
+      );
     }
-    const lastFour = digits.slice(-4);
-    return `••• ••• ${lastFour}`;
-  };
 
-  const maskSensitiveText = text => {
-    if (!text) return '';
-    return text.replace(/(\+?\d[\d\s().-]{6,}\d)/g, match => {
-      const digits = match.replace(/\D/g, '');
-      if (digits.length < 8) return match;
-      const lastFour = digits.slice(-4);
-      return `••• ••• ${lastFour}`;
-    });
+    return sidebarContacts.map(user => (
+      <button
+        key={user.userId || user._id}
+        type="button"
+        className={`${styles.lbMessagingContact}`}
+        onClick={() => {
+          updateSelection(user);
+          setMobileHamMenu(false);
+        }}
+      >
+        <img
+          src={user.profilePic || '/pfp-default-header.png'}
+          alt="User Profile"
+          onError={e => {
+            e.target.onerror = null;
+            e.target.src = '/pfp-default-header.png';
+          }}
+        />
+        <div className={`${styles.lbMessagingContactInfo}`}>
+          <div className={`${styles.lbMessagingContactName} ${mobileView ? styles.black : ''}`}>
+            {user.firstName} {user.lastName}
+          </div>
+        </div>
+      </button>
+    ));
   };
 
   const renderChatMessages = () => {
     if (messagesLoading) {
-      return <p className={styles.lbNoMsgText}>Loading messages...</p>;
+      return <p className={`${styles.lbNoMsgText}`}>Loading messages...</p>;
     }
 
     if (messages.length === 0) {
-      return <p className={styles.lbNoMsgText}>No messages to display.</p>;
-    }
-
-    const uniqueMessages = [];
-    const seenKeys = new Set();
-    for (const message of messages) {
-      const key =
-        message._id ||
-        `${message.sender}-${message.receiver}-${message.timestamp}-${message.content}`;
-      if (!seenKeys.has(key)) {
-        seenKeys.add(key);
-        uniqueMessages.push(message);
-      }
+      return <p className={`${styles.lbNoMsgText}`}>No messages to display.</p>;
     }
 
-    const filteredMessages = uniqueMessages.filter(
+    const filteredMessages = messages.filter(
       message =>
-        (message.sender === authUserId && message.receiver === selectedUser.userId) ||
-        (message.sender === selectedUser.userId && message.receiver === authUserId),
+        (message.sender === currentUserId && message.receiver === selectedUser.userId) ||
+        (message.sender === selectedUser.userId && message.receiver === currentUserId),
     );
 
     if (filteredMessages.length === 0) {
-      return <p className={styles.lbNoMsgText}>No messages to display.</p>;
+      return <p className={`${styles.lbNoMsgText}`}>No messages to display.</p>;
     }
 
     return (
-      <div className={styles.messageList}>
-        <div className={styles.messageSpacer} />
+      <div className={`${styles.messageList}`}>
+        <div className={`${styles.messageSpacer}`} />
         {filteredMessages.map(message => (
           <div
             key={message._id || message.timestamp}
             className={`${styles.messageItem} ${
-              message.sender === authUserId ? styles.sent : styles.received
+              message.sender === currentUserId ? styles.sent : styles.received
             }`}
           >
-            <p className={styles.messageText}>
-              {maskSensitiveText(message.content)
+            <p className={`${styles.messageText}`}>
+              {String(message.content ?? '')
                 .split('\n')
-                .map(line => (
-                  <span key={message._id + line}>
+                .map((line, lineIdx) => (
+                  <span key={`${message._id || message.timestamp}-${lineIdx}`}>
                     {line}
                     <br />
                   </span>
@@ -512,241 +393,289 @@ export default function LBMessaging() {
     );
   };
 
-  const handleSearchChange = event => {
-    const query = event.target.value;
-    setSearchQuery(query);
-    if (query.trim() !== '') {
-      searchUserProfiles(query);
-      return;
-    }
-    setSearchResults([]);
-  };
-
-  const handleToggleContacts = () => {
-    setShowContacts(prev => !prev);
-  };
-
-  const handleSelectUser = user => {
-    updateSelection(user);
-    setMobileHamMenu(false);
-  };
-
   return (
-    userProfilesBasicInfo.length !== 0 && (
-      <div className={`main-container ${styles.mainContainer}`}>
-        <Header />
-        <div className={`logo-container ${styles.logoContainer}`}>
-          <img src={logo} alt="One Community Logo" />
-        </div>
-        <div className={`content-container ${styles.contentContainer}`}>
-          <div className={`container-top msg ${styles.containerTop} ${styles.msg}`}>
-            {mobileView && (
-              <div className={`lb-mobile-messaging-menu ${styles.lbMobileMessagingMenu}`}>
-                <div className={`lb-mobile-header ${styles.lbMobileHeader}`}>
-                  <button
-                    type="button"
-                    className="lb-ham-btn"
-                    onClick={() => setMobileHamMenu(prev => !prev)}
-                  >
-                    ☰
-                  </button>
-                  {mobileHamMenu && (
-                    <div
-                      className={`lb-mobile-ham-menu ${styles.lbMobileContactsPanel}`}
-                      ref={menuRef}
+    (users?.userProfilesBasicInfo?.length ?? 0) !== 0 && (
+      <div className={`${darkMode ? styles.darkMode : ''}`}>
+        <div className={`${styles.mainContainer}`}>
+          <div className={`${styles.logoContainer}`}>
+            <img src={logo} alt="One Community Logo" />
+          </div>
+          <div className={`${styles.contentContainer}`}>
+            {mobileView ? (
+              <div className={`${styles.containerTop} ${styles.msg}`}>
+                <div className={`${styles.lbMobileMessagingMenu}`}>
+                  <div className={`${styles.lbMobileHeader}`}>
+                    <button
+                      type="button"
+                      className={`${styles.lbHamBtn}`}
+                      onClick={() => setMobileHamMenu(prev => !prev)}
                     >
-                      <div className="lb-mobile-ham-menu-header">
-                        <MessagingContactsPanel
-                          isSearchOpen={showContacts}
-                          placeholder={placeholder}
-                          searchQuery={searchQuery}
-                          onSearchChange={handleSearchChange}
-                          onToggleSearch={handleToggleContacts}
-                          searchResults={searchResults}
-                          existingChats={existingChats}
-                          onSelectUser={handleSelectUser}
-                          headerClassName={`lb-messaging-contacts-header-mobile ${styles.lbMessagingContactsHeaderMobile}`}
-                          bodyClassName="lb-messaging-contacts-body active"
-                          contactNameClassName={`${styles.lbMessagingContactName} ${styles.black}`}
-                          searchIconClassName="lb-messaging-search-icons-mobile"
+                      ☰
+                    </button>
+                    {mobileHamMenu && (
+                      <div className={`${styles.lbMobileHamMenu}`} ref={menuRef}>
+                        <div className={`${styles.lbMobileHamMenuHeader}`}>
+                          {showContacts ? (
+                            <div className={`${styles.lbMessagingContactsHeaderMobile}`}>
+                              <input
+                                type="text"
+                                placeholder={placeholder}
+                                className={`${styles.lbSearchInput}`}
+                                value={searchQuery}
+                                onChange={e => {
+                                  const query = e.target.value;
+                                  setSearchQuery(query);
+                                  if (query.trim() !== '') {
+                                    searchUserProfiles(query);
+                                  } else {
+                                    setSearchResults([]);
+                                  }
+                                }}
+                              />
+                              <button
+                                type="button"
+                                onClick={() => setShowContacts(prev => !prev)}
+                                className={`${styles.lbMsgIconBtn}`} // you can reuse or define styles here
+                              >
+                                <img
+                                  src="https://img.icons8.com/metro/26/multiply.png"
+                                  alt="Close"
+                                  className={`${styles.lbMsgIcon}`}
+                                />
+                              </button>
+                            </div>
+                          ) : (
+                            <div className={`${styles.lbMessagingContactsHeaderMobile}`}>
+                              <h3 className={`${styles.lbContactMsgs}`}>Messages</h3>
+                              <div className={`${styles.lbMessagingSearchIconsMobile}`}>
+                                <FontAwesomeIcon
+                                  icon={faSearch}
+                                  className={`${styles.lbMsgIconMobile}`}
+                                  onClick={() => setShowContacts(prev => !prev)}
+                                />
+                              </div>
+                            </div>
+                          )}
+                          <div
+                            className={`${styles.lbMessagingContactsBody} ${styles.activeInlbMessagingContactsBody}`}
+                          >
+                            {showContacts
+                              ? safeSearchResults.map(user => (
+                                  <button
+                                    key={user.userId}
+                                    type="button"
+                                    className={`${styles.lbMessagingContact}`}
+                                    onClick={() => {
+                                      updateSelection(user);
+                                      setMobileHamMenu(false);
+                                    }}
+                                  >
+                                    <img
+                                      src={user.profilePic || '/pfp-default-header.png'}
+                                      alt="User Profile"
+                                      onError={e => {
+                                        e.target.onerror = null;
+                                        e.target.src = '/pfp-default-header.png';
+                                      }}
+                                    />
+                                    <div className={`${styles.lbMessagingContactInfo}`}>
+                                      <div
+                                        className={`${styles.lbMessagingContactName} ${
+                                          mobileView ? styles.black : ''
+                                        }`}
+                                      >
+                                        {user.firstName} {user.lastName}
+                                      </div>
+                                    </div>
+                                  </button>
+                                ))
+                              : renderContacts()}
+                          </div>
+                        </div>
+                      </div>
+                    )}
+                  </div>
+                </div>
+              </div>
+            ) : null}
+            <div className={`${styles.containerMainMsg}`}>
+              {/* Contacts Section */}
+              {!mobileView && (
+                <div className={`${styles.lbMessagingContacts}`}>
+                  {showContacts ? (
+                    <div className={`${styles.lbMessagingContactsHeader}`}>
+                      <input
+                        type="text"
+                        placeholder={placeholder}
+                        className={`${styles.lbSearchInput}`}
+                        value={searchQuery}
+                        onChange={e => {
+                          const query = e.target.value;
+                          setSearchQuery(query);
+                          if (query.trim() !== '') {
+                            searchUserProfiles(query);
+                          } else {
+                            setSearchResults([]);
+                          }
+                        }}
+                      />
+                      <button
+                        type="button"
+                        onClick={() => setShowContacts(prev => !prev)}
+                        className={`${styles.lbMsgIconBtn}`} // you can reuse or define styles here
+                      >
+                        <img
+                          src="https://img.icons8.com/metro/26/multiply.png"
+                          alt="Close"
+                          className={`${styles.lbMsgIcon}`}
+                        />
+                      </button>
+                    </div>
+                  ) : (
+                    <div className={`${styles.lbMessagingContactsHeader}`}>
+                      <h3 className={`${styles.lbContactMsgs}`}>Messages</h3>
+                      <div className={`${styles.lbMessagingSearchIcons}`}>
+                        <FontAwesomeIcon
+                          icon={faSearch}
+                          className={`${styles.lbMsgIcon}`}
+                          onClick={() => setShowContacts(prev => !prev)}
                         />
                       </div>
                     </div>
                   )}
+                  <div
+                    className={`${styles.lbMessagingContactsBody} ${styles.activeInlbMessagingContactsBody}`}
+                  >
+                    {showContacts
+                      ? safeSearchResults.map(user => (
+                          <button
+                            key={user._id}
+                            type="button"
+                            className={`${styles.lbMessagingContact}`}
+                            onClick={() => updateSelection(user)}
+                          >
+                            <img
+                              src={user.profilePic || '/pfp-default-header.png'}
+                              alt="User Profile"
+                              onError={e => {
+                                e.target.onerror = null;
+                                e.target.src = '/pfp-default-header.png';
+                              }}
+                            />
+                            <div className={`${styles.lbMessagingContactInfo}`}>
+                              <div className={`${styles.lbMessagingContactName}`}>
+                                {user.firstName} {user.lastName}
+                              </div>
+                            </div>
+                          </button>
+                        ))
+                      : renderContacts()}
+                  </div>
                 </div>
-              </div>
-            )}
-            <div className={`${styles.lbMessagingHeaderIcons} ${styles.lbTopBarBell}`}>
-              <button
-                type="button"
-                className={styles.lbTopBarMenuButton}
-                onClick={() => {
-                  setBellDropdownActive(prev => !prev);
-                }}
-              >
-                ☰
-              </button>
-              {bellDropdownActive && (
-                <div
-                  className={`${styles.lgMessagingBellSelectDropdown} ${
-                    bellDropdownActive ? styles.activeInlgMessagingBellSelectDropdown : ''
-                  }`}
-                >
-                  <div className={styles.lgMessagingSectionTitle}>Notification Settings</div>
-                  <label>
-                    <input
-                      type="checkbox"
-                      checked={notificationSettings.notifyInApp || false}
-                      onChange={e => {
-                        const isChecked = e.target.checked;
-                        setNotificationSettings(prev => ({
-                          ...prev,
-                          notifyInApp: isChecked,
-                        }));
-                      }}
-                    />
-                    In App
-                  </label>
-                  <label>
-                    <input
-                      type="checkbox"
-                      checked={notificationSettings.notifyEmail || false}
-                      onChange={e => {
-                        const isChecked = e.target.checked;
-                        setNotificationSettings(prev => ({
-                          ...prev,
-                          notifyEmail: isChecked,
-                        }));
-                      }}
-                    />
-                    Email
-                  </label>
-                  <div className={styles.lgMessagingDivider} />
-                  <div className={styles.lgMessagingSectionTitle}>SMS Notifications</div>
-                  <label className={styles.lgMessagingSmsCheckbox}>
-                    <input
-                      type="checkbox"
-                      checked={notificationSettings.notifySms}
-                      onChange={e => {
-                        const isChecked = e.target.checked;
-                        setNotificationSettings(prev => ({
-                          ...prev,
-                          notifySms: isChecked,
-                        }));
-                      }}
-                    />
-                    Enable SMS notifications
-                  </label>
-                  <div className={styles.lgMessagingSmsField}>
-                    <span className={styles.lgMessagingSmsLabel}>SMS Phone</span>
-                    <input
-                      type="tel"
-                      placeholder={notificationSettings.smsPhoneMasked || '+11234567890'}
-                      className={styles.lgMessagingSmsInput}
-                      value={notificationSettings.smsPhone}
-                      onChange={e => {
-                        const nextValue = e.target.value;
-                        setNotificationSettings(prev => ({
-                          ...prev,
-                          smsPhone: nextValue,
-                        }));
+              )}
+
+              {/* Chat Window Section */}
+              <div className={`${styles.lbMessagingMessageWindow}`}>
+                <div className={`${styles.lbMessagingMessageWindowHeader}`}>
+                  <div className={`${styles.lbMessagingHeaderIdentity}`}>
+                    <img
+                      src={selectedUser.profilePic || '/pfp-default-header.png'}
+                      onError={e => {
+                        e.target.onerror = null;
+                        e.target.src = '/pfp-default-header.png';
                       }}
+                      alt="Profile"
                     />
-                    {notificationSettings.smsPhoneMasked && (
-                      <span className={styles.lgMessagingSmsMask}>
-                        Saved as {notificationSettings.smsPhoneMasked}
-                      </span>
-                    )}
+                    <span className={`${styles.lbMessagingHeaderTitle}`}>
+                      {selectedUser.firstName
+                        ? `${selectedUser.firstName} ${selectedUser.lastName}`
+                        : 'Select a user to chat'}
+                    </span>
                   </div>
-                  <button
-                    type="button"
-                    className={`btn btn-secondary ${styles.lgMessagingSmsSaveButton}`}
-                    onClick={saveSmsPreferences}
-                  >
-                    Save SMS Settings
-                  </button>
-                  <button
-                    type="button"
-                    className={`btn btn-primary ${styles.lgMessagingSubmitButton}`}
-                    onClick={saveUserPreferences}
-                  >
-                    Save
-                  </button>
+                  {selectedUser.userId && (
+                    <div className={`${styles.lbMessagingHeaderIcons}`}>
+                      <FontAwesomeIcon
+                        icon={faBell}
+                        onClick={() => {
+                          setBellDropdownActive(prev => !prev);
+                        }}
+                        className={`${styles.lgMessagingNotificationBell}`}
+                      />
+                      {bellDropdownActive && (
+                        <div
+                          className={`${styles.lgMessagingBellSelectDropdown} ${
+                            bellDropdownActive ? styles.activeInlgMessagingBellSelectDropdown : ''
+                          }`}
+                        >
+                          <label>
+                            <input
+                              type="checkbox"
+                              checked={selectedOption.notifyInApp || false}
+                              onChange={e => {
+                                const isChecked = e.target.checked;
+                                setSelectedOption(prev => ({
+                                  ...prev,
+                                  notifyInApp: isChecked,
+                                }));
+                              }}
+                            />
+                            In App
+                          </label>
+                          <label>
+                            <input
+                              type="checkbox"
+                              checked={selectedOption.notifyEmail || false}
+                              onChange={e => {
+                                const isChecked = e.target.checked;
+                                setSelectedOption(prev => ({
+                                  ...prev,
+                                  notifyEmail: isChecked,
+                                }));
+                              }}
+                            />
+                            Email
+                          </label>
+                          <button
+                            type="button"
+                            //Todo: Need to fix color
+                            className={`${styles.lgMessagingSaveBtn}`}
+                            onClick={saveUserPreferences}
+                          >
+                            Save
+                          </button>
+                        </div>
+                      )}
+                    </div>
+                  )}
                 </div>
-              )}
-            </div>
-          </div>
-          <div className={`container-main-msg ${styles.containerMainMsg}`}>
-            {/* Contacts Section */}
-            {!mobileView && (
-              <div className="lb-messaging-contacts">
-                <MessagingContactsPanel
-                  isSearchOpen={showContacts}
-                  placeholder={placeholder}
-                  searchQuery={searchQuery}
-                  onSearchChange={handleSearchChange}
-                  onToggleSearch={handleToggleContacts}
-                  searchResults={searchResults}
-                  existingChats={existingChats}
-                  onSelectUser={handleSelectUser}
-                  headerClassName={`lb-messaging-contacts-header ${styles.lbMessagingContactsHeader}`}
-                  bodyClassName="lb-messaging-contacts-body active"
-                  contactNameClassName={styles.lbMessagingContactName}
-                  searchIconClassName="lb-messaging-search-icons"
-                />
-              </div>
-            )}
-
-            {/* Chat Window Section */}
-            <div className={`lb-messaging-message-window ${styles.lbMessagingMessageWindow}`}>
-              <div
-                className={`lb-messaging-message-window-header ${styles.lbMessagingMessageWindowHeader}`}
-              >
-                <div>
-                  <img
-                    src={selectedUser.profilePic || '/pfp-default-header.png'}
-                    onError={e => {
-                      e.target.onerror = null;
-                      e.target.src = '/pfp-default-header.png';
+                <div className={`${styles.lbMessagingMessageWindowBody}`}>
+                  {selectedUser.userId ? (
+                    renderChatMessages()
+                  ) : (
+                    <p className={`${styles.startMsg}`}>Select a user to start chatting</p>
+                  )}
+                </div>
+                <div className={`${styles.lbMessaingMessageWindowFooter}`}>
+                  <textarea
+                    type="text"
+                    placeholder="Type a message..."
+                    value={messageText}
+                    onChange={e => setMessageText(e.target.value)}
+                    onKeyDown={e => {
+                      if (e.key === 'Enter' && !e.shiftKey) {
+                        e.preventDefault();
+                        handleSendMessage();
+                      }
                     }}
-                    alt="Profile"
-                    className="m-1"
+                    className={`${styles.lbMessagingTextarea}`}
+                    disabled={!selectedUser.userId}
+                  />
+                  <FontAwesomeIcon
+                    icon={faLocationArrow}
+                    className={`${styles.sendButton}`}
+                    onClick={handleSendMessage}
                   />
-                  {selectedUser.firstName
-                    ? `${selectedUser.firstName} ${selectedUser.lastName}`
-                    : 'Select a user to chat'}
                 </div>
-                {selectedUser.userId && null}
-              </div>
-              <div className={styles.lbMessagingMessageWindowBody}>
-                {selectedUser.userId ? (
-                  renderChatMessages()
-                ) : (
-                  <p className={styles.startMsg}>Select a user to start chatting</p>
-                )}
-              </div>
-              <div
-                className={`lb-messaing-message-window-footer ${styles.lbMessagingMessageWindowFooter}`}
-              >
-                <textarea
-                  type="text"
-                  placeholder="Type a message..."
-                  value={messageText}
-                  onChange={e => setMessageText(e.target.value)}
-                  onKeyDown={e => {
-                    if (e.key === 'Enter' && !e.shiftKey) {
-                      e.preventDefault();
-                      handleSendMessage();
-                    }
-                  }}
-                  className={`lb-messaging-textarea ${styles.lbMessagingTextarea}`}
-                  disabled={!selectedUser.userId}
-                />
-                <FontAwesomeIcon
-                  icon={faLocationArrow}
-                  className={`send-button ${styles.sendButton}`}
-                  onClick={handleSendMessage}
-                />
               </div>
             </div>
           </div>
diff --git a/src/components/LBDashboard/Messaging/LBMessaging.module.css b/src/components/LBDashboard/Messaging/LBMessaging.module.css
index c693118a70..4b602a6ff9 100644
--- a/src/components/LBDashboard/Messaging/LBMessaging.module.css
+++ b/src/components/LBDashboard/Messaging/LBMessaging.module.css
@@ -1,34 +1,38 @@
 /* Main container styles */
 .containerMainMsg {
-  background-color: #e0e0e0;
+  background-color: #f0f0f0;
   display: flex;
   flex-direction: row;
-  justify-content: space-evenly;
-  margin: 20px 40px 30px 40px;
-  padding: 0;
-  width: auto;
-  min-height: 560px;
-  height: 560px;
   align-items: stretch;
+  flex: 1;
+  gap: 0;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  min-height: 480px;
+  min-width: 0;
 }
+
 .mainContainer {
   display: flex;
   flex-direction: column;
-  align-items: center;
+  align-items: stretch;
   background-color: #e0e0e0;
   width: 100%;
   min-height: 100vh;
-  padding: 0 20px 20px;
+  padding: 16px;
   overflow: hidden;
+  box-sizing: border-box;
 }
 
 .logoContainer {
   display: flex;
   justify-content: center;
   align-items: center;
-  padding: 20px 0;
+  flex-shrink: 0;
+  padding: 16px 0;
   background: #e5e5e5;
-  width: 100%
+  width: 100%;
 }
 
 .logoContainer img {
@@ -40,23 +44,31 @@
 .contentContainer {
   display: flex;
   flex-direction: column;
+  flex: 1;
   background-color: white;
   border: 1px solid #ccc;
   border-radius: 8px;
-  width: 85%;
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-  height: max-content;
+  width: 100%;
+  max-width: 1120px;
+  margin-left: auto;
+  margin-right: auto;
+  box-shadow: 0 4px 8px rgb(0 0 0 / 10%);
+  min-height: 0;
+  overflow: hidden;
 }
 
 /* Contacts section */
 .lbMessagingContacts {
   display: flex;
-  height: 100%;
   flex-direction: column;
-  width: 30%;
+  flex: 0 0 clamp(240px, 34%, 360px);
+  min-width: 220px;
+  max-width: 380px;
+  min-height: 0;
+  border-right: 1px solid #d8d8d8;
+  background-color: #ececec;
 }
 
-
 .containerTop {
   display: flex;
   justify-content: space-between;
@@ -73,12 +85,11 @@
 .lbMessagingContact {
   display: flex;
   align-items: center;
-  padding: 6px 8px;
+  padding: 8px;
   margin: 2px;
-  cursor: pointer;
   background-color: white;
   border-radius: 5px;
-  gap: 8px;
+  border-bottom: 1px solid #eee;
 }
 
 .lbMessagingContact:hover {
@@ -86,28 +97,29 @@
 }
 
 .lbMessagingContact img {
-  width: 28px;
-  height: 28px;
   border-radius: 50%;
-  object-fit: cover;
+  width: 40px;
+  height: 40px;
+  margin-right: 10px;
 }
 
 .lbMessagingContactInfo {
   display: flex;
   flex-direction: column;
-  font-size: 13px;
+  font-size: 10px;
   margin-top: auto;
   margin-bottom: auto;
 }
 
 .lbMessagingContactsHeader {
+  flex-shrink: 0;
   background-color: #8b8888;
-  height: 12.5%;
-  max-height: 70px;
+  min-height: 52px;
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 5px;
+  padding: 8px 10px;
+  box-sizing: border-box;
 }
 
 .lbMessagingContactsHeaderMobile {
@@ -121,7 +133,7 @@
 
 .lbMessagingSearchIconsMobile {
   height: 33px;
-  aspect-ratio: 1/1;
+  aspect-ratio: 1 / 1;
 }
 
 .lbMsgIconMobile {
@@ -147,93 +159,150 @@
 }
 
 .lbMessagingContactsBody {
-  height: 87.5%;
-  max-height: 480px;
-  overflow-y: auto;
+  flex: 1;
+  min-height: 0;
+  overflow: hidden auto;
   display: none;
+  padding: 8px 4px;
 }
 
-.activeInlbMessagingContactsBody  {
-  display: block;
+.activeInlbMessagingContactsBody {
+  display: flex;
+  flex-direction: column;
 }
 
 /* Chat window section */
 .lbMessagingMessageWindow {
-  width: 80%;
-  height: 100%;
   flex: 1;
-  background-color: white;
+  min-width: 0;
+  min-height: 0;
+  background-color: #fff;
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
-  min-height: 0;
 }
 
 .lbMessagingMessageWindowHeader {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  background-color: #e0e0e0;
-  height: 12.5%;
-  max-height: 70px;
+  background-color: #e8e8e8;
+  flex-shrink: 0;
+  min-height: 56px;
+  padding: 10px 16px;
   font-size: 15px;
-  font-weight: bold;
-  gap: 10px;
+  font-weight: 600;
+  color: #212529;
+  border-bottom: 1px solid #d0d0d0;
+  box-sizing: border-box;
+}
+
+.lbMessagingHeaderIdentity {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  min-width: 0;
+}
+
+.lbMessagingHeaderTitle {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: #212529;
+  font-weight: 600;
 }
 
 .lbMessagingMessageWindowHeader img {
-  width: 48px;
-  height: 48px;
+  width: 44px;
+  height: 44px;
   border-radius: 50%;
   object-fit: cover;
+  flex-shrink: 0;
 }
 
 .lbMessagingMessageWindowBody {
-  flex: 1;
-  min-height: 0;
-  padding: 10px 0 0 0;
-  overflow: hidden;
+  flex: 1 1 auto;
   display: flex;
   flex-direction: column;
+  min-height: 0;
+  padding: 12px 16px;
+  box-sizing: border-box;
+  background-color: #fff;
 }
 
-.lbMessagingMessageWindowFooter {
+.startMsg {
+  flex: 1;
   display: flex;
-  background-color: #e0e0e0;
-  color: black;
-  height: 12%;
-  padding: 10px 16px;
-  max-height: 50px;
   align-items: center;
-  width: 100%;
-  justify-content: space-between;
+  justify-content: center;
+  margin: 0;
+  padding: 32px 24px;
+  color: #6c757d;
+  font-size: 1rem;
+  font-weight: 500;
+  text-align: center;
+}
+
+.lbNoMsgText {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0;
+  padding: 24px;
+  color: #6c757d;
+  font-size: 0.95rem;
+  text-align: center;
+}
+
+.sidebarHint {
+  margin: 8px 12px 12px;
+  padding: 10px 12px;
+  font-size: 13px;
+  line-height: 1.45;
+  color: #333;
+  background-color: #f7f7f7;
+  border-radius: 6px;
+  border: 1px solid #ddd;
+}
+
+.lbMessaingMessageWindowFooter {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex-shrink: 0;
   gap: 12px;
+  padding: 12px 16px;
+  background-color: #e8e8e8;
+  border-top: 1px solid #d0d0d0;
+  box-sizing: border-box;
+  width: 100%;
 }
 
 .lbMessagingTextarea {
-  height: 38px;
   flex: 1;
-  width: auto;
-  padding: 0 14px;
-  border: 1px solid #b8b8b8;
-  border-radius: 18px;
+  min-width: 0;
+  min-height: 44px;
+  max-height: 120px;
+  border: 1px solid #666;
+  border-radius: 12px;
   outline: none;
-  color: black;
-  overflow: hidden;
-  background-color: #f2ecec;
+  color: #212529;
+  overflow-y: auto;
+  background-color: #f5f5f5;
   resize: none;
+  padding: 10px 14px;
   margin: 0;
   box-sizing: border-box;
+  font-family: inherit;
+  font-size: 14px;
 }
 
 .messageList {
   display: flex;
   flex-direction: column;
-  height: 100%;
-  overflow-y: auto;
   flex: 1;
   min-height: 0;
-  padding: 0 12px 12px;
+  overflow-y: auto;
 }
 
 .messageSpacer {
@@ -260,7 +329,6 @@
   margin-right: 10px;
 }
 
-
 .received {
   justify-content: flex-start !important;
   margin-left: 10px;
@@ -279,420 +347,151 @@
 .lbSearchInput {
   width: 75%;
   background-color: #8b8888;
-  color: #000000;
+  color: #000;
   outline: none;
-  border: 1px solid #000000;
+  border: 1px solid #000;
   border-radius: 5px;
   padding: 1px 0 1px 5px;
 }
 
 .lbSearchInput::placeholder {
-  color: #000000;
+  color: #000;
 }
 
-.lbMessagingSearchIcons {
-  height: 33px;
-  aspect-ratio: 1/1;
+.lbMsgIcon {
+  width: 22px;
+  height: 22px;
 }
 
-.lbMessagingHeaderIcons {
-  position: relative;
+.lbMessagingSearchIcons {
+  height: 33px;
+  aspect-ratio: 1 / 1;
+  color: #111;
 }
 
-.lbTopBarBell {
-  margin-left: auto;
-  margin-right: 10px;
+.lbMessagingSearchIcons .lbMsgIcon {
+  width: 22px;
+  height: 22px;
+  cursor: pointer;
 }
 
-.lbTopBarMenuButton {
-  background: transparent;
-  border: none;
-  color: #000000;
-  font-size: 32px;
-  line-height: 1;
-  padding: 4px 8px;
-  cursor: pointer;
+.lbMessagingHeaderIcons {
+  position: relative;
+  display: flex;
+  align-items: center;
 }
 
 .lgMessagingNotificationBell {
   font-size: 30px;
   cursor: pointer;
-  margin: 0px 15px;
-  color: #000000;
+  margin: 0 15px;
 }
 
 .lbContactMsgs {
-  color: #000000;
+  color: #000;
   margin: 0;
 }
 
-.lbMsgIcon {
-  height: 100%;
-  width: 75% !important;
-}
-
-.lgMessagingBellSelectDropdown {
-  position: absolute;
-  top: 110%;
-  right: 0;
-  background-color: white;
-  border: 1px solid #ddd;
-  border-radius: 8px;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-  display: none;
-  flex-direction: column;
-  justify-content: flex-start;
-  align-items: stretch;
-  z-index: 100;
-  padding: 10px 12px;
-  gap: 6px;
-  min-width: 220px;
-  box-sizing: border-box;
-}
-
-.activeInlgMessagingBellSelectDropdown{
-  display: flex;
-}
+.lbMobileContactsPanel .lbMessagingContact img {
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  margin-right: 10px;
+} 
 
-.lbNotificationBadge {
-  position: absolute;
-  top: -6px;
-  right: -2px;
-  background-color: #e04f4f;
-  color: #ffffff;
-  border-radius: 10px;
-  font-size: 10px;
-  line-height: 1;
-  padding: 4px 6px;
-  min-width: 18px;
-  text-align: center;
+.lbMessagingContactName {
+  font-size: 15px;
+  font-weight: 500;
+  color: #212529;
 }
 
-.lgMessagingSectionTitle {
-  font-size: 12px;
-  font-weight: 600;
-  color: #333333;
-  width: 100%;
+.sendButton {
+  cursor: pointer;
+  font-size: 22px;
+  padding: 8px;
+  color: #333;
+  flex-shrink: 0;
 }
 
-.lgMessagingDivider {
-  height: 1px;
-  width: 100%;
-  background-color: #e3e3e3;
-  margin: 4px 0;
+.sendButton:hover {
+  color: #007bff;
 }
 
-.lgMessagingSmsCheckbox {
-  display: flex;
+.lbMsgIconBtn {
+  background: none;
+  border: none;
+  padding: 4px;
+  cursor: pointer;
+  display: inline-flex;
   align-items: center;
-  gap: 8px;
-  font-size: 13px;
-  width: 100%;
+  justify-content: center;
 }
 
-.lgMessagingSmsField {
-  display: flex;
+.lgMessagingBellSelectDropdown {
+  position: absolute;
+  right: 0;
+  top: calc(100% + 8px);
+  min-width: 180px;
+  padding: 12px;
+  background: #fff;
+  border: 1px solid #ccc;
+  border-radius: 8px;
+  box-shadow: 0 4px 12px rgb(0 0 0 / 15%);
+  z-index: 20;
+  display: none;
   flex-direction: column;
-  gap: 4px;
-  width: 100%;
-}
-
-.lgMessagingSmsLabel {
-  font-size: 12px;
-  color: #333333;
-}
-
-.lgMessagingSmsInput {
-  width: 100%;
-  padding: 6px 8px;
-  border: 1px solid #cccccc;
-  border-radius: 6px;
-  font-size: 13px;
-  box-sizing: border-box;
-}
-
-.lgMessagingSmsMask {
-  font-size: 11px;
-  color: #666666;
-}
-
-.lgMessagingSmsSaveButton {
-  align-self: flex-start;
-  padding: 6px 10px;
-  font-size: 12px;
-}
-
-.lgMessagingBellSelectDropdown label {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
   gap: 8px;
-  font-size: 14px;
-  width: 100%;
-  cursor: pointer;
-}
-
-.lgMessagingBellSelectDropdown input {
-  width: fit-content !important;
 }
 
-.lgMessagingField {
+.activeInlgMessagingBellSelectDropdown {
   display: flex;
-  flex-direction: column;
-  gap: 4px;
-  width: 100%;
-  margin-top: 6px;
-}
-
-.lgMessagingFieldLabel {
-  font-size: 12px;
-  color: #333333;
 }
 
-.lgMessagingPhoneInput {
-  width: 100%;
-  padding: 6px 8px;
-  border: 1px solid #cccccc;
+.lgMessagingSaveBtn {
+  margin-top: 6px;
+  padding: 6px 12px;
   border-radius: 6px;
-  font-size: 14px;
-  box-sizing: border-box;
-}
-
-.lgMessagingPhoneInput:disabled {
-  background-color: #f2f2f2;
-  color: #777777;
-}
-
-.lbNoMsgText {
-  text-align: center;
-}
-
-.lgMessagingSubmitButton {
-  margin-top: 10px;
-  padding: 8px 12px;
-  background-color: #007bff;
-  color: white;
   border: none;
-  border-radius: 6px;
-  font-size: 14px;
+  background: #007bff;
+  color: #fff;
   cursor: pointer;
-  align-self: flex-end;
-  transition: background-color 0.2s ease;
 }
 
-.lgMessagingSubmitButton:hover {
-  background-color: #0056b3;
+.darkMode .startMsg {
+  color: #adb5bd;
 }
 
-.sendButton {
-  cursor: pointer;
-  width: 36px;
-  height: 36px;
-  padding: 8px;
-  border-radius: 50%;
-  background-color: #4db7ab;
-  color: #ffffff;
-  transition: background-color 0.2s ease, transform 0.2s ease;
+.darkMode .lbNoMsgText {
+  color: #adb5bd;
 }
 
-.sendButton:hover {
-  background-color: #3ca79b;
-  transform: translateY(-1px);
+.darkMode .sidebarHint {
+  color: #e9ecef;
+  background-color: #3a3a3a;
+  border-color: #555;
 }
 
-.startMsg {
-  text-align: center;
+.lbMobileHamMenu {
+  position: relative;
+  width: 100%;
 }
 
+/* Mobile menu — minimal layout so controls are usable when classes are referenced */
 .lbMobileMessagingMenu {
-  display: flex;
-  justify-content: flex-end;
   width: 100%;
-  padding: 10px;
 }
 
 .lbMobileHeader {
   display: flex;
-  height: 100%;
   align-items: center;
-  justify-content: space-between;
-  color: #fff;
-  padding: 12px 16px;
-  border-radius: 8px;
+  padding: 0 8px;
 }
 
 .lbHamBtn {
-  font-size: 30px;
-  background: none;
+  background: rgb(0 0 0 / 8%);
   border: none;
-  color: #fff;
-  cursor: pointer;
-}
-
-.lbMessagingMobileSearchIcons {
-  height: 35px;
-  aspect-ratio: 1/1;
-  margin-left: 10px;
-}
-
-.lbMsgMobileIcon {
-  height: 100%;
-  width: auto !important;
-  color: black !important;
-}
-
-.lbMobileTitle {
-  margin: 0;
-  font-weight: 600;
-  font-size: 18px;
-}
-
-.lbMobileContactsPanel {
-  background-color: #fff;
-  border-radius: 8px;
-  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05);
-  margin-top: 10px;
-  padding: 10px;
-}
-
-.lbMobileContactsPanel .lbMessagingContact {
-  display: flex;
-  align-items: center;
-  padding: 6px 8px;
-  border-bottom: 1px solid #eee;
+  border-radius: 4px;
+  padding: 8px 12px;
   cursor: pointer;
-}
-
-.lbMobileContactsPanel .lbMessagingContact img {
-  width: 32px;
-  height: 32px;
-  border-radius: 50%;
-  margin-right: 10px;
-  object-fit: cover;
-}
-
-.lbMessagingContactName {
-  font-size: 15px;
-  font-weight: 500;
-}
-
-:global(.dark-mode) .mainContainer,
-:global(.dark-mode) .containerMainMsg {
-  background-color: #141414;
-}
-
-:global(.dark-mode) .logoContainer {
-  background-color: #1b1b1b;
-}
-
-:global(.dark-mode) .contentContainer {
-  background-color: #1f1f1f;
-  border-color: #2a2a2a;
-  box-shadow: 0 4px 10px rgba(0, 0, 0, 0.45);
-}
-
-:global(.dark-mode) .containerTop {
-  background-color: #88c814;
-}
-
-:global(.dark-mode) .lbMessagingContactsHeader,
-:global(.dark-mode) .lbMessagingContactsHeaderMobile {
-  background-color: #2a2a2a;
-}
-
-:global(.dark-mode) .lbContactMsgs,
-:global(.dark-mode) .lbMsgIcon,
-:global(.dark-mode) .lbMsgIconMobile {
-  color: #f1f1f1 !important;
-}
-
-:global(.dark-mode) .lbMessagingContactsBody {
-  background-color: #1f1f1f;
-}
-
-:global(.dark-mode) .lbMessagingContact {
-  background-color: #2a2a2a;
-}
-
-:global(.dark-mode) .lbMessagingContact:hover {
-  background-color: #343434;
-}
-
-:global(.dark-mode) .lbMessagingContactName,
-:global(.dark-mode) .lbMessagingContactInfo,
-:global(.dark-mode) .black {
-  color: #f1f1f1;
-}
-
-:global(.dark-mode) .lbMessagingMessageWindow {
-  background-color: #1f1f1f;
-}
-
-:global(.dark-mode) .lbMessagingMessageWindowHeader {
-  background-color: #2a2a2a;
-  color: #f1f1f1;
-}
-
-:global(.dark-mode) .lbMessagingMessageWindowBody {
-  background-color: #1f1f1f;
-}
-
-:global(.dark-mode) .lbMessagingMessageWindowFooter {
-  background-color: #2a2a2a;
-  color: #f1f1f1;
-}
-
-:global(.dark-mode) .lbMessagingTextarea {
-  background-color: #2b2b2b;
-  border-color: #3a3a3a;
-  color: #f1f1f1;
-}
-
-:global(.dark-mode) .messageText {
-  background-color: #2f2f2f;
-  color: #f1f1f1;
-}
-
-:global(.dark-mode) .lbSearchInput {
-  background-color: #2a2a2a;
-  color: #f1f1f1;
-  border-color: #444444;
-}
-
-:global(.dark-mode) .lbSearchInput::placeholder {
-  color: #c9c9c9;
-}
-
-:global(.dark-mode) .lgMessagingBellSelectDropdown {
-  background-color: #1f1f1f;
-  border-color: #333333;
-  color: #f1f1f1;
-}
-
-:global(.dark-mode) .lgMessagingSectionTitle,
-:global(.dark-mode) .lgMessagingSmsLabel,
-:global(.dark-mode) .lgMessagingSmsMask,
-:global(.dark-mode) .lgMessagingFieldLabel {
-  color: #d2d2d2;
-}
-
-:global(.dark-mode) .lgMessagingSmsInput,
-:global(.dark-mode) .lgMessagingPhoneInput {
-  background-color: #2b2b2b;
-  color: #f1f1f1;
-  border-color: #3a3a3a;
-}
-
-:global(.dark-mode) .lgMessagingPhoneInput:disabled {
-  background-color: #262626;
-  color: #a0a0a0;
-}
-
-:global(.dark-mode) .lbTopBarMenuButton {
-  color: #0d0d0d;
-}
-
-:global(.dark-mode) .lbNoMsgText,
-:global(.dark-mode) .startMsg {
-  color: #d0d0d0;
-}
+  font-size: 20px;
+}
\ No newline at end of file
diff --git a/src/components/LBDashboard/WishList/ItemOverview.jsx b/src/components/LBDashboard/WishList/ItemOverview.jsx
index 0fccd94d7d..127fee90b1 100644
--- a/src/components/LBDashboard/WishList/ItemOverview.jsx
+++ b/src/components/LBDashboard/WishList/ItemOverview.jsx
@@ -1,14 +1,16 @@
 import styles from './ItemOverview.module.css';
 import { useEffect, useState } from 'react';
-import { connect } from 'react-redux';
+import { connect, useSelector } from 'react-redux';
 
 import { FaMapMarkerAlt } from 'react-icons/fa';
 import { IoMdHeart, IoMdHeartEmpty } from 'react-icons/io';
 import { BsChat } from 'react-icons/bs';
 import ImageCarousel from '../Components/ImageCarousel';
 import Header from '../Header';
+import { Link, useParams } from 'react-router-dom';
 
 const item = {
+  id: '2',
   title: 'Cob Village',
   unit: 'Unit 405',
   images: [
@@ -26,108 +28,295 @@ const item = {
   price: '$25/Day',
 };
 
+const getClassNames = (baseClass, darkClass, darkMode) =>
+  `${baseClass} ${darkMode ? darkClass : ''}`;
+
 function WishListItem(props) {
   const [isWishlist, setIsWishlist] = useState(true);
   const [currWishlistItem, setCurrWishlistItem] = useState(item);
+  const darkMode = useSelector(state => state.theme.darkMode);
+  const { id } = useParams();
 
-  const { wishlistItem } = props;
+  const { wishlistItem, wishlists } = props;
 
-  // We don't need the back to top button on this page
+  // Hide global "back to top" control while this page is mounted (element may not exist).
   useEffect(() => {
     const backToTopButton = document.querySelector('.top');
+    if (!backToTopButton) return undefined;
+    const prevDisplay = backToTopButton.style.display;
     backToTopButton.style.display = 'none';
     return () => {
-      backToTopButton.style.display = 'block';
+      backToTopButton.style.display = prevDisplay || '';
     };
   }, []);
 
   useEffect(() => {
     if (wishlistItem) {
       setCurrWishlistItem(wishlistItem);
+      return;
+    }
+    if (id != null && wishlists?.length) {
+      const match = wishlists.find(w => String(w.id) === String(id));
+      if (match) {
+        setCurrWishlistItem(match);
+      }
     }
-  }, [wishlistItem]);
+  }, [wishlistItem, id, wishlists]);
 
   return (
-    <div className={`item ${styles['item_overview_module']}`}>
-      <div className={styles['item__container']}>
+    <div
+      className={`item ${getClassNames(
+        styles['item_overview_module'],
+        styles['item_overview_module--dark'],
+        darkMode,
+      )}`}
+    >
+      <div
+        className={getClassNames(
+          styles['item__container'],
+          styles['item__container--dark'],
+          darkMode,
+        )}
+      >
         <Header />
-        <div className={styles['item__overview']}>
-          <div className={styles['item__details-left']}>
+        <div
+          className={getClassNames(
+            styles['item__overview'],
+            styles['item__overview--dark'],
+            darkMode,
+          )}
+        >
+          <div
+            className={getClassNames(
+              styles['item__details-left'],
+              styles['item__details-left--dark'],
+              darkMode,
+            )}
+          >
             <div
-              className={`${styles['item__listing-details']} ${styles['item__listing-details--mobile']}`}
+              className={`${getClassNames(
+                styles['item__listing-details'],
+                styles['item__listing-details--dark'],
+                darkMode,
+              )} ${styles['item__listing-details--mobile']}`}
             >
-              <h1>{currWishlistItem.unit}</h1>
-              <h1>{currWishlistItem.title}</h1>
+              <h1 className={getClassNames('', styles['item__heading--dark'], darkMode)}>
+                {currWishlistItem.unit}
+              </h1>
+              <h1 className={getClassNames('', styles['item__heading--dark'], darkMode)}>
+                {currWishlistItem.title}
+              </h1>
             </div>
-            <div className="item__images">
-              <ImageCarousel images={currWishlistItem.images} />
+            <div className={styles['item__images']}>
+              <ImageCarousel images={currWishlistItem.images} darkMode={darkMode} />
             </div>
-            <div className={styles['item__amenities']}>
+            <div
+              className={getClassNames(
+                styles['item__amenities'],
+                styles['item__amenities--dark'],
+                darkMode,
+              )}
+            >
               <div>
-                <h2>Available amenities in this unit:</h2>
+                <h2
+                  className={getClassNames('', styles['item__amenities-heading--dark'], darkMode)}
+                >
+                  Available amenities in this unit:
+                </h2>
                 <ol className={styles['margin__left']}>
                   {currWishlistItem.unitAmenities?.map(amenity => (
-                    <li key={amenity}>{amenity}</li>
+                    <li
+                      key={amenity}
+                      className={getClassNames('', styles['item__amenities-text--dark'], darkMode)}
+                    >
+                      {amenity}
+                    </li>
                   ))}
                 </ol>
               </div>
               <div>
-                <h2>Village level amenities:</h2>
+                <h2
+                  className={getClassNames('', styles['item__amenities-heading--dark'], darkMode)}
+                >
+                  Village level amenities:
+                </h2>
                 <ol className={styles['margin__left']}>
                   {currWishlistItem.villageAmenities?.map(amenity => (
-                    <li key={amenity}>{amenity}</li>
+                    <li
+                      key={amenity}
+                      className={getClassNames('', styles['item__amenities-text--dark'], darkMode)}
+                    >
+                      {amenity}
+                    </li>
                   ))}
                 </ol>
               </div>
             </div>
-            <div className={styles['item__location']}>
+            <div
+              className={getClassNames(
+                styles['item__location'],
+                styles['item__location--dark'],
+                darkMode,
+              )}
+            >
               <FaMapMarkerAlt className={styles['item__icon']} />
-              <a href="/">View on Property Map</a>
+              <Link
+                to="/lbdashboard/masterplan"
+                className={getClassNames('', styles['item__location-link--dark'], darkMode)}
+              >
+                View on Property Map
+              </Link>
             </div>
           </div>
-          <div className={styles['item__details-right']}>
-            <div className={styles['item__listing-details']}>
-              <h1 className={styles['item__listing-details--desktop']}>{currWishlistItem.unit}</h1>
-              <h1 className={styles['item__listing-details--desktop']}>{currWishlistItem.title}</h1>
-              <span>
+          <div
+            className={getClassNames(
+              styles['item__details-right'],
+              styles['item__details-right--dark'],
+              darkMode,
+            )}
+          >
+            <div
+              className={getClassNames(
+                styles['item__listing-details'],
+                styles['item__listing-details--dark'],
+                darkMode,
+              )}
+            >
+              <h1
+                className={`${styles['item__listing-details--desktop']} ${getClassNames(
+                  '',
+                  styles['item__heading--dark'],
+                  darkMode,
+                )}`}
+              >
+                {currWishlistItem.unit}
+              </h1>
+              <h1
+                className={`${styles['item__listing-details--desktop']} ${getClassNames(
+                  '',
+                  styles['item__heading--dark'],
+                  darkMode,
+                )}`}
+              >
+                {currWishlistItem.title}
+              </h1>
+              <span className={getClassNames('', styles['item__description--dark'], darkMode)}>
                 This unit sells for a basic price of <b>{currWishlistItem.price}</b>. If you wish to
-                book it in advance bid your price and leave your details below and we will get back
-                to you if you are our highest bidder. Make sure your starting date is atleast{' '}
-                <b>2 weeks </b>
-                from now.
+                book it in advance, bid your price and leave your details below and we will get back
+                to you if you are our highest bidder. Make sure your starting date is at least{' '}
+                <b>2 weeks</b> from now.
               </span>
             </div>
-            <div className={styles['item__form']}>
+            <div
+              className={getClassNames(styles['item__form'], styles['item__form--dark'], darkMode)}
+            >
               <div className={styles['item__rent']}>
-                <label htmlFor="from">
+                <label
+                  htmlFor="from"
+                  className={getClassNames('', styles['item__form-label--dark'], darkMode)}
+                >
                   Renting from
-                  <input type="date" name="from" id="from" />
+                  <input
+                    type="date"
+                    name="from"
+                    id="from"
+                    className={getClassNames(
+                      styles['item__form-input'],
+                      styles['item__form-input--dark'],
+                      darkMode,
+                    )}
+                    style={darkMode ? { colorScheme: 'dark' } : {}}
+                  />
                 </label>
-                <label htmlFor="to">
+                <label
+                  htmlFor="to"
+                  className={getClassNames('', styles['item__form-label--dark'], darkMode)}
+                >
                   Rent to
-                  <input type="date" name="to" id="to" />
+                  <input
+                    type="date"
+                    name="to"
+                    id="to"
+                    className={getClassNames(
+                      styles['item__form-input'],
+                      styles['item__form-input--dark'],
+                      darkMode,
+                    )}
+                    style={darkMode ? { colorScheme: 'dark' } : {}}
+                  />
                 </label>
               </div>
               <div className={styles['item__bidding']}>
-                <label htmlFor="name">
+                <label
+                  htmlFor="name"
+                  className={getClassNames('', styles['item__form-label--dark'], darkMode)}
+                >
                   Name:
-                  <input type="text" name="name" id="name" placeholder="Name" />
+                  <input
+                    type="text"
+                    name="name"
+                    id="name"
+                    placeholder="Name"
+                    className={getClassNames(
+                      styles['item__form-input'],
+                      styles['item__form-input--dark'],
+                      darkMode,
+                    )}
+                  />
                 </label>
-                <label htmlFor="bidding">
+                <label
+                  htmlFor="bidding"
+                  className={getClassNames('', styles['item__form-label--dark'], darkMode)}
+                >
                   Bidding Price:
-                  <input type="number" name="bidding" id="bidding" placeholder="Bidding Price" />
+                  <input
+                    type="number"
+                    name="bidding"
+                    id="bidding"
+                    placeholder="Bidding Price"
+                    className={getClassNames(
+                      styles['item__form-input'],
+                      styles['item__form-input--dark'],
+                      darkMode,
+                    )}
+                  />
                 </label>
               </div>
-              <button type="button">Proceed to submit with details</button>
+              <button
+                type="button"
+                className={getClassNames(
+                  styles['item__form-submit'],
+                  styles['item__form-submit--dark'],
+                  darkMode,
+                )}
+              >
+                Proceed to submit with details
+              </button>
             </div>
-            <div className={styles['err-message']}>
+            <div
+              className={getClassNames(
+                styles['err-message'],
+                styles['err-message--dark'],
+                darkMode,
+              )}
+            >
               <h6>The Dates you picked are not available</h6>
-              <a href="/">Click here to see available dates</a>
+              <Link
+                to="/lbdashboard/listingshome"
+                className={getClassNames('', styles['item__error-link--dark'], darkMode)}
+              >
+                Click here to see available dates
+              </Link>
             </div>
             <div className={styles['footer__icons']}>
               <div className={styles['save__list']}>
                 <button
                   type="button"
+                  className={getClassNames(
+                    styles['save__list-button'],
+                    styles['save__list-button--dark'],
+                    darkMode,
+                  )}
                   onClick={() => {
                     setIsWishlist(!isWishlist);
                   }}
@@ -135,14 +324,27 @@ function WishListItem(props) {
                   {isWishlist ? (
                     <IoMdHeart className={styles['saved__item']} />
                   ) : (
-                    <IoMdHeartEmpty />
+                    <IoMdHeartEmpty
+                      className={getClassNames('', styles['item__icon-empty--dark'], darkMode)}
+                    />
                   )}
-                  Save
+                  &nbsp;Save
                 </button>
               </div>
               <div className={styles['start__chat']}>
-                <button type="button">
-                  <BsChat /> Chat with the Host
+                <button
+                  type="button"
+                  className={getClassNames(
+                    styles['start__chat-button'],
+                    styles['start__chat-button--dark'],
+                    darkMode,
+                  )}
+                  onClick={e => {
+                    e.preventDefault();
+                  }}
+                >
+                  <BsChat />
+                  &nbsp;Chat with the Host
                 </button>
               </div>
             </div>
@@ -155,6 +357,7 @@ function WishListItem(props) {
 
 const mapStateToProps = state => ({
   wishlistItem: state.wishlistItem.wishListItem,
+  wishlists: state.wishlistItem.wishlists,
 });
 
 export default connect(mapStateToProps)(WishListItem);
diff --git a/src/components/LBDashboard/WishList/ItemOverview.module.css b/src/components/LBDashboard/WishList/ItemOverview.module.css
index 2dbd627ed1..7167b7a54f 100644
--- a/src/components/LBDashboard/WishList/ItemOverview.module.css
+++ b/src/components/LBDashboard/WishList/ItemOverview.module.css
@@ -1,21 +1,26 @@
-.item__navbar {
+.item__navbar{
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
   background-color: #9dd425 !important;
-  padding: 1.5rem 1.5rem !important;
+  padding: 1.5rem !important; 
   margin: 0 !important;
 }
 
-.item__navbar-left {
+.item__navbar--dark {
+  background-color: #1c2541 !important;
+  border-bottom: 1px solid #2f3b59;
+}
+
+.item__navbar-left{
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
 }
 
-.item__selector {
+.item__selector{
   width: 200px;
   background-color: #fff;
   border-radius: 5px;
@@ -24,7 +29,7 @@
   cursor: pointer;
 }
 
-.item__selector select {
+.item__selector select{
   width: 100%;
   border: none;
   outline: none;
@@ -32,17 +37,17 @@
   cursor: pointer;
 }
 
-.item__button {
-  background-color: rgb(190, 190, 190);
+.item__button{
+  background-color: rgb(190 190 190);
   padding: 0.2rem 0.5rem;
   border-radius: 5px;
   border: 1px solid black;
   cursor: pointer;
+  font: inherit;
 }
 
-.item__button:hover {
+.item__button:hover{
   background-color: black;
-
   padding: 0.2rem 0.5rem;
   border-radius: 5px;
   border: 1px solid black;
@@ -50,7 +55,7 @@
   transition: all 0.3s ease;
 }
 
-.item__button p {
+.item__button p{
   font-family: sans-serif;
   color: #fff;
   font-size: 14px;
@@ -58,7 +63,7 @@
   margin: 0;
 }
 
-.item__navbar-right {
+.item__navbar-right{
   display: flex;
   flex-direction: row;
   justify-content: flex-end;
@@ -67,47 +72,69 @@
   padding: 1rem 0 0;
 }
 
-.item__navbar-right h2 {
+.item__navbar-right h2{
   font-family: sans-serif;
-  color: #000000;
+  color: #000;
   font-size: 14px;
   padding: 0;
   margin: 0;
 }
 
-.item__icons {
+.item__navbar-right--dark h2 {
+  color: #fff !important;
+}
+
+.item__icons{
   padding-left: 0.5rem;
   margin: 0;
 }
 
-.item__nav-icon {
+.item__nav-icon{
   margin-left: 1rem;
   font-size: 19px;
   margin-bottom: 0.2rem;
 }
 
-.item__nav-link {
-  color: rgba(0, 0, 0) !important;
+.item__nav-link{
+  color: rgb(0 0 0) !important;
+}
+
+.item__nav-link--dark {
+  color: rgb(255 255 255 / 92%) !important;
 }
 
 .item__overview {
   background-color: #e0e0e0;
   display: flex;
-  justify-content: space-evenly;
-  align-items: center;
-  margin: 20px 40px 30px 40px;
-  padding: 10px 0px 10px 0px;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin: 20px 40px 30px;
+  padding: 10px 0;
   width: auto;
   height: auto;
+  gap: 1rem;
+}
+
+.item__overview--dark {
+  background-color: #0f1629 !important;
+  color: #fff !important;
+  border: 1px solid #1C2541;
 }
 
 .item__details-left {
-  width: 50%;
-  height: 100%;
+  flex: 1 1 50%;
+  max-width: 50%;
+  min-width: 0;
+  height: auto;
   display: flex;
   flex-direction: column;
-  align-items: center;
-  padding: 2.5% 2.5% 1.5% 2.5%;
+  align-items: stretch;
+  padding: 2.5% 2.5% 1.5%;
+  box-sizing: border-box;
+}
+
+.item__details-left--dark {
+  color: #fff !important;
 }
 
 .item__listing-details--mobile {
@@ -115,20 +142,39 @@
 }
 
 .item__listing-details h1,
-p {
+.item__listing-details p {
   color: #000;
 }
 
+.item__listing-details--dark h1,
+.item__listing-details--dark p {
+  color: #fff !important;
+}
+
+.item__heading--dark {
+  color: #fff !important;
+}
+
 .item__images {
   width: 100%;
+  max-width: 100%;
+  min-height: 220px;
   margin-bottom: 2.5%;
+  align-self: center;
 }
 
 .item__amenities {
   display: flex;
-  justify-content: center;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: flex-start;
   width: 100%;
-  gap: 10px;
+  gap: 1rem 1.25rem;
+  box-sizing: border-box;
+}
+
+.item__amenities--dark {
+  color: #fff !important;
 }
 
 .item__amenities h2 {
@@ -136,33 +182,73 @@ p {
   text-align: left;
   color: #060606;
   font-weight: bold;
+  margin: 0 0 0.5rem;
+  line-height: 1.3;
+}
+
+.item__amenities-heading--dark {
+  color: #fff !important;
 }
 
-.item__amenities div {
+.item__amenities-text--dark {
+  color: #e8eaed !important;
+}
+
+.item__amenities > div {
+  flex: 1 1 0;
+  min-width: 0;
   display: flex;
   flex-direction: column;
-  width: 100%;
+  align-items: stretch;
 }
 
 .margin__left {
-  margin-left: -1.3rem;
+  margin: 0;
+  padding-left: 1.35rem;
+  text-align: left;
 }
 
-.err-message {
+.err-message{
   color: red;
   font-size: 12px;
-  margin-top: 5px;
+  margin-top: 12px;
   display: block;
-  width: 50%;
+  width: 100%;
+  max-width: 100%;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+.err-message--dark {
+  color: #ff6b6b;
+}
+
+.err-message--dark h6 {
+  color: #ff6b6b;
+}
+
+.err-message h6 {
+  margin: 0 0 0.35rem;
+  font-weight: 600;
+}
+
+.item__error-link--dark {
+  color: #81b0ff !important;
 }
 
 .item__location {
   display: flex;
+  align-items: center;
+  gap: 0.4rem;
   width: 100%;
-  height: 30px;
-  margin: 2%;
-  padding-left: 5%;
-  margin-top: 5%;
+  min-height: auto;
+  margin: 1.25rem 0 0;
+  padding: 0;
+  flex-wrap: wrap;
+}
+
+.item__location--dark {
+  color: #fff !important;
 }
 
 .item__location img {
@@ -173,17 +259,106 @@ p {
 .item__location a {
   text-decoration: underline;
   cursor: pointer;
+  color: #1976d2;
+}
+
+.item__location-link--dark {
+  color: #81b0ff !important;
 }
 
 .item__icon {
   color: red;
-  font-size: 1.3rem;
+  font-size: 1.3rem
 }
 
 .item__details-right {
-  width: 50%;
-  height: 100%;
+  flex: 1 1 50%;
+  max-width: 50%;
+  min-width: 0;
+  height: auto;
   padding: 2.5%;
+  box-sizing: border-box;
+}
+
+.item__details-right--dark {
+  color: #fff !important;
+}
+
+.item__description--dark {
+  color: #e8eaed !important;
+}
+
+.item__form {
+  /* Base form styles */
+}
+
+.item__form--dark {
+  color: #fff !important;
+}
+
+.item__form-label--dark {
+  color: #fff !important;
+}
+
+.item__form-input {
+  padding: 8px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  font-size: 14px;
+  background-color: #fff;
+  color: #000;
+  margin-top: 2.5%;
+  width: 100%;
+  transition: border-color 0.3s, background-color 0.3s, color 0.3s;
+}
+
+.item__form-input--dark {
+  background-color: #1C2541 !important;
+  border-color: #3A506B !important;
+  color: #fff !important;
+}
+
+.item__form-input--dark::placeholder {
+  color: #9ca3af !important;
+}
+
+.item__form-input--dark::-webkit-calendar-picker-indicator {
+  filter: invert(1) brightness(1.2);
+  cursor: pointer;
+}
+
+.item__form-input--dark[type="date"] {
+  color-scheme: dark !important;
+}
+
+.item__form-submit {
+  background: #13ae5c;
+  color: white;
+  padding: 10px;
+  border-radius: 10px;
+  border: none;
+  cursor: pointer;
+  transition: background 0.3s ease, transform 0.2s ease;
+  width: 100%;
+  margin-top: 15px;
+}
+
+.item__form-submit:hover {
+  background: #0f9a50;
+  transform: scale(1.01);
+}
+
+.item__form-submit:active {
+  transform: scale(0.99);
+}
+
+.item__form-submit--dark {
+  background: #43a047;
+  color: white;
+}
+
+.item__form-submit--dark:hover {
+  background: #388e3c;
 }
 
 .item__rent {
@@ -218,6 +393,7 @@ p {
 .item__form button:active {
   transform: scale(0.99);
 }
+
 .item__rent input[type='date'] {
   border: 1px solid #ccc;
   margin-top: 2.5%;
@@ -228,11 +404,13 @@ p {
   display: flex;
   flex-direction: column;
   align-items: flex-start;
+  gap: 10px;
+  margin-top: 15px;
 }
 
 .item__bidding label {
   display: flex;
-  width: 50%;
+  width: 100%;
   flex-direction: column;
 }
 
@@ -249,7 +427,7 @@ p {
   margin-top: 2.5%;
 }
 
-.save__list button {
+.save__list-button {
   background: #d1d1d1;
   padding: 2.5%;
   border-radius: 998px;
@@ -263,6 +441,20 @@ p {
   align-items: center;
   cursor: pointer;
   transition: background 0.3s ease, transform 0.2s ease;
+  color: #000;
+}
+
+.save__list-button:hover {
+  background: #c1c1c1;
+}
+
+.save__list-button--dark {
+  background: #1C2541 !important;
+  color: #fff !important;
+}
+
+.save__list-button--dark:hover {
+  background: #2d3f5e !important;
 }
 
 .start__chat {
@@ -272,7 +464,7 @@ p {
   margin-top: 2.5%;
 }
 
-.start__chat button {
+.start__chat-button {
   background: #d1d1d1;
   padding: 2.5%;
   border-radius: 998px;
@@ -285,40 +477,86 @@ p {
   align-items: center;
   cursor: pointer;
   transition: background 0.3s ease, transform 0.2s ease;
+  color: #000;
+  text-decoration: none;
+  box-sizing: border-box;
+}
+
+.start__chat-button:hover {
+  background: #c1c1c1;
+}
+
+.start__chat-button--dark {
+  background: #1C2541 !important;
+  color: #fff !important;
+}
+
+.start__chat-button--dark:hover {
+  background: #2d3f5e !important;
 }
 
 .saved__item {
   color: red;
 }
 
-@media screen and (max-width: 1200px) {
-  .item__navbar {
+.item__icon-empty--dark {
+  color: #fff !important;
+}
+
+.item_overview_module {
+  /* Additional styles for the overview module wrapper */
+}
+
+.item_overview_module--dark {
+  background-color: #0a0f1a !important;
+  color: #fff !important;
+}
+
+.item__container {
+  /* Container styles */
+}
+
+.item__container--dark {
+  background-color: #0a0f1a !important;
+  color: #fff !important;
+}
+
+@media screen and (width <= 1200px) {
+  .item__navbar:not(.item__navbar--dark){
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
     background-color: green;
+    padding: 1.1rem 1rem  !important;
+  }
+
+  .item__navbar--dark {
     padding: 1.1rem 1rem !important;
   }
-  .item__nav-icon {
+
+  .item__nav-icon{
     margin-left: 0.5rem;
     font-size: 16px;
     margin-bottom: 0.25rem;
   }
+
   .item__navbar-right {
     justify-content: space-between;
     padding: 1rem 0 0;
   }
-  .item__navbar-right h2 {
+
+  .item__navbar-right h2{
     font-family: sans-serif;
-    color: #000000;
+    color: #000;
     font-size: 12px;
     padding: 0;
     margin: 0.3rem 0 0;
   }
-  .item__icons {
+
+  .item__icons{
     padding-left: 0.2rem;
-    margin: 0 0 0rem;
+    margin: 0;
   }
 
   .item_overview_module .navbar-nav {
@@ -330,13 +568,13 @@ p {
   }
 }
 
-@media screen and (max-width: 800px) {
+@media screen and (width <= 800px) {
   .item__navbar-right {
     padding: 1rem 0 0;
     justify-content: space-between;
   }
 
-  .item__navbar {
+  .item__navbar:not(.item__navbar--dark){
     display: flex;
     flex-direction: row;
     justify-content: space-between;
@@ -345,18 +583,24 @@ p {
     padding: 1rem 2rem !important;
   }
 
-  .item__navbar-right h2 {
+  .item__navbar--dark {
+    padding: 1rem 2rem !important;
+  }
+
+  .item__navbar-right h2{
     font-family: sans-serif;
-    color: #000000;
+    color: #000;
     font-size: 12px;
     padding: 0;
     margin: 0.3rem 0 0;
   }
-  .item__icons {
+
+  .item__icons{
     padding-left: 0.2rem;
-    margin: 0 0 0rem;
+    margin: 0;
   }
-  .item__nav-icon {
+
+  .item__nav-icon{
     margin-left: 0.8rem;
     font-size: 16px;
     margin-bottom: 0;
@@ -369,23 +613,39 @@ p {
     margin-bottom: 0;
     list-style: none;
   }
+
   .item__overview {
     flex-direction: column;
-    align-items: center;
+    align-items: stretch;
   }
+
   .item__details-left {
-    width: 98%;
+    width: 100%;
+    max-width: 100%;
+    flex: 1 1 auto;
   }
+
   .item__listing-details--mobile {
     display: block;
+    text-align: center;
   }
+
   .item__details-right {
-    width: 98%;
+    width: 100%;
+    max-width: 100%;
+    flex: 1 1 auto;
+  }
+
+  .item__amenities {
+    flex-direction: column;
+    align-items: stretch;
   }
+
   .item__listing-details--desktop {
     display: none;
   }
-  .start__chat button {
+
+  .start__chat-button {
     background: #d1d1d1;
     padding: 2.5%;
     border-radius: 998px;
@@ -394,19 +654,20 @@ p {
     display: flex;
     justify-content: center;
   }
+
   .item__rent {
     justify-content: space-between;
   }
 }
 
-@media screen and (max-width: 500px) {
+@media screen and (width <= 500px) {
   .navbar-light .navbar-toggler {
-    color: rgba(0, 0, 0, 0.5);
+    color: rgb(0 0 0 / 50%);
     border: 0.5px solid black !important;
     padding: 0.2rem 0.5rem !important;
   }
 
-  .item__navbar {
+  .item__navbar:not(.item__navbar--dark){
     display: flex;
     flex-direction: row;
     justify-content: space-between;
@@ -416,8 +677,13 @@ p {
     position: relative;
   }
 
-  .item__container {
-    overflow: visible;
+  .item__navbar--dark {
+    padding: 1.5rem 1rem !important;
+    position: relative;
+  }
+
+  .item__container{
+    overflow: visible ;
   }
 
   .menu-button {
@@ -442,20 +708,20 @@ p {
     padding: 1rem 0 0;
   }
 
-  .item__navbar-right h2 {
+  .item__navbar-right h2{
     font-family: sans-serif;
-    color: #000000;
+    color: #000;
     font-size: 12px;
     padding: 0;
     margin: 0.5rem 0 0;
   }
 
-  .item__icons {
+  .item__icons{
     padding-left: 0.2rem;
-    margin: 0 0 0rem;
+    margin: 0;
   }
 
-  .item__nav-icon {
+  .item__nav-icon{
     margin-left: 0.5rem;
     margin-top: 0.2rem;
     font-size: 14px;
@@ -471,19 +737,19 @@ p {
     align-items: center;
   }
 
-  .item__form label {
+    .item__form label {
     display: flex;
     width: 150px;
     flex-direction: column;
   }
-
-  .item__form input[type='date'] {
+  
+  .item__form-input {
     border: 1px solid #ccc;
     margin-top: 2.5%;
     width: 90%;
   }
 
-  .start__chat button {
+  .start__chat-button {
     background: #d1d1d1;
     padding: 2.5%;
     border-radius: 998px;
@@ -496,11 +762,13 @@ p {
   }
 }
 
-@media screen and (max-width: 340px) {
+@media screen and (width <= 340px) {
   .item__selector {
-    width: 150px;
+    width: 150px
+
   }
-  .navbar-toggler-icon {
+
+  .navbar-toggler-icon{
     width: 20px !important;
   }
 }
diff --git a/src/components/LBDashboard/WishList/WishList.jsx b/src/components/LBDashboard/WishList/WishList.jsx
index ac24f74125..26e24ded85 100644
--- a/src/components/LBDashboard/WishList/WishList.jsx
+++ b/src/components/LBDashboard/WishList/WishList.jsx
@@ -1,103 +1,133 @@
 import styles from './WishList.module.css';
-import { connect, useDispatch } from 'react-redux';
+import { connect, useDispatch, useSelector } from 'react-redux';
 import { FaMapMarkerAlt } from 'react-icons/fa';
-import { NavItem } from 'reactstrap';
 import { Link } from 'react-router-dom';
 import { setCurrentWishListItem } from '~/reducers/listBidDashboard/wishListItemReducer';
 import Header from '../Header';
 
 function WishList(props) {
-  // const [wishlistId, setWishlistId] = useState('');
   const dispatch = useDispatch();
+  const darkMode = useSelector(state => state.theme.darkMode);
   const { wishlists } = props;
 
   return (
-    <div className="item">
-      <div className="item__container">
-        <Header />
-        <div className={`item__location ${styles.list_location}`}>
-          <FaMapMarkerAlt className="item__icon" />
-          <a href="/">View on Property Map</a>
-        </div>
-        <h1 className={`${styles.list_title}`}>Wish List</h1>
-        {wishlists?.map(item => (
-          <div className={`${styles.item_body}`} key={item.id}>
-            <div className={`${styles.item_detailsWrapper}`}>
-              <div className={`${styles.list_detailsLeft}`}>
-                <div className={`${styles.itemTitleWrapperMobile}`}>
-                  <h1 className={`${styles.list_itemTitleMobile}`}>{item.title}</h1>
-                  <h2 className={`${styles.list_itemTitleMobile}`}>{item.unit}</h2>
-                </div>
-                <img
-                  key={item.images[0]}
-                  className="carousel-image"
-                  src={item.images[0]}
-                  alt="House"
-                />
-              </div>
-              <div className={`${styles.list_detailsRight}`}>
-                <div className={`${styles.itemTitleWrapper} ${styles.itemTitleWrapperDesktop}`}>
-                  <span className={`${styles.list_itemTitle} ${styles.itemTitleRight}`}>
-                    {item.title}
-                  </span>
-                </div>
-                <div className="item__details">
-                  <span className={`${styles.list_itemTitle} ${styles.itemTitleWrapperDesktop}`}>
-                    {item.unit}
-                  </span>
-                  <div className="list_item__amenities">
-                    <div>
-                      <span className={`${styles.font600}`}>Available amenities in this unit:</span>
-                      <ol>
-                        {item.unitAmenities?.map(amenity => (
-                          <li key={amenity}>{amenity}</li>
-                        ))}
-                      </ol>
+    <div className={`${styles.pageRoot} ${darkMode ? styles.pageRootDark : ''}`}>
+      <div className={styles.item}>
+        <div className={styles.itemContainer}>
+          <Header />
+
+          <div className={`${styles.itemLocation} ${styles.listLocation}`}>
+            <FaMapMarkerAlt className={styles.itemIcon} />
+            <Link
+              to="/lbdashboard/masterplan"
+              className={darkMode ? styles.wishlistLinkDark : styles.mapLinkLight}
+            >
+              View on Property Map
+            </Link>
+          </div>
+
+          <h1 className={`${styles.listTitle} ${darkMode ? styles.listTitleDark : ''}`}>
+            Wish List
+          </h1>
+
+          {wishlists?.map(item => {
+            const firstImg = item.images?.[0];
+            return (
+              <div
+                className={`${styles.itemBody} ${darkMode ? styles.itemBodyDark : ''}`}
+                key={item.id}
+              >
+                <div className={styles.itemMainRow}>
+                  <div className={styles.listDetailsLeft}>
+                    <div className={styles.itemTitleWrapperMobile}>
+                      <h1 className={`${styles.listItemTitle} ${styles.listItemTitleMobile}`}>
+                        {item.title}
+                      </h1>
+                      <h2 className={`${styles.listItemTitle} ${styles.listItemTitleMobile}`}>
+                        {item.unit}
+                      </h2>
+                    </div>
+
+                    {firstImg ? (
+                      <img
+                        src={firstImg}
+                        alt={`${item.title}, ${item.unit}`}
+                        className={styles.itemImage}
+                        loading="lazy"
+                      />
+                    ) : (
+                      <div className={styles.imagePlaceholder}>No image</div>
+                    )}
+                  </div>
+
+                  <div className={styles.listDetailsRight}>
+                    <div className={`${styles.itemTitleWrapper} ${styles.itemTitleWrapperDesktop}`}>
+                      <span className={`${styles.listItemTitle} ${styles.itemTitleRight}`}>
+                        {item.title}
+                      </span>
+                    </div>
+
+                    <div className={styles.itemDetails}>
+                      <span className={`${styles.listItemTitle} ${styles.itemTitleWrapperDesktop}`}>
+                        {item.unit}
+                      </span>
+
+                      <div className={styles.listItemAmenities}>
+                        <div>
+                          <span className={styles.font600}>Available amenities in this unit:</span>
+                          <ol>
+                            {item.unitAmenities?.map(amenity => (
+                              <li key={amenity}>{amenity}</li>
+                            ))}
+                          </ol>
+                        </div>
+                      </div>
+
+                      <div className={styles.itemPrice}>
+                        <span className={styles.font600}>Basic per night price:</span> {item.price}
+                      </div>
                     </div>
                   </div>
                 </div>
-                <div className={`${styles.item_price}`}>
-                  <span className={`${styles.font600}`}>Basic per night price:</span> {item.price}
-                </div>
-                <div>
-                  <NavItem
-                    tag={Link}
-                    to={`/lbdashboard/wishlist/${item.id}`}
-                    onClick={() => {
-                      dispatch(setCurrentWishListItem(item));
+
+                <div className={styles.itemCardFooter}>
+                  <div className={styles.footerLinks}>
+                    <Link
+                      to={`/lbdashboard/wishlist/${item.id}`}
+                      onClick={() => dispatch(setCurrentWishListItem(item))}
+                      className={`${styles.footerLink} ${darkMode ? styles.wishlistLinkDark : ''}`}
+                    >
+                      Click here to view availabilities
+                    </Link>
+                    <Link
+                      to={`/lbdashboard/wishlist/${item.id}`}
+                      onClick={() => dispatch(setCurrentWishListItem(item))}
+                      className={`${styles.footerLink} ${darkMode ? styles.wishlistLinkDark : ''}`}
+                    >
+                      Click for list overview
+                    </Link>
+                  </div>
+                  <button
+                    type="button"
+                    className={`${styles.chatButton} ${darkMode ? styles.chatButtonDark : ''}`}
+                    onClick={e => {
+                      e.preventDefault();
                     }}
-                    className={`${styles.list_details}`}
                   >
-                    Click here to view availabilities
-                  </NavItem>
+                    <img
+                      width="24"
+                      height="24"
+                      src="https://img.icons8.com/material-outlined/24/chat.png"
+                      alt=""
+                      aria-hidden="true"
+                    />
+                    Chat with the Host
+                  </button>
                 </div>
               </div>
-            </div>
-            <div className={`${styles.item_footer}`}>
-              <NavItem
-                tag={Link}
-                to={`/lbdashboard/wishlist/${item.id}`}
-                onClick={() => {
-                  dispatch(setCurrentWishListItem(item));
-                }}
-                className={`${styles.list_link}`}
-              >
-                Click for list overview
-              </NavItem>
-              <div className={`${styles.wishlist_start_chat}`}>
-                <button type="button">
-                  <img
-                    width="24"
-                    height="24"
-                    src="https://img.icons8.com/material-outlined/24/chat.png"
-                    alt="chat"
-                  />
-                  Chat with the Host
-                </button>
-              </div>
-            </div>
-          </div>
-        ))}
+            );
+          })}
+        </div>
       </div>
     </div>
   );
diff --git a/src/components/LBDashboard/WishList/WishList.module.css b/src/components/LBDashboard/WishList/WishList.module.css
index dc5223610b..e3ee1ccf26 100644
--- a/src/components/LBDashboard/WishList/WishList.module.css
+++ b/src/components/LBDashboard/WishList/WishList.module.css
@@ -1,73 +1,174 @@
-.list_location {
-  display: flex;
-  padding-right: 8%;
-  justify-content: flex-end;
-  margin-top: 2% !important;
-  margin-bottom: 0 !important;
+.pageRoot {
+  min-height: 100vh;
 }
 
-.list_title {
-  padding-left: 6%;
-  text-align: left;
+.pageRootDark {
+  background-color: #0a0f1a;
+  color: #e8eaed;
 }
 
-/* .list__overview {
-  background-color: #e0e0e0;
+.item {
+  width: 100%;
+}
+
+.itemContainer {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 0 1rem 2rem;
+  box-sizing: border-box;
+}
+
+.itemLocation {
   display: flex;
   align-items: center;
-  margin: 20px 40px 30px 40px;
-  padding: 10px 0px 10px 0px;
-  width: auto;
-  height: auto;
-} */
-.item_body {
-  background-color: #e0e0e0;
-  margin: 20px 40px 30px 40px;
-  padding: 10px 0px 10px 0px;
-  width: auto;
+  gap: 0.35rem;
+}
+
+.itemIcon {
+  flex-shrink: 0;
+}
+
+.mapLinkLight {
+  color: #1976d2;
+  text-decoration: underline;
+}
+
+.itemImage {
+  width: 100%;
+  max-width: 420px;
   height: auto;
+  display: block;
+  border-radius: 8px;
 }
 
-.item_detailsWrapper {
+.imagePlaceholder {
   display: flex;
-  justify-content: space-evenly;
   align-items: center;
+  justify-content: center;
+  min-height: 180px;
+  background: #d1d1d1;
+  border-radius: 8px;
+  color: #333;
 }
 
-.item_footer {
+.itemDetails {
   display: flex;
-  justify-content: space-between;
-  margin: 0px 40px 10px 30px;
+  flex-direction: column;
+  gap: 0.5rem;
 }
 
-.list_detailsLeft {
-  width: 45%;
-  height: 100%;
-  padding: 2.5%;
-  display: flex;
-  flex-direction: column;
+.listItemAmenities ol {
+  margin: 0.25rem 0 0 1.25rem;
 }
 
-.list_detailsRight {
-  width: 55%;
-  height: 100%;
-  padding: 2.5% 2.5% 2.5% 0%;
+.listTitleDark {
+  color: #e8eaed !important;
 }
 
-.list_itemTitle {
-  font-size: 2.2rem;
+.itemBody {
+  background-color: #e0e0e0;
+  margin: 1rem auto 1.5rem;
+  padding: 0;
+  width: 100%;
+  max-width: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
+  border-radius: 12px;
+  border: 1px solid #ccc;
+}
+
+.itemBodyDark {
+  background-color: #0f1629 !important;
+  border: 1px solid #1c2541 !important;
+  color: #e8eaed;
+}
+
+.wishlistLinkDark {
+  color: #81b0ff !important;
+}
+
+.listItemTitle {
+  font-size: clamp(1.25rem, 2.5vw, 2.2rem);
   text-transform: uppercase;
   font-weight: 600;
 }
 
-h1.list_itemTitleMobile {
+h1.listItemTitleMobile {
   color: black;
   text-transform: uppercase;
 }
 
+.font600 {
+  font-weight: 600;
+}
+
+.itemPrice {
+  padding: 1rem 0;
+}
+
+.pageRootDark .listItemTitle,
+.pageRootDark h1.listItemTitleMobile,
+.pageRootDark h2.listItemTitleMobile {
+  color: #e8eaed !important;
+}
+
+.pageRootDark .font600 {
+  color: #e8eaed;
+}
+
+.pageRootDark .itemPrice {
+  color: #e8eaed;
+}
+
+.pageRootDark .imagePlaceholder {
+  background: #1c2541;
+  color: #9ca3af;
+}
+
+.listLocation {
+  display: flex;
+  padding-right: 0;
+  justify-content: flex-end;
+  margin-top: 1rem !important;
+  margin-bottom: 0 !important;
+}
+
+.listTitle {
+  padding-left: 0;
+  text-align: left;
+  margin: 1rem 0;
+}
+
+/* Main row: image + details only (no footer squeezed as third column) */
+.itemMainRow {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: flex-start;
+  gap: 1.25rem;
+  padding: 1rem 1.25rem 0.75rem;
+  box-sizing: border-box;
+}
+
+.listDetailsLeft {
+  flex: 0 1 42%;
+  max-width: 420px;
+  min-width: 0;
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+
+.listDetailsRight {
+  flex: 1 1 58%;
+  min-width: 0;
+  padding: 0;
+}
+
 .itemTitleWrapper {
   position: relative;
-  height: 2.3rem;
+  min-height: 2.3rem;
 }
 
 .itemTitleWrapperDesktop {
@@ -84,96 +185,133 @@ h1.list_itemTitleMobile {
   bottom: 0;
 }
 
-.font600 {
-  font-weight: 600;
-}
-
-.list_link {
-  margin-top: 2%;
-  text-decoration: underline;
+/* Full-width footer under both columns — no overlap with chat */
+.itemCardFooter {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 1rem;
+  padding: 1rem 1.25rem 1.25rem;
+  margin-top: 0;
+  border-top: 1px solid rgb(0 0 0 / 12%);
+  box-sizing: border-box;
 }
 
-.list_details {
-  margin-top: 3%;
-  text-decoration: underline;
+.pageRootDark .itemCardFooter {
+  border-top-color: #2f3b59;
 }
 
-.wishlist_start_chat {
+.footerLinks {
   display: flex;
   flex-direction: column;
-  align-items: flex-end;
-  margin-top: 2.5%;
-  align-self: center;
+  gap: 0.5rem;
+  flex: 1 1 220px;
+  min-width: 0;
+}
+
+.footerLink {
+  display: inline-block;
+  text-decoration: underline;
+  overflow-wrap: anywhere;
+  line-height: 1.4;
 }
 
-.wishlist_start_chat button {
+.chatButton {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0.5rem;
+  flex-shrink: 0;
   background: #d1d1d1;
-  padding: 2.5%;
-  border-radius: 998px;
+  padding: 0.65rem 1.25rem;
+  border-radius: 999px;
   border: none;
-  width: 33%;
-  display: flex;
-  justify-content: center;
-  min-width: 200px;
-  gap: 10%;
-  align-items: center;
+  min-height: 3rem;
+  font-size: 0.95rem;
   cursor: pointer;
-  transition: background 0.3s ease, transform 0.2s ease;
-  height: 3.5rem;
+  text-decoration: none;
+  color: #111 !important;
+  white-space: nowrap;
+  box-sizing: border-box;
+  max-width: 100%;
 }
 
-.item_price {
-  padding: 2rem 0rem;
+.chatButton:hover {
+  background: #c1c1c1;
+  color: #111 !important;
 }
 
-@media screen and (max-width: 500px) {
-  .item_detailsWrapper {
-    padding: 10px;
-    margin: 10px;
+.chatButtonDark {
+  background: #4f6fdc !important;
+  color: #fff !important;
+  border: 1px solid #a6bbff;
+  box-shadow: 0 0 0 1px rgb(255 255 255 / 15%);
+}
+
+.chatButtonDark:hover {
+  background: #6886ea !important;
+  color: #fff !important;
+}
+
+@media screen and (width <= 800px) {
+  .itemTitleWrapperMobile {
+    display: block;
+    text-align: center;
+  }
+
+  .itemTitleWrapperDesktop {
+    display: none;
+  }
+
+  .itemMainRow {
     flex-direction: column;
     align-items: center;
+    padding: 1rem;
   }
 
-  .wishlist_start_chat button {
-    background: #d1d1d1;
-    padding: 2.5%;
-    border-radius: 998px;
-    border: none;
-    width: 80%;
-    display: flex;
-    justify-content: center;
-    min-width: 150px;
-    font-size: 12px;
-    height: 3.5vh;
+  .listDetailsLeft {
+    flex: 1 1 auto;
+    width: 100%;
+    max-width: 100%;
+    align-items: center;
   }
 
-  .item_footer {
-    padding: 10px;
-    margin: 10px;
+  .listDetailsRight {
+    width: 100%;
   }
-}
 
-@media screen and (max-width: 800px) {
-  .item_detailsWrapper {
-    padding: 10px;
-    margin: 10px;
+  .itemCardFooter {
     flex-direction: column;
+    align-items: stretch;
+  }
+
+  .footerLinks {
     align-items: center;
+    text-align: center;
   }
 
-  .itemTitleWrapperMobile {
-    display: block;
+  .chatButton {
+    width: 100%;
+    white-space: normal;
+    justify-content: center;
   }
-  .itemTitleWrapperDesktop {
-    display: none;
+}
+
+@media screen and (width <= 500px) {
+  .itemContainer {
+    padding: 0 0.75rem 1.5rem;
   }
-  .list_detailsLeft {
-    width: 98%;
+
+  .itemBody {
+    margin: 0.75rem 0;
   }
-  .list_detailsRight {
-    width: 98%;
+
+  .itemMainRow {
+    padding: 0.75rem;
   }
-  .list_link {
-    align-self: center;
+
+  .itemCardFooter {
+    padding: 0.75rem;
   }
 }
diff --git a/src/components/MaterialSummary/MaterialSummary.module.css b/src/components/MaterialSummary/MaterialSummary.module.css
index 4a2fbd3875..f0e7686e5a 100644
--- a/src/components/MaterialSummary/MaterialSummary.module.css
+++ b/src/components/MaterialSummary/MaterialSummary.module.css
@@ -5,6 +5,7 @@
   background-color: var(--bg-color, #f3f4f6);
   min-height: calc(100vh - 70px);
   transition: background-color 0.3s ease, color 0.3s ease;
+
   --bg-color: #f3f4f6;
   --text-color: #000;
   --card-bg: #fff;
@@ -15,6 +16,7 @@
   --input-text: #000;
   --input-border: #d1d5db;
   --accent-card: #f9fafb;
+
   display: block;
   visibility: visible;
 }
@@ -36,7 +38,7 @@
   font-size: 2rem;
   font-weight: 700;
   margin: 0;
-  padding: 28px 40px 24px 40px;
+  padding: 28px 40px 24px;
   color: var(--text-color);
   text-align: center;
   border-bottom: 1px solid var(--border-color);
diff --git a/src/components/Notification/notificationCard.module.css b/src/components/Notification/notificationCard.module.css
index 1889ff40c7..056c1af42a 100644
--- a/src/components/Notification/notificationCard.module.css
+++ b/src/components/Notification/notificationCard.module.css
@@ -10,7 +10,7 @@
   width: min(720px, 100%);
   margin: 8px 0;
   border-radius: 12px;
-  box-shadow: 0 10px 24px rgba(0, 0, 0, 0.18);
+  box-shadow: 0 10px 24px rgb(0 0 0 / 18%);
 }
 
 .notificationCard :global(.card-body) {
@@ -18,14 +18,15 @@
 }
 
 .fade {
-  animation: notificationFade 0.25s ease-out forwards;
+  animation: notification-fade 0.25s ease-out forwards;
 }
 
-@keyframes notificationFade {
+@keyframes notification-fade {
   from {
     opacity: 1;
     transform: translateY(0);
   }
+
   to {
     opacity: 0;
     transform: translateY(-8px);
diff --git a/src/components/PermissionsManagement/PermissionChangeLogTable.jsx b/src/components/PermissionsManagement/PermissionChangeLogTable.jsx
index 8fe4e49962..5d3d64a83b 100644
--- a/src/components/PermissionsManagement/PermissionChangeLogTable.jsx
+++ b/src/components/PermissionsManagement/PermissionChangeLogTable.jsx
@@ -15,7 +15,9 @@ function PermissionChangeLogTable({ changeLogs, darkMode, roleNamesToHighlight =
   const currentItems = changeLogs.slice(indexOfFirstItem, indexOfLastItem);
   const fontColor = darkMode ? 'text-light' : '';
   const bgYinmnBlue = darkMode ? 'bg-yinmn-blue' : '';
-  const addDark = darkMode ? '-dark' : '';
+  const headerClass = darkMode
+    ? styles['permission-change-log-table--header-dark']
+    : styles['permission-change-log-table--header'];
   const paginate = pageNumber => {
     if (pageNumber > 0 && pageNumber <= totalPages) {
       setCurrentPage(pageNumber);
@@ -56,7 +58,7 @@ function PermissionChangeLogTable({ changeLogs, darkMode, roleNamesToHighlight =
 
     return pageNumbers.map(number => {
       const isActive = currentPage === number;
-      const activeClass = darkMode ? 'activeDark' : 'activeLight';
+      const activeClass = darkMode ? styles.activeDark : styles.activeLight;
       const buttonClass = isActive ? activeClass : '';
 
       return (
@@ -86,13 +88,17 @@ function PermissionChangeLogTable({ changeLogs, darkMode, roleNamesToHighlight =
       .filter(e => e);
 
     return (
-      <div className="permissions-cell">
+      <div className={styles['permissions-cell']}>
         {expandedRows[rowId]
           ? filteredPermissions.join(', ') // Show all filtered permissions if expanded
           : filteredPermissions.slice(0, 5).join(', ') +
             (filteredPermissions.length > 5 ? ', ...' : '')}
         {filteredPermissions.length > 5 && (
-          <button className="toggle-button" onClick={() => toggleExpandRow(rowId)} type="button">
+          <button
+            className={styles['toggle-button']}
+            onClick={() => toggleExpandRow(rowId)}
+            type="button"
+          >
             {expandedRows[rowId] ? <FiChevronUp /> : <FiChevronDown />}
           </button>
         )}
@@ -101,153 +107,90 @@ function PermissionChangeLogTable({ changeLogs, darkMode, roleNamesToHighlight =
   };
   return (
     <>
-      <div className={styles.tableResponsive}>
+      <div className={styles['table-responsive']}>
         <table
-          className={`${styles.permissionChangeLogTable} ${darkMode ? 'text-light' : ''}`}
-          style={{ width: '98%', margin: '0 auto' }}
+          className={`${styles['permission-change-log-table']} ${darkMode ? 'text-light' : ''}`}
+          style={{ borderCollapse: 'collapse', width: '98%', margin: '0 auto' }}
         >
           <thead>
-            <tr className={darkMode ? styles.tableRowDark : styles.tableRow}>
-              <th
-                className={
-                  darkMode
-                    ? styles.permissionChangeLogTableHeaderDark
-                    : styles.permissionChangeLogTableHeader
-                }
-              >
-                Log Date and Time (PST)
-              </th>
-              <th
-                className={
-                  darkMode
-                    ? styles.permissionChangeLogTableHeaderDark
-                    : styles.permissionChangeLogTableHeader
-                }
-              >
-                Name
-              </th>
-              <th
-                className={
-                  darkMode
-                    ? styles.permissionChangeLogTableHeaderDark
-                    : styles.permissionChangeLogTableHeader
-                }
-              >
-                Permissions
-              </th>
-              <th
-                className={
-                  darkMode
-                    ? styles.permissionChangeLogTableHeaderDark
-                    : styles.permissionChangeLogTableHeader
-                }
-              >
-                Permissions Added
-              </th>
-              <th
-                className={
-                  darkMode
-                    ? styles.permissionChangeLogTableHeaderDark
-                    : styles.permissionChangeLogTableHeader
-                }
-              >
-                Permissions Removed
-              </th>
-              <th
-                className={
-                  darkMode
-                    ? styles.permissionChangeLogTableHeaderDark
-                    : styles.permissionChangeLogTableHeader
-                }
-              >
-                Editor Role
-              </th>
-              <th
-                className={
-                  darkMode
-                    ? styles.permissionChangeLogTableHeaderDark
-                    : styles.permissionChangeLogTableHeader
-                }
-              >
-                Editor Email
-              </th>
+            <tr className={darkMode ? styles['table-row-dark'] : styles['table-row']}>
+              <th className={headerClass}>Log Date and Time (PST)</th>
+              <th className={headerClass}>Name</th>
+              <th className={headerClass}>Permissions</th>
+              <th className={headerClass}>Permissions Added</th>
+              <th className={headerClass}>Permissions Removed</th>
+              <th className={headerClass}>Editor Role</th>
+              <th className={headerClass}>Editor Email</th>
             </tr>
           </thead>
-
           <tbody>
             {currentItems.map(log => {
               const nameValue = log?.individualName ? formatName(log.individualName) : log.roleName;
-
               const shouldHighlight = roleSet.has(normalize(nameValue));
-
               return (
-                <tr key={log._id} className={shouldHighlight ? styles.highlightRow : ''}>
-                  <td className={styles.permissionChangeLogTableCell}>
+                <tr key={log._id} className={shouldHighlight ? styles['highlight-row'] : ''}>
+                  <td className={`${styles['permission-change-log-table--cell']} ${bgYinmnBlue}`}>
                     {`${formatDate(log.logDateTime)} ${formattedAmPmTime(log.logDateTime)}`}
                   </td>
-
                   <td
-                    className={styles.permissionChangeLogTableCell}
+                    className={`${styles['permission-change-log-table--cell']} ${bgYinmnBlue}`}
                     style={{
+                      // Uncommented lines below and in formatName, using individualName for users, and roleName for role changes
                       fontWeight: log?.individualName ? 'bold' : 'normal',
                     }}
                   >
                     {log?.individualName ? formatName(log.individualName) : log.roleName}
                   </td>
-
-                  <td className={styles.permissionChangeLogTableCell}>
+                  <td className={`${styles['permission-change-log-table--cell']} ${bgYinmnBlue}`}>
                     {renderPermissions(log.permissions, log._id)}
                   </td>
-
-                  <td className={styles.permissionChangeLogTableCell}>
+                  <td className={`${styles['permission-change-log-table--cell']} ${bgYinmnBlue}`}>
                     {renderPermissions(log.permissionsAdded, `${log._id}_added`)}
                   </td>
-
-                  <td className={styles.permissionChangeLogTableCell}>
+                  <td className={`${styles['permission-change-log-table--cell']} ${bgYinmnBlue}`}>
                     {renderPermissions(log.permissionsRemoved, `${log._id}_removed`)}
                   </td>
-
-                  <td className={styles.permissionChangeLogTableCell}>{log.requestorRole}</td>
-
-                  <td className={styles.permissionChangeLogTableCell}>{log.requestorEmail}</td>
+                  <td className={`${styles['permission-change-log-table--cell']} ${bgYinmnBlue}`}>
+                    {log.requestorRole}
+                  </td>
+                  <td className={`${styles['permission-change-log-table--cell']} ${bgYinmnBlue}`}>
+                    {log.requestorEmail}
+                  </td>
                 </tr>
               );
             })}
           </tbody>
         </table>
       </div>
-
-      <div className={styles.paginationContainer}>
-        <div className={styles.pagination}>
+      <div className={styles['pagination-container']}>
+        <div className={`${styles.pagination} ${fontColor}`}>
           <button
+            className={fontColor}
             onClick={() => paginate(currentPage - 1)}
             disabled={currentPage === 1}
             type="button"
           >
             <FiChevronLeft />
           </button>
-
           {currentPage > 3 && (
             <>
-              <button onClick={() => paginate(1)} type="button">
+              <button className={fontColor} onClick={() => paginate(1)} type="button">
                 1
               </button>
               {currentPage > 4 && <span>...</span>}
             </>
           )}
-
           {renderPageNumbers()}
-
           {currentPage < totalPages - 2 && (
             <>
               {currentPage < totalPages - 3 && <span>...</span>}
-              <button onClick={() => paginate(totalPages)} type="button">
+              <button className={fontColor} onClick={() => paginate(totalPages)} type="button">
                 {totalPages}
               </button>
             </>
           )}
-
           <button
+            className={fontColor}
             onClick={() => paginate(currentPage + 1)}
             disabled={currentPage === totalPages}
             type="button"
diff --git a/src/components/PermissionsManagement/PermissionChangeLogTable.module.css b/src/components/PermissionsManagement/PermissionChangeLogTable.module.css
index 4320209b8b..1eeba00057 100644
--- a/src/components/PermissionsManagement/PermissionChangeLogTable.module.css
+++ b/src/components/PermissionsManagement/PermissionChangeLogTable.module.css
@@ -1,68 +1,68 @@
-.tableResponsive {
+.table-responsive {
   overflow-x: auto;
 }
 
-.highlightRow {
-  background-color: #e0f7fa;
-  border-left: 4px solid #00bcd4;
+.highlight-row {
+  background-color: #e0f7fa;           
+  border-left: 4px solid #00bcd4;      
   transition: background 0.2s ease;
 }
 
-.highlightRow:hover {
-  background-color: #b2ebf2;
+.highlight-row:hover {
+  background-color: #b2ebf2;           
 }
 
-.permissionChangeLogTable {
-  border-collapse: 'collapse';
+.permission-change-log-table {
+  border-collapse: collapse;
   width: 100%;
 }
 
 @media (max-width: 1290px) {
-  .permissionChangeLogTable {
+  .permission-change-log-table {
     font-size: 12px;
   }
 }
 
 @media (max-width: 1010px) {
-  .permissionChangeLogTable {
+  .permission-change-log-table {
     font-size: 10px;
   }
 }
 
-.permissionChangeLogTable-Header {
+.permission-change-log-table--header {
   background-color: #e3f0fb;
 }
 
-.permissionChangeLogTable-HeaderDark {
+.permission-change-log-table--header-dark {
   background-color: #1c2541;
   border: 1px solid red;
 }
 
-.permissionChangeLogTable-Header,
-.permissionChangeLogTable-HeaderDark,
-.permissionChangeLogTable-Cell {
+.permission-change-log-table--header,
+.permission-change-log-table--header-dark,
+.permission-change-log-table--cell {
   border: 1px solid #ddd;
   padding: 8px;
 }
 
-.tableRow:hover {
+.table-row:hover {
   background-color: #e3f0fb;
 }
 
-.tableRowDark:hover {
+.table-row-dark:hover {
   background-color: #1c2541;
 }
 
-.permissionChangeLogTable-Button {
+.permission-change-log-table--button {
   padding: 5px 10px;
   margin: 0 5px;
   color: #ffffff;
-  border: 'none';
+  border: none;
   border-radius: 5px;
-  cursor: 'pointer';
+  cursor: pointer;
 }
 
-.paginationContainer {
+.pagination-container {
   display: flex;
   justify-content: center;
   width: 100%;
@@ -105,3 +105,11 @@
   display: inline-block;
   padding: 5px 10px;
 }
+
+.permissions-cell {
+  /* Styles for permissions cell */
+}
+
+.toggle-button {
+  /* Styles for toggle button */
+}
diff --git a/src/components/Projects/WBS/WBSDetail/components/TagsSearch.jsx b/src/components/Projects/WBS/WBSDetail/components/TagsSearch.jsx
index 460447e9c1..d9ce678644 100644
--- a/src/components/Projects/WBS/WBSDetail/components/TagsSearch.jsx
+++ b/src/components/Projects/WBS/WBSDetail/components/TagsSearch.jsx
@@ -4,7 +4,6 @@ import TagSent from './TagSent';
 import styles from './TagsSearch.module.css';
 import ReadOnlySectionWrapper from '../EditTask/ReadOnlySectionWrapper';
 import { findProjectMembers } from '../../../../../actions/projectMembers';
-import clsx from 'clsx';
 
 function TagsSearch(props) {
   const {
@@ -53,10 +52,7 @@ function TagsSearch(props) {
   };
 
   const filteredMembers = useMemo(() => {
-    const resourceNames = new Set(
-      (resourceItems || []).map(item => String(item?.name || '').toLowerCase()),
-    );
-
+    const resourceNames = new Set((resourceItems || []).map(item => String(item?.name || '').toLowerCase()));
     const baseList =
       Array.isArray(members) && members.length > 0
         ? members
@@ -64,13 +60,11 @@ function TagsSearch(props) {
           ? membersFromStore
           : [];
 
-    const applyFiltering = list =>
+    const applyFiltering = (list) =>
       list
-        .filter(m => m && m.isActive === true)
+        .filter(m => m && m.isActive === true) 
         .filter(member => {
-          const fullName = `${member.firstName || member.first || ''} ${
-            member.lastName || member.last || ''
-          }`
+          const fullName = `${member.firstName || member.first || ''} ${member.lastName || member.last || ''}`
             .trim()
             .toLowerCase();
 
@@ -108,22 +102,20 @@ function TagsSearch(props) {
   const shouldShowDropdown = isFocused && filteredMembers.length > 0;
 
   return (
-    <div className={clsx('d-flex flex-column px-0')}>
+    <div className="d-flex flex-column px-0">
       <div className="d-flex flex-column mb-1 px-0">
-        <div className="d-flex flex-column align-items-start justify-content-start w-100 px-0 position-relative">
+        <div className="align-items-start justify-content-start w-100 px-0 position-relative">
           {ReadOnlySectionWrapper(
             <input
               type="text"
               placeholder={placeholder}
-              className={clsx(
-                'border border-dark rounded form-control px-2',
-                darkMode ? 'bg-darkmode-liblack text-light border-0' : '',
-              )}
+              className={`border border-dark rounded form-control px-2 ${
+                darkMode ? 'bg-darkmode-liblack text-light border-0' : ''
+              }`}
               value={searchWord}
-              onChange={handleFilter}
+              onChange={e => handleFilter(e)}
               onFocus={handleFocus}
               onBlur={handleBlur}
-              style={{ textAlign: 'left' }}
             />,
             !disableInput,
             null,
@@ -131,28 +123,20 @@ function TagsSearch(props) {
           )}
 
           {shouldShowDropdown && (
-            <ul
-              className={clsx(
-                'dropdown-menu d-flex flex-column align-items-start justify-content-start w-100 shadow-lg rounded-3 position-absolute bg-light',
-                styles.scrollbar,
-                styles.scrollableMenu,
-              )}
-              style={{ top: '100%', left: 0 }}
-            >
+            <ul className={`my-element dropdown-menu d-flex flex-column align-items-start justify-content-start w-100 ${styles.scrollbar} shadow-lg rounded-3 position-absolute top-100 start-0 z-3 bg-light ${styles['scrollable-menu']}`}>
               {filteredMembers.map((member, index) => (
                 <li
-                  key={member._id || member.userID || index}
-                  className="dropdown-item border-bottom fs-6 w-100 p-1"
+                key={member._id || member.userID || index}
+                className="dropdown-item border-bottom fs-6 w-100 p-1"
+              >
+                <button
+                  type="button"
+                  className="btn w-100 text-start p-0 text-dark"
+                  onMouseDown={event => handleClick(event, member)}
                 >
-                  <button
-                    type="button"
-                    className="btn w-100 text-left p-0 text-dark"
-                    onMouseDown={event => handleClick(event, member)}
-                    style={{ textAlign: 'left' }}
-                  >
-                    {`${member.firstName || member.first} ${member.lastName || member.last}`}
-                  </button>
-                </li>
+                  {`${member.firstName || member.first} ${member.lastName || member.last}`}
+                </button>
+              </li>
               ))}
             </ul>
           )}
@@ -174,6 +158,7 @@ function TagsSearch(props) {
 }
 
 const mapStateToProps = state => ({
+  // ✅ do NOT overwrite `members` prop anymore
   membersFromStore: state.projectMembers.members,
   foundProjectMembers: state.projectMembers.foundProjectMembers,
 });
diff --git a/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.jsx b/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.jsx
index 37b6ddab2a..bab7601419 100644
--- a/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.jsx
+++ b/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.jsx
@@ -1,6 +1,6 @@
 import classnames from 'classnames';
 import { ReportBlock } from '../ReportBlock';
-import './ReportHeader.css';
+import styles from './ReportHeader.module.css';
 
 export function ReportHeader({
   children,
@@ -14,13 +14,13 @@ export function ReportHeader({
 }) {
   return (
     <ReportBlock darkMode={darkMode}>
-      <header className={`report-header ${darkMode ? 'text-light' : ''}`}>
-        <div className="report-header-details">
-          <div className="report-header-profile-pic-wrapper">
+      <header className={`${styles['report-header']} ${darkMode ? 'text-light' : ''}`}>
+        <div className={styles['report-header-details']}>
+          <div className={styles['report-header-profile-pic-wrapper']}>
             {avatar ? (
               <div
                 className={`${
-                  darkMode ? 'report-header-profile-pic-dark' : 'report-header-profile-pic'
+                  darkMode ? styles['report-header-profile-pic-dark'] : styles['report-header-profile-pic']
                 }`}
                 data-testid="avatar-wrapper"
               >
@@ -31,29 +31,29 @@ export function ReportHeader({
                 src={src || '/pfp-default.png'}
                 alt=""
                 className={`${
-                  darkMode ? 'report-header-profile-pic-dark' : 'report-header-profile-pic'
+                  darkMode ? styles['report-header-profile-pic-dark'] : styles['report-header-profile-pic']
                 }`}
               />
             )}
             <div
               className={classnames(
-                `${darkMode ? 'report-header-activity-dark' : 'report-header-activity'}`,
-                { active: isActive },
+                `${darkMode ? styles['report-header-activity-dark'] : styles['report-header-activity']}`,
+                { [styles.active]: isActive },
               )}
             />
           </div>
-          <div className="report-header-entity-name">{name}</div>
-          <div className="report-header-entity-other-info">
+          <div className={styles['report-header-entity-name']}>{name}</div>
+          <div className={styles['report-header-entity-other-info']}>
             <span style={{ fontSize: '20px' }}>{hoursCommitted}</span>
             {hoursCommitted != null &&
               (hoursCommitted === 1 ? <> hour committed</> : <> hours committed</>)}
           </div>
-          <div className="report-header-entity-other-info">
+          <div className={styles['report-header-entity-other-info']}>
             <span style={{ fontSize: '20px' }}>{counts?.activeMemberCount}</span>
             {counts?.activeMemberCount != null &&
               (counts.activeMemberCount === 1 ? <> active member</> : <> active members</>)}
           </div>
-          <div className="report-header-entity-other-info">
+          <div className={styles['report-header-entity-other-info']}>
             <span style={{ fontSize: '20px' }}>{counts?.memberCount}</span>
             {counts?.memberCount != null &&
               (counts.memberCount === 1 ? <> total contributor</> : <> total contributors</>)}
diff --git a/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.css b/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.module.css
similarity index 97%
rename from src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.css
rename to src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.module.css
index fef69d623e..6ac06f8ab5 100644
--- a/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.css
+++ b/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.module.css
@@ -86,6 +86,10 @@
 .report-header-activity-dark.active {
   background-color: #2affa1;
 }
+
+.active {
+  background-color: #2affa1;
+}
 .report-header-entity-other-info{
   font-size: 15px;
 }
diff --git a/src/reducers/listBidDashboard/messagingReducer.js b/src/reducers/listBidDashboard/messagingReducer.js
index fde1cb4d8f..cefb54d888 100644
--- a/src/reducers/listBidDashboard/messagingReducer.js
+++ b/src/reducers/listBidDashboard/messagingReducer.js
@@ -12,27 +12,44 @@ import {
   MARK_MESSAGES_AS_READ_FAILURE,
 } from '../../constants/lbdashboard/messagingConstants';
 
+const toMessageList = payload => {
+  if (Array.isArray(payload)) return payload;
+  if (payload && Array.isArray(payload.messages)) return payload.messages;
+  if (payload && Array.isArray(payload.data)) return payload.data;
+  return [];
+};
+
+const toChatList = payload => {
+  if (Array.isArray(payload)) return payload;
+  if (payload && Array.isArray(payload.chats)) return payload.chats;
+  if (payload && Array.isArray(payload.existingChats)) return payload.existingChats;
+  if (payload && Array.isArray(payload.data)) return payload.data;
+  return [];
+};
+
 const initialState = {
   loading: false,
   messages: [],
+  existingChats: [],
   notifications: [],
   error: null,
 };
 
-export const messagingReducer = (state, action = initialState) => {
+export const messagingReducer = (state = initialState, action) => {
   switch (action.type) {
     case FETCH_MESSAGES_REQUEST:
       return { ...state, loading: true, error: null };
     case FETCH_MESSAGES_SUCCESS:
-      return { ...state, loading: false, messages: action.payload };
+      return { ...state, loading: false, messages: toMessageList(action.payload) };
     case FETCH_MESSAGES_FAILURE:
       return { ...state, loading: false, error: action.payload };
     case MESSAGE_RECEIVED:
-      return { ...state, messages: [...state.messages, action.payload] };
+      if (action.payload == null) return state;
+      return { ...state, messages: [...(state.messages ?? []), action.payload] };
     case MESSAGE_STATUS_UPDATED:
       return {
         ...state,
-        messages: state.messages.map(msg =>
+        messages: (state.messages ?? []).map(msg =>
           msg.sender === action.payload.userId && msg.status !== 'read'
             ? { ...msg, status: 'read' }
             : msg,
@@ -51,12 +68,14 @@ export const messagingReducer = (state, action = initialState) => {
     case 'CLEAR_DB_NOTIFICATIONS':
       return {
         ...state,
-        notifications: state.notifications.filter(n => !action.payload.includes(n._id)),
+        notifications: Array.isArray(action.payload)
+          ? (state.notifications ?? []).filter(n => !action.payload.includes(n._id))
+          : state.notifications ?? [],
       };
     case FETCH_EXISTING_CHATS_REQUEST:
       return { ...state, loading: true, error: null };
     case FETCH_EXISTING_CHATS_SUCCESS:
-      return { ...state, loading: false, existingChats: action.payload };
+      return { ...state, loading: false, existingChats: toChatList(action.payload) };
     case FETCH_EXISTING_CHATS_FAILURE:
       return { ...state, loading: false, error: action.payload };
     case MARK_MESSAGES_AS_READ_REQUEST:
diff --git a/src/reducers/listBidDashboard/wishListItemReducer.js b/src/reducers/listBidDashboard/wishListItemReducer.js
index 70340a2aad..48c0e09b1d 100644
--- a/src/reducers/listBidDashboard/wishListItemReducer.js
+++ b/src/reducers/listBidDashboard/wishListItemReducer.js
@@ -30,6 +30,12 @@ const wishlists = [
     ],
     location: 'Location',
     price: '$28/Day',
+    host: {
+      userId: '507f1f77bcf86cd799439011',
+      firstName: 'Earthbag',
+      lastName: 'Host',
+      profilePic: '',
+    },
   },
   {
     id: '2',
@@ -48,6 +54,12 @@ const wishlists = [
     ],
     location: 'Location',
     price: '$25/Day',
+    host: {
+      userId: '507f1f77bcf86cd799439012',
+      firstName: 'Cob Village',
+      lastName: 'Host',
+      profilePic: '',
+    },
   },
   {
     id: '3',
@@ -72,6 +84,12 @@ const wishlists = [
     ],
     location: 'Location',
     price: '$50/Day',
+    host: {
+      userId: '507f1f77bcf86cd799439013',
+      firstName: 'Rob Village',
+      lastName: 'Host',
+      profilePic: '',
+    },
   },
 ];
 
diff --git a/src/utils/messagingSocket.js b/src/utils/messagingSocket.js
index b3756e4630..9391414222 100644
--- a/src/utils/messagingSocket.js
+++ b/src/utils/messagingSocket.js
@@ -17,7 +17,11 @@ export const initMessagingSocket = (token) => {
 
     const webSocketURL = ENDPOINTS.MESSAGING_SERVICE;
 
-    messagingSocket = new WebSocket(webSocketURL, token);
+    try {
+        messagingSocket = new WebSocket(webSocketURL, token);
+    } catch (e) {
+        return null;
+    }
 
     messagingSocket.onopen = () => {
         reconnectAttempts = 0;
@@ -29,7 +33,12 @@ export const initMessagingSocket = (token) => {
     };
 
     messagingSocket.onmessage = (message) => {
-        const data = JSON.parse(message.data);
+        let data;
+        try {
+            data = JSON.parse(message.data);
+        } catch (e) {
+            return;
+        }
 
         if (data.action === "RECEIVE_MESSAGE") {
             store.dispatch(handleMessageReceived(data.payload));
diff --git a/yarn.lock b/yarn.lock
index 073641e0ca..0ade22e262 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -240,17 +240,6 @@
     gl-matrix "^3.4.3"
     tslib "^2.5.3"
 
-"@antv/g@^6.1.11", "@antv/g@^6.1.24", "@antv/g@^6.1.28", "@antv/g@^6.1.7":
-  version "6.3.1"
-  resolved "https://registry.npmjs.org/@antv/g/-/g-6.3.1.tgz"
-  integrity sha512-WYEKqy86LHB2PzTmrZXrIsIe+3Epeds2f68zceQ+BJtRoGki7Sy4IhlC8LrUMztgfT1t3d/0L745NWZwITroKA==
-  dependencies:
-    "@antv/g-lite" "2.7.0"
-    "@antv/util" "^3.3.5"
-    "@babel/runtime" "^7.25.6"
-    gl-matrix "^3.4.3"
-    html2canvas "^1.4.1"
-
 "@antv/g2-extension-plot@^0.2.1":
   version "0.2.2"
   resolved "https://registry.npmjs.org/@antv/g2-extension-plot/-/g2-extension-plot-0.2.2.tgz"
@@ -286,7 +275,7 @@
     "@antv/g" "^6.1.24"
     "@antv/g-svg" "^2.0.38"
 
-"@antv/g6@^5.0.28", "@antv/g6@^5.0.44", "@antv/g6@^5.0.50":
+"@antv/g6@^5.0.28", "@antv/g6@^5.0.44":
   version "5.0.51"
   resolved "https://registry.npmjs.org/@antv/g6/-/g6-5.0.51.tgz"
   integrity sha512-/88LJDZ7FHKtpyJibXOnJWZ8gFRp32mLb8KzEFrMuiIC/dsZgTf/oYVw6L4tLKooPXfXqUtrJb2tWFMGR04EMg==
@@ -303,6 +292,17 @@
     "@antv/util" "^3.3.11"
     bubblesets-js "^2.3.4"
 
+"@antv/g@^6.1.11", "@antv/g@^6.1.24", "@antv/g@^6.1.28", "@antv/g@^6.1.7":
+  version "6.3.1"
+  resolved "https://registry.npmjs.org/@antv/g/-/g-6.3.1.tgz"
+  integrity sha512-WYEKqy86LHB2PzTmrZXrIsIe+3Epeds2f68zceQ+BJtRoGki7Sy4IhlC8LrUMztgfT1t3d/0L745NWZwITroKA==
+  dependencies:
+    "@antv/g-lite" "2.7.0"
+    "@antv/util" "^3.3.5"
+    "@babel/runtime" "^7.25.6"
+    gl-matrix "^3.4.3"
+    html2canvas "^1.4.1"
+
 "@antv/graphin@^3.0.4":
   version "3.0.5"
   resolved "https://registry.npmjs.org/@antv/graphin/-/graphin-3.0.5.tgz"
@@ -340,16 +340,7 @@
     ml-matrix "^6.10.4"
     tslib "^2.5.0"
 
-"@antv/scale@^0.4.12":
-  version "0.4.16"
-  resolved "https://registry.npmjs.org/@antv/scale/-/scale-0.4.16.tgz"
-  integrity sha512-5wg/zB5kXHxpTV5OYwJD3ja6R8yTiqIOkjOhmpEJiowkzRlbEC/BOyMvNUq5fqFIHnMCE9woO7+c3zxEQCKPjw==
-  dependencies:
-    "@antv/util" "^3.3.7"
-    color-string "^1.5.5"
-    fecha "^4.2.1"
-
-"@antv/scale@^0.4.16":
+"@antv/scale@^0.4.12", "@antv/scale@^0.4.16":
   version "0.4.16"
   resolved "https://registry.npmjs.org/@antv/scale/-/scale-0.4.16.tgz"
   integrity sha512-5wg/zB5kXHxpTV5OYwJD3ja6R8yTiqIOkjOhmpEJiowkzRlbEC/BOyMvNUq5fqFIHnMCE9woO7+c3zxEQCKPjw==
@@ -442,6 +433,13 @@
     "@csstools/css-tokenizer" "^3.0.3"
     lru-cache "^10.4.3"
 
+"@babel/code-frame@7.12.11":
+  version "7.12.11"
+  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.27.1":
   version "7.27.1"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz"
@@ -451,19 +449,12 @@
     js-tokens "^4.0.0"
     picocolors "^1.1.1"
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
 "@babel/compat-data@^7.27.2", "@babel/compat-data@^7.27.7", "@babel/compat-data@^7.28.0":
   version "7.28.0"
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz"
   integrity sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==
 
-"@babel/core@^7.0.0", "@babel/core@^7.0.0 || ^8.0.0-0", "@babel/core@^7.0.0-0", "@babel/core@^7.0.0-0 || ^8.0.0-0 <8.0.0", "@babel/core@^7.11.0", "@babel/core@^7.11.0 || ^8.0.0-0", "@babel/core@^7.11.0 || ^8.0.0-beta.1", "@babel/core@^7.11.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.13.0", "@babel/core@^7.23.9", "@babel/core@^7.27.4", "@babel/core@^7.28.0", "@babel/core@^7.4.0 || ^8.0.0-0 <8.0.0", "@babel/core@^7.8.0":
+"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9", "@babel/core@^7.27.4", "@babel/core@^7.28.0":
   version "7.28.0"
   resolved "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz"
   integrity sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==
@@ -1618,13 +1609,6 @@
   resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz"
   integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==
 
-"@emotion/is-prop-valid@^1.3.0":
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.1.tgz"
-  integrity sha512-/ACwoqx7XQi9knQs/G0qKvv5teDMhD7bXYns9N/wM8ah8iNb8jZ2uNO0YOgiq2o2poIvVtJS2YALasQuMSQ7Kw==
-  dependencies:
-    "@emotion/memoize" "^0.9.0"
-
 "@emotion/is-prop-valid@1.2.2":
   version "1.2.2"
   resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz"
@@ -1632,6 +1616,13 @@
   dependencies:
     "@emotion/memoize" "^0.8.1"
 
+"@emotion/is-prop-valid@^1.3.0":
+  version "1.3.1"
+  resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.1.tgz"
+  integrity sha512-/ACwoqx7XQi9knQs/G0qKvv5teDMhD7bXYns9N/wM8ah8iNb8jZ2uNO0YOgiq2o2poIvVtJS2YALasQuMSQ7Kw==
+  dependencies:
+    "@emotion/memoize" "^0.9.0"
+
 "@emotion/memoize@^0.8.1":
   version "0.8.1"
   resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz"
@@ -1642,7 +1633,7 @@
   resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz"
   integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==
 
-"@emotion/react@^11.0.0-rc.0", "@emotion/react@^11.4.1", "@emotion/react@^11.5.0", "@emotion/react@^11.8.1", "@emotion/react@^11.9.0":
+"@emotion/react@^11.8.1":
   version "11.14.0"
   resolved "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz"
   integrity sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==
@@ -1672,7 +1663,7 @@
   resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz"
   integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==
 
-"@emotion/styled@^11.14.0", "@emotion/styled@^11.3.0", "@emotion/styled@^11.8.1":
+"@emotion/styled@^11.14.0":
   version "11.14.1"
   resolved "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz"
   integrity sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==
@@ -1684,6 +1675,11 @@
     "@emotion/use-insertion-effect-with-fallbacks" "^1.2.0"
     "@emotion/utils" "^1.4.2"
 
+"@emotion/unitless@0.8.1":
+  version "0.8.1"
+  resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz"
+  integrity sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==
+
 "@emotion/unitless@^0.10.0":
   version "0.10.0"
   resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz"
@@ -1694,11 +1690,6 @@
   resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
-"@emotion/unitless@0.8.1":
-  version "0.8.1"
-  resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz"
-  integrity sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==
-
 "@emotion/use-insertion-effect-with-fallbacks@^1.2.0":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz"
@@ -1736,7 +1727,7 @@
     "@ephox/bedrock-common" "^13.0.0"
     "@ephox/dispute" "^1.0.3"
 
-"@ephox/bedrock-common@^13.0.0", "@ephox/bedrock-common@11 || 12 || 13":
+"@ephox/bedrock-common@11 || 12 || 13", "@ephox/bedrock-common@^13.0.0":
   version "13.0.0"
   resolved "https://registry.npmjs.org/@ephox/bedrock-common/-/bedrock-common-13.0.0.tgz"
   integrity sha512-aJ3gtezZ0duGJAniT/+uWi0fFCJRqNdJjumxhCwOVTc2MSsXcyqn70s6FIlrp/Fw2QuyiEqxgormgrmBUbWNWA==
@@ -1795,16 +1786,16 @@
   resolved "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz"
   integrity sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==
 
-"@esbuild/android-arm@0.25.9":
-  version "0.25.9"
-  resolved "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz"
-  integrity sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==
-
 "@esbuild/android-arm64@0.25.9":
   version "0.25.9"
   resolved "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz"
   integrity sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==
 
+"@esbuild/android-arm@0.25.9":
+  version "0.25.9"
+  resolved "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz"
+  integrity sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==
+
 "@esbuild/android-x64@0.25.9":
   version "0.25.9"
   resolved "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz"
@@ -1830,16 +1821,16 @@
   resolved "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz"
   integrity sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==
 
-"@esbuild/linux-arm@0.25.9":
-  version "0.25.9"
-  resolved "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz"
-  integrity sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==
-
 "@esbuild/linux-arm64@0.25.9":
   version "0.25.9"
   resolved "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz"
   integrity sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==
 
+"@esbuild/linux-arm@0.25.9":
+  version "0.25.9"
+  resolved "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz"
+  integrity sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==
+
 "@esbuild/linux-ia32@0.25.9":
   version "0.25.9"
   resolved "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz"
@@ -2035,7 +2026,7 @@
   resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-7.0.1.tgz"
   integrity sha512-0VpNtO5cNe1/HQWMkl4OdncYK/mv9hnBte0Ew0n6DMzmo3Q3WzDFABHm6LeNTipt5zAyhQ6Ugjiu8aLaEjh1gg==
 
-"@fortawesome/fontawesome-svg-core@^6.7.2", "@fortawesome/fontawesome-svg-core@~1 || ~6 || ~7":
+"@fortawesome/fontawesome-svg-core@^6.7.2":
   version "6.7.2"
   resolved "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.2.tgz"
   integrity sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==
@@ -2266,16 +2257,6 @@
     jest-mock "30.3.0"
     jest-util "30.3.0"
 
-"@jest/environment@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz"
-  integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==
-  dependencies:
-    "@jest/fake-timers" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    "@types/node" "*"
-    jest-mock "^29.7.0"
-
 "@jest/environment@30.2.0":
   version "30.2.0"
   resolved "https://registry.npmjs.org/@jest/environment/-/environment-30.2.0.tgz"
@@ -2296,12 +2277,15 @@
     "@types/node" "*"
     jest-mock "30.3.0"
 
-"@jest/expect-utils@^29.7.0":
+"@jest/environment@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz"
-  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
+  resolved "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz"
+  integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==
   dependencies:
-    jest-get-type "^29.6.3"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    jest-mock "^29.7.0"
 
 "@jest/expect-utils@30.1.1":
   version "30.1.1"
@@ -2317,13 +2301,12 @@
   dependencies:
     "@jest/get-type" "30.1.0"
 
-"@jest/expect@^29.7.0":
+"@jest/expect-utils@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz"
-  integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==
+  resolved "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz"
+  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
   dependencies:
-    expect "^29.7.0"
-    jest-snapshot "^29.7.0"
+    jest-get-type "^29.6.3"
 
 "@jest/expect@30.2.0":
   version "30.2.0"
@@ -2333,17 +2316,13 @@
     expect "30.2.0"
     jest-snapshot "30.2.0"
 
-"@jest/fake-timers@^29.7.0":
+"@jest/expect@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz"
-  integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==
+  resolved "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz"
+  integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==
   dependencies:
-    "@jest/types" "^29.6.3"
-    "@sinonjs/fake-timers" "^10.0.2"
-    "@types/node" "*"
-    jest-message-util "^29.7.0"
-    jest-mock "^29.7.0"
-    jest-util "^29.7.0"
+    expect "^29.7.0"
+    jest-snapshot "^29.7.0"
 
 "@jest/fake-timers@30.2.0":
   version "30.2.0"
@@ -2369,20 +2348,22 @@
     jest-mock "30.3.0"
     jest-util "30.3.0"
 
-"@jest/get-type@30.1.0":
-  version "30.1.0"
-  resolved "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz"
-  integrity sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==
-
-"@jest/globals@^29.7.0":
+"@jest/fake-timers@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz"
-  integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==
+  resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz"
+  integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==
   dependencies:
-    "@jest/environment" "^29.7.0"
-    "@jest/expect" "^29.7.0"
     "@jest/types" "^29.6.3"
+    "@sinonjs/fake-timers" "^10.0.2"
+    "@types/node" "*"
+    jest-message-util "^29.7.0"
     jest-mock "^29.7.0"
+    jest-util "^29.7.0"
+
+"@jest/get-type@30.1.0":
+  version "30.1.0"
+  resolved "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz"
+  integrity sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==
 
 "@jest/globals@30.2.0":
   version "30.2.0"
@@ -2394,6 +2375,16 @@
     "@jest/types" "30.2.0"
     jest-mock "30.2.0"
 
+"@jest/globals@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz"
+  integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/expect" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    jest-mock "^29.7.0"
+
 "@jest/pattern@30.0.1":
   version "30.0.1"
   resolved "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz"
@@ -2431,13 +2422,6 @@
     string-length "^4.0.2"
     v8-to-istanbul "^9.0.1"
 
-"@jest/schemas@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz"
-  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
-  dependencies:
-    "@sinclair/typebox" "^0.27.8"
-
 "@jest/schemas@30.0.5":
   version "30.0.5"
   resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz"
@@ -2445,6 +2429,13 @@
   dependencies:
     "@sinclair/typebox" "^0.34.0"
 
+"@jest/schemas@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz"
+  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
+  dependencies:
+    "@sinclair/typebox" "^0.27.8"
+
 "@jest/snapshot-utils@30.2.0":
   version "30.2.0"
   resolved "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.2.0.tgz"
@@ -2484,27 +2475,6 @@
     jest-haste-map "30.2.0"
     slash "^3.0.0"
 
-"@jest/transform@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz"
-  integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/types" "^29.6.3"
-    "@jridgewell/trace-mapping" "^0.3.18"
-    babel-plugin-istanbul "^6.1.1"
-    chalk "^4.0.0"
-    convert-source-map "^2.0.0"
-    fast-json-stable-stringify "^2.1.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^29.7.0"
-    jest-regex-util "^29.6.3"
-    jest-util "^29.7.0"
-    micromatch "^4.0.4"
-    pirates "^4.0.4"
-    slash "^3.0.0"
-    write-file-atomic "^4.0.2"
-
 "@jest/transform@30.2.0":
   version "30.2.0"
   resolved "https://registry.npmjs.org/@jest/transform/-/transform-30.2.0.tgz"
@@ -2526,28 +2496,26 @@
     slash "^3.0.0"
     write-file-atomic "^5.0.1"
 
-"@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
-
-"@jest/types@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz"
-  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
+"@jest/transform@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz"
+  integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==
   dependencies:
-    "@jest/schemas" "^29.6.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^17.0.8"
+    "@babel/core" "^7.11.6"
+    "@jest/types" "^29.6.3"
+    "@jridgewell/trace-mapping" "^0.3.18"
+    babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
+    convert-source-map "^2.0.0"
+    fast-json-stable-stringify "^2.1.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-util "^29.7.0"
+    micromatch "^4.0.4"
+    pirates "^4.0.4"
+    slash "^3.0.0"
+    write-file-atomic "^4.0.2"
 
 "@jest/types@30.0.5":
   version "30.0.5"
@@ -2588,6 +2556,29 @@
     "@types/yargs" "^17.0.33"
     chalk "^4.1.2"
 
+"@jest/types@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz"
+  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^15.0.0"
+    chalk "^4.0.0"
+
+"@jest/types@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz"
+  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
+  dependencies:
+    "@jest/schemas" "^29.6.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
 "@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
   version "0.3.13"
   resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz"
@@ -2668,7 +2659,7 @@
     clsx "^2.1.1"
     prop-types "^15.8.1"
 
-"@mui/material@^5.15.14 || ^6.0.0 || ^7.0.0", "@mui/material@^7.1.0", "@mui/material@^7.3.1":
+"@mui/material@^7.1.0":
   version "7.3.1"
   resolved "https://registry.npmjs.org/@mui/material/-/material-7.3.1.tgz"
   integrity sha512-Xf6Shbo03YmcBedZMwSpEFOwpYDtU7tC+rhAHTrA9FHk0FpsDqiQ9jUa1j/9s3HLs7KWb5mDcGnlwdh9Q9KAag==
@@ -2707,7 +2698,7 @@
     csstype "^3.2.3"
     prop-types "^15.8.1"
 
-"@mui/system@^5.15.14 || ^6.0.0 || ^7.0.0", "@mui/system@^7.3.1":
+"@mui/system@^7.3.1":
   version "7.3.10"
   resolved "https://registry.npmjs.org/@mui/system/-/system-7.3.10.tgz"
   integrity sha512-/sfPpdpJaQn7BSF+avjIdHSYmxHp0UOBYNxSG9QGKfMOD6sLANCpRPCnanq1Pe0lFf0NHkO2iUk0TNzdWC1USQ==
@@ -2792,7 +2783,7 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   version "2.0.5"
   resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
@@ -2927,7 +2918,7 @@
   resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz"
   integrity sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==
 
-"@popperjs/core@^2.0.0", "@popperjs/core@^2.11.6", "@popperjs/core@^2.11.8":
+"@popperjs/core@^2.11.6", "@popperjs/core@^2.11.8":
   version "2.11.8"
   resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz"
   integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
@@ -3064,16 +3055,16 @@
   resolved "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.49.0.tgz"
   integrity sha512-cqPpZdKUSQYRtLLr6R4X3sD4jCBO1zUmeo3qrWBCqYIeH8Q3KRL4F3V7XJ2Rm8/RJOQBZuqzQGWPjjvFUcYa/w==
 
-"@rollup/rollup-darwin-arm64@^4.54.0":
-  version "4.60.1"
-  resolved "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.1.tgz"
-  integrity sha512-mjCpF7GmkRtSJwon+Rq1N8+pI+8l7w5g9Z3vWj4T7abguC4Czwi3Yu/pFaLvA3TTeMVjnu3ctigusqWUfjZzvw==
-
 "@rollup/rollup-darwin-arm64@4.49.0":
   version "4.49.0"
   resolved "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.49.0.tgz"
   integrity sha512-99kMMSMQT7got6iYX3yyIiJfFndpojBmkHfTc1rIje8VbjhmqBXE+nb7ZZP3A5skLyujvT0eIUCUsxAe6NjWbw==
 
+"@rollup/rollup-darwin-arm64@^4.54.0":
+  version "4.60.1"
+  resolved "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.1.tgz"
+  integrity sha512-mjCpF7GmkRtSJwon+Rq1N8+pI+8l7w5g9Z3vWj4T7abguC4Czwi3Yu/pFaLvA3TTeMVjnu3ctigusqWUfjZzvw==
+
 "@rollup/rollup-darwin-x64@4.49.0":
   version "4.49.0"
   resolved "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.49.0.tgz"
@@ -3270,7 +3261,7 @@
   dependencies:
     "@tanstack/query-core" "5.90.16"
 
-"@testing-library/dom@^10.4.0", "@testing-library/dom@>=7.21.4":
+"@testing-library/dom@^10.4.0":
   version "10.4.1"
   resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz"
   integrity sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==
@@ -3533,7 +3524,7 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^1.0.0", "@types/estree@^1.0.8", "@types/estree@1.0.8":
+"@types/estree@*", "@types/estree@1.0.8", "@types/estree@^1.0.0", "@types/estree@^1.0.8":
   version "1.0.8"
   resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz"
   integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
@@ -3621,7 +3612,7 @@
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/node@*", "@types/node@^18.0.0 || ^20.0.0 || >=22.0.0", "@types/node@>=18":
+"@types/node@*":
   version "24.3.0"
   resolved "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz"
   integrity sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==
@@ -3695,7 +3686,7 @@
   resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz"
   integrity sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==
 
-"@types/react@*", "@types/react@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "@types/react@^17.0.0 || ^18.0.0 || ^19.0.0", "@types/react@^18.2.25 || ^19", "@types/react@>=16.14.8", "@types/react@>=16.9.11":
+"@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11":
   version "19.2.14"
   resolved "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz"
   integrity sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==
@@ -3782,7 +3773,7 @@
     natural-compare "^1.4.0"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/parser@^8.44.1", "@typescript-eslint/parser@^8.58.2":
+"@typescript-eslint/parser@^8.44.1":
   version "8.58.2"
   resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.58.2.tgz"
   integrity sha512-/Zb/xaIDfxeJnvishjGdcR4jmr7S+bda8PKNhRGdljDM+elXhlvN0FyPSsMnLmJUrVG9aPO6dof80wjMawsASg==
@@ -3802,14 +3793,6 @@
     "@typescript-eslint/types" "^8.58.2"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@^8.15.0", "@typescript-eslint/scope-manager@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.58.2.tgz"
-  integrity sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==
-  dependencies:
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/visitor-keys" "8.58.2"
-
 "@typescript-eslint/scope-manager@7.18.0":
   version "7.18.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz"
@@ -3818,7 +3801,15 @@
     "@typescript-eslint/types" "7.18.0"
     "@typescript-eslint/visitor-keys" "7.18.0"
 
-"@typescript-eslint/tsconfig-utils@^8.58.2", "@typescript-eslint/tsconfig-utils@8.58.2":
+"@typescript-eslint/scope-manager@8.58.2", "@typescript-eslint/scope-manager@^8.15.0":
+  version "8.58.2"
+  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.58.2.tgz"
+  integrity sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==
+  dependencies:
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/visitor-keys" "8.58.2"
+
+"@typescript-eslint/tsconfig-utils@8.58.2", "@typescript-eslint/tsconfig-utils@^8.58.2":
   version "8.58.2"
   resolved "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.2.tgz"
   integrity sha512-3SR+RukipDvkkKp/d0jP0dyzuls3DbGmwDpVEc5wqk5f38KFThakqAAO0XMirWAE+kT00oTauTbzMFGPoAzB0A==
@@ -3834,16 +3825,16 @@
     debug "^4.4.3"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/types@^8.58.2", "@typescript-eslint/types@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.58.2.tgz"
-  integrity sha512-9TukXyATBQf/Jq9AMQXfvurk+G5R2MwfqQGDR2GzGz28HvY/lXNKGhkY+6IOubwcquikWk5cjlgPvD2uAA7htQ==
-
 "@typescript-eslint/types@7.18.0":
   version "7.18.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz"
   integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==
 
+"@typescript-eslint/types@8.58.2", "@typescript-eslint/types@^8.58.2":
+  version "8.58.2"
+  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.58.2.tgz"
+  integrity sha512-9TukXyATBQf/Jq9AMQXfvurk+G5R2MwfqQGDR2GzGz28HvY/lXNKGhkY+6IOubwcquikWk5cjlgPvD2uAA7htQ==
+
 "@typescript-eslint/typescript-estree@7.18.0":
   version "7.18.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz"
@@ -3873,6 +3864,16 @@
     tinyglobby "^0.2.15"
     ts-api-utils "^2.5.0"
 
+"@typescript-eslint/utils@8.58.2", "@typescript-eslint/utils@^8.15.0":
+  version "8.58.2"
+  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.58.2.tgz"
+  integrity sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.9.1"
+    "@typescript-eslint/scope-manager" "8.58.2"
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/typescript-estree" "8.58.2"
+
 "@typescript-eslint/utils@^7.7.1":
   version "7.18.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz"
@@ -3883,16 +3884,6 @@
     "@typescript-eslint/types" "7.18.0"
     "@typescript-eslint/typescript-estree" "7.18.0"
 
-"@typescript-eslint/utils@^8.15.0", "@typescript-eslint/utils@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.58.2.tgz"
-  integrity sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.58.2"
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/typescript-estree" "8.58.2"
-
 "@typescript-eslint/visitor-keys@7.18.0":
   version "7.18.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz"
@@ -4043,7 +4034,7 @@
     estree-walker "^3.0.3"
     magic-string "^0.30.17"
 
-"@vitest/pretty-format@^3.2.2", "@vitest/pretty-format@3.2.2":
+"@vitest/pretty-format@3.2.2", "@vitest/pretty-format@^3.2.2":
   version "3.2.2"
   resolved "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.2.tgz"
   integrity sha512-FY4o4U1UDhO9KMd2Wee5vumwcaHw7Vg4V7yR4Oq6uK34nhEJOmdRYrk3ClburPRUA09lXD/oXWZ8y/Sdma0aUQ==
@@ -4096,7 +4087,7 @@
     loupe "^3.1.3"
     tinyrainbow "^2.0.0"
 
-"@webassemblyjs/ast@^1.14.1", "@webassemblyjs/ast@1.14.1":
+"@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1":
   version "1.14.1"
   resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz"
   integrity sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==
@@ -4197,7 +4188,7 @@
     "@webassemblyjs/wasm-gen" "1.14.1"
     "@webassemblyjs/wasm-parser" "1.14.1"
 
-"@webassemblyjs/wasm-parser@^1.14.1", "@webassemblyjs/wasm-parser@1.14.1":
+"@webassemblyjs/wasm-parser@1.14.1", "@webassemblyjs/wasm-parser@^1.14.1":
   version "1.14.1"
   resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz"
   integrity sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==
@@ -4247,7 +4238,7 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.14.0, acorn@^8.15.0, acorn@^8.16.0, acorn@^8.9.0:
+acorn@^8.15.0, acorn@^8.16.0, acorn@^8.9.0:
   version "8.16.0"
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz"
   integrity sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==
@@ -4281,7 +4272,7 @@ ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.0.1, ajv@^8.18.0, ajv@^8.8.2, ajv@^8.9.0:
+ajv@^8.0.0, ajv@^8.0.1, ajv@^8.18.0, ajv@^8.9.0:
   version "8.18.0"
   resolved "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz"
   integrity sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==
@@ -4329,22 +4320,12 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz"
-  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-
-ansi-styles@^5.2.0:
+ansi-styles@^5.0.0, ansi-styles@^5.2.0:
   version "5.2.0"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-ansi-styles@^6.1.0:
-  version "6.2.3"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz"
-  integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
-
-ansi-styles@^6.2.1:
+ansi-styles@^6.1.0, ansi-styles@^6.2.1:
   version "6.2.3"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz"
   integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
@@ -4429,6 +4410,13 @@ argparse@^2.0.1:
   resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+aria-query@5.3.0, aria-query@^5.0.0:
+  version "5.3.0"
+  resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz"
+  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
+  dependencies:
+    dequal "^2.0.3"
+
 aria-query@^4.2.2:
   version "4.2.2"
   resolved "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz"
@@ -4437,13 +4425,6 @@ aria-query@^4.2.2:
     "@babel/runtime" "^7.10.2"
     "@babel/runtime-corejs3" "^7.10.2"
 
-aria-query@^5.0.0, aria-query@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz"
-  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
-  dependencies:
-    dequal "^2.0.3"
-
 aria-query@^5.3.2:
   version "5.3.2"
   resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz"
@@ -4615,7 +4596,7 @@ axios-mock-adapter@^1.22.0:
     fast-deep-equal "^3.1.3"
     is-buffer "^2.0.5"
 
-axios@^1.13.5, "axios@>= 0.17.0":
+axios@^1.13.5:
   version "1.15.0"
   resolved "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz"
   integrity sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==
@@ -4629,19 +4610,6 @@ axobject-query@^4.1.0:
   resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz"
   integrity sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==
 
-babel-jest@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz"
-  integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==
-  dependencies:
-    "@jest/transform" "^29.7.0"
-    "@types/babel__core" "^7.1.14"
-    babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^29.6.3"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    slash "^3.0.0"
-
 babel-jest@30.2.0:
   version "30.2.0"
   resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-30.2.0.tgz"
@@ -4655,6 +4623,19 @@ babel-jest@30.2.0:
     graceful-fs "^4.2.11"
     slash "^3.0.0"
 
+babel-jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz"
+  integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==
+  dependencies:
+    "@jest/transform" "^29.7.0"
+    "@types/babel__core" "^7.1.14"
+    babel-plugin-istanbul "^6.1.1"
+    babel-preset-jest "^29.6.3"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    slash "^3.0.0"
+
 babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
   resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz"
@@ -4677,6 +4658,13 @@ babel-plugin-istanbul@^7.0.1:
     istanbul-lib-instrument "^6.0.2"
     test-exclude "^6.0.0"
 
+babel-plugin-jest-hoist@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.2.0.tgz"
+  integrity sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==
+  dependencies:
+    "@types/babel__core" "^7.20.5"
+
 babel-plugin-jest-hoist@^29.6.3:
   version "29.6.3"
   resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz"
@@ -4687,13 +4675,6 @@ babel-plugin-jest-hoist@^29.6.3:
     "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-jest-hoist@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.2.0.tgz"
-  integrity sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==
-  dependencies:
-    "@types/babel__core" "^7.20.5"
-
 babel-plugin-macros@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz"
@@ -4748,14 +4729,6 @@ babel-preset-current-node-syntax@^1.0.0, babel-preset-current-node-syntax@^1.2.0
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
 
-babel-preset-jest@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz"
-  integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==
-  dependencies:
-    babel-plugin-jest-hoist "^29.6.3"
-    babel-preset-current-node-syntax "^1.0.0"
-
 babel-preset-jest@30.2.0:
   version "30.2.0"
   resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.2.0.tgz"
@@ -4764,6 +4737,14 @@ babel-preset-jest@30.2.0:
     babel-plugin-jest-hoist "30.2.0"
     babel-preset-current-node-syntax "^1.2.0"
 
+babel-preset-jest@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz"
+  integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==
+  dependencies:
+    babel-plugin-jest-hoist "^29.6.3"
+    babel-preset-current-node-syntax "^1.0.0"
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
@@ -4784,42 +4765,27 @@ base64-arraybuffer@^1.0.2:
   resolved "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz"
   integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
 
-base64-js@^1.1.2, base64-js@^1.3.0, base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
 base64-js@1.3.1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
+base64-js@^1.1.2, base64-js@^1.3.0, base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 baseline-browser-mapping@^2.10.12, baseline-browser-mapping@^2.9.17:
   version "2.10.19"
   resolved "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.19.tgz"
   integrity sha512-qCkNLi2sfBOn8XhZQ0FXsT1Ki/Yo5P90hrkRamVFRS7/KV9hpfA4HkoWNU152+8w0zPjnxo5psx5NL3PSGgv5g==
 
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
 bluebird@~3.7.2:
   version "3.7.2"
   resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bn.js@^4.0.0:
-  version "4.12.2"
-  resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz"
-  integrity sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==
-
-bn.js@^4.1.0:
-  version "4.12.2"
-  resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz"
-  integrity sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==
-
-bn.js@^4.11.9:
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
   version "4.12.2"
   resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz"
   integrity sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==
@@ -4936,7 +4902,7 @@ browserify-sign@^4.2.3:
     readable-stream "^2.3.8"
     safe-buffer "^5.2.1"
 
-browserslist@^4.24.0, browserslist@^4.25.3, browserslist@^4.28.1, "browserslist@>= 4.21.0":
+browserslist@^4.24.0, browserslist@^4.25.3, browserslist@^4.28.1:
   version "4.28.2"
   resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz"
   integrity sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==
@@ -5110,7 +5076,7 @@ char-regex@^1.0.2:
   resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-chart.js@^4.1.1, chart.js@^4.5.0, chart.js@>=3.0.0:
+chart.js@^4.5.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/chart.js/-/chart.js-4.5.0.tgz"
   integrity sha512-aYeC/jDgSEx8SHWZvANYMioYMZ2KX02W6f6uVfyteuCGcadDLcYVHdfdygsTQkQ4TKn5lghoojAsPj5pu0SnvQ==
@@ -5191,7 +5157,7 @@ cjs-module-lexer@^2.1.0:
   resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.1.tgz"
   integrity sha512-+CmxIZ/L2vNcEfvNtLdU0ZQ6mbq3FZnwAP2PPTiKP+1QOoKwlKlPgb8UKV0Dds7QVaMnHm+FwSft2VB0s/SLjQ==
 
-classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1, classnames@^2.3.2, classnames@^2.5.1, classnames@2.x:
+classnames@2.x, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1, classnames@^2.3.2, classnames@^2.5.1:
   version "2.5.1"
   resolved "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz"
   integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
@@ -5259,16 +5225,16 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@^1.0.0, color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
+color-name@^1.0.0, color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 color-string@^1.5.5:
   version "1.9.1"
   resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"
@@ -5299,6 +5265,11 @@ comlink@^4.4.1:
   resolved "https://registry.npmjs.org/comlink/-/comlink-4.4.2.tgz"
   integrity sha512-OxGdvBmJuNKSCMO4NTl1L47VRp6xn2wG4F/2hYzB6tiCb709otOxtEYCSvK80PtjODfXXZu8ds+Nw5kVCjqd2g==
 
+commander@7:
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
 commander@^14.0.1:
   version "14.0.1"
   resolved "https://registry.npmjs.org/commander/-/commander-14.0.1.tgz"
@@ -5309,11 +5280,6 @@ commander@^2.20.0:
   resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@7:
-  version "7.2.0"
-  resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
 compute-scroll-into-view@^3.0.2:
   version "3.1.1"
   resolved "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.1.tgz"
@@ -5555,22 +5521,17 @@ cssstyle@^4.2.1:
     "@asamuzakjp/css-color" "^3.2.0"
     rrweb-cssom "^0.8.0"
 
-csstype@^3.0.2, csstype@^3.0.8, csstype@^3.1.3, csstype@3.1.3:
+csstype@3.1.3, csstype@^3.0.2, csstype@^3.0.8, csstype@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
-csstype@^3.2.2:
-  version "3.2.3"
-  resolved "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz"
-  integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==
-
-csstype@^3.2.3:
+csstype@^3.2.2, csstype@^3.2.3:
   version "3.2.3"
   resolved "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz"
   integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==
 
-d3-array@^3.1.6, d3-array@^3.2.0, d3-array@^3.2.4, "d3-array@1 - 3", "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3:
+"d3-array@1 - 3", "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3, d3-array@^3.1.6, d3-array@^3.2.0, d3-array@^3.2.4:
   version "3.2.4"
   resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz"
   integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==
@@ -5605,7 +5566,7 @@ d3-chord@3:
   dependencies:
     d3-path "1 - 3"
 
-d3-color@^3.1.0, "d3-color@1 - 3", d3-color@3:
+"d3-color@1 - 3", d3-color@3, d3-color@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz"
   integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
@@ -5624,7 +5585,7 @@ d3-delaunay@6:
   dependencies:
     delaunator "5"
 
-d3-dispatch@^3.0.1, "d3-dispatch@1 - 3", d3-dispatch@3:
+"d3-dispatch@1 - 3", d3-dispatch@3, d3-dispatch@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz"
   integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==
@@ -5637,7 +5598,7 @@ d3-dispatch@^3.0.1, "d3-dispatch@1 - 3", d3-dispatch@3:
     d3-dispatch "1 - 3"
     d3-selection "3"
 
-d3-dsv@^3.0.1, "d3-dsv@1 - 3", d3-dsv@3:
+"d3-dsv@1 - 3", d3-dsv@3, d3-dsv@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz"
   integrity sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==
@@ -5646,12 +5607,12 @@ d3-dsv@^3.0.1, "d3-dsv@1 - 3", d3-dsv@3:
     iconv-lite "0.6"
     rw "1"
 
-d3-ease@^3.0.1, "d3-ease@1 - 3", d3-ease@3:
+"d3-ease@1 - 3", d3-ease@3, d3-ease@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz"
   integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
 
-d3-fetch@^3.0.1, d3-fetch@3:
+d3-fetch@3, d3-fetch@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz"
   integrity sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==
@@ -5669,7 +5630,7 @@ d3-force-3d@^3.0.5:
     d3-quadtree "1 - 3"
     d3-timer "1 - 3"
 
-d3-force@^3.0.0, d3-force@3:
+d3-force@3, d3-force@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz"
   integrity sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==
@@ -5678,7 +5639,7 @@ d3-force@^3.0.0, d3-force@3:
     d3-quadtree "1 - 3"
     d3-timer "1 - 3"
 
-d3-format@^3.1.0, "d3-format@1 - 3", d3-format@3:
+"d3-format@1 - 3", d3-format@3, d3-format@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz"
   integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==
@@ -5692,31 +5653,31 @@ d3-geo-projection@^4.0.0:
     d3-array "1 - 3"
     d3-geo "1.12.0 - 3"
 
-d3-geo@^3.1.1, "d3-geo@1.12.0 - 3", d3-geo@3:
+"d3-geo@1.12.0 - 3", d3-geo@3, d3-geo@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz"
   integrity sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==
   dependencies:
     d3-array "2.5.0 - 3"
 
-d3-hierarchy@^3.1.2, d3-hierarchy@3:
+d3-hierarchy@3, d3-hierarchy@^3.1.2:
   version "3.1.2"
   resolved "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz"
   integrity sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==
 
-d3-interpolate@^3.0.1, "d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3:
+"d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3, d3-interpolate@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz"
   integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
   dependencies:
     d3-color "1 - 3"
 
-d3-octree@^1.0.2, d3-octree@1:
+d3-octree@1, d3-octree@^1.0.2:
   version "1.1.0"
   resolved "https://registry.npmjs.org/d3-octree/-/d3-octree-1.1.0.tgz"
   integrity sha512-F8gPlqpP+HwRPMO/8uOu5wjH110+6q4cgJvgJT6vlpy3BEaDIKlTZrgHKZSp/i1InRpVfh4puY/kvL6MxK930A==
 
-d3-path@^3.1.0, "d3-path@1 - 3", d3-path@3:
+"d3-path@1 - 3", d3-path@3, d3-path@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz"
   integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==
@@ -5726,12 +5687,12 @@ d3-polygon@3:
   resolved "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz"
   integrity sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==
 
-d3-quadtree@^3.0.1, "d3-quadtree@1 - 3", d3-quadtree@3:
+"d3-quadtree@1 - 3", d3-quadtree@3, d3-quadtree@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz"
   integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==
 
-d3-random@^3.0.1, d3-random@3:
+d3-random@3, d3-random@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz"
   integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==
@@ -5741,7 +5702,7 @@ d3-regression@^1.3.10:
   resolved "https://registry.npmjs.org/d3-regression/-/d3-regression-1.3.10.tgz"
   integrity sha512-PF8GWEL70cHHWpx2jUQXc68r1pyPHIA+St16muk/XRokETzlegj5LriNKg7o4LR0TySug4nHYPJNNRz/W+/Niw==
 
-d3-scale-chromatic@^3.1.0, d3-scale-chromatic@3:
+d3-scale-chromatic@3, d3-scale-chromatic@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz"
   integrity sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==
@@ -5749,7 +5710,7 @@ d3-scale-chromatic@^3.1.0, d3-scale-chromatic@3:
     d3-color "1 - 3"
     d3-interpolate "1 - 3"
 
-d3-scale@^4.0.2, d3-scale@4:
+d3-scale@4, d3-scale@^4.0.2:
   version "4.0.2"
   resolved "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz"
   integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==
@@ -5765,7 +5726,7 @@ d3-scale@^4.0.2, d3-scale@4:
   resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz"
   integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==
 
-d3-shape@^3.1.0, d3-shape@^3.2.0, d3-shape@3:
+d3-shape@3, d3-shape@^3.1.0, d3-shape@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz"
   integrity sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==
@@ -5779,14 +5740,14 @@ d3-shape@^3.1.0, d3-shape@^3.2.0, d3-shape@3:
   dependencies:
     d3-time "1 - 3"
 
-d3-time@^3.0.0, d3-time@^3.1.0, "d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@3:
+"d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@3, d3-time@^3.0.0, d3-time@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz"
   integrity sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==
   dependencies:
     d3-array "2 - 3"
 
-d3-timer@^3.0.1, "d3-timer@1 - 3", d3-timer@3:
+"d3-timer@1 - 3", d3-timer@3, d3-timer@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz"
   integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
@@ -5902,32 +5863,32 @@ date-fns-tz@^2.0.1:
   resolved "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-2.0.1.tgz"
   integrity sha512-fJCG3Pwx8HUoLhkepdsP7Z5RsucUi+ZBOxyM5d0ZZ6c4SdYustq0VMmOu6Wf7bli+yS/Jwp91TOCqn9jMcVrUA==
 
-date-fns@^2.14.0, "date-fns@^2.25.0 || ^3.2.0 || ^4.0.0", "date-fns@^2.28.0 || ^3.0.0", date-fns@^2.30.0, "date-fns@>= 2.x", date-fns@2.x:
+date-fns@^2.14.0, date-fns@^2.30.0:
   version "2.30.0"
   resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz"
   integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
   dependencies:
     "@babel/runtime" "^7.21.0"
 
-dayjs@^1.10.7, dayjs@^1.11.11, dayjs@^1.11.13, dayjs@^1.8.17, "dayjs@>= 1.x":
+dayjs@^1.11.11, dayjs@^1.11.13:
   version "1.11.18"
   resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz"
   integrity sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==
 
-debug@^3.2.7:
-  version "3.2.7"
-  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.4.1, debug@^4.4.3, debug@4:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.4.1, debug@^4.4.3:
   version "4.4.3"
   resolved "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz"
   integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
   dependencies:
     ms "^2.1.3"
 
+debug@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
 decimal.js-light@^2.4.1:
   version "2.5.1"
   resolved "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz"
@@ -6116,7 +6077,7 @@ domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
   resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
-domhandler@^4.2.0, domhandler@^4.2.2, domhandler@4.3.1:
+domhandler@4.3.1, domhandler@^4.2.0, domhandler@^4.2.2:
   version "4.3.1"
   resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"
   integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
@@ -6219,11 +6180,6 @@ emoji-regex@^9.2.2:
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
 encoding-sniffer@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.1.tgz"
@@ -6597,14 +6553,6 @@ eslint-plugin-vitest@^0.5.4:
   dependencies:
     "@typescript-eslint/utils" "^7.7.1"
 
-eslint-scope@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz"
-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^5.2.0"
-
 eslint-scope@5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
@@ -6613,6 +6561,14 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
 eslint-visitor-keys@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
@@ -6633,7 +6589,7 @@ eslint-visitor-keys@^5.0.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz"
   integrity sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==
 
-"eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9", "eslint@^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9", "eslint@^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7", "eslint@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^7.5.0 || ^8.0.0 || ^9.0.0", eslint@^8.56.0, "eslint@^8.57.0 || ^9.0.0", "eslint@^8.57.0 || ^9.0.0 || ^10.0.0", eslint@^8.57.1, eslint@>=3.14.1, eslint@>=5.0.0:
+eslint@^8.57.1:
   version "8.57.1"
   resolved "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz"
   integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
@@ -6784,6 +6740,18 @@ expect-type@^1.2.1:
   resolved "https://registry.npmjs.org/expect-type/-/expect-type-1.2.2.tgz"
   integrity sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA==
 
+expect@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.npmjs.org/expect/-/expect-30.2.0.tgz"
+  integrity sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==
+  dependencies:
+    "@jest/expect-utils" "30.2.0"
+    "@jest/get-type" "30.1.0"
+    jest-matcher-utils "30.2.0"
+    jest-message-util "30.2.0"
+    jest-mock "30.2.0"
+    jest-util "30.2.0"
+
 expect@^29.7.0:
   version "29.7.0"
   resolved "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz"
@@ -6807,18 +6775,6 @@ expect@^30.0.0:
     jest-mock "30.0.5"
     jest-util "30.0.5"
 
-expect@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.npmjs.org/expect/-/expect-30.2.0.tgz"
-  integrity sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==
-  dependencies:
-    "@jest/expect-utils" "30.2.0"
-    "@jest/get-type" "30.1.0"
-    jest-matcher-utils "30.2.0"
-    jest-message-util "30.2.0"
-    jest-mock "30.2.0"
-    jest-util "30.2.0"
-
 fast-check@^2.0.0:
   version "2.25.0"
   resolved "https://registry.npmjs.org/fast-check/-/fast-check-2.25.0.tgz"
@@ -6895,12 +6851,7 @@ fb-watchman@^2.0.0, fb-watchman@^2.0.2:
   dependencies:
     bser "2.1.1"
 
-fdir@^6.4.4:
-  version "6.5.0"
-  resolved "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz"
-  integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==
-
-fdir@^6.5.0:
+fdir@^6.4.4, fdir@^6.5.0:
   version "6.5.0"
   resolved "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz"
   integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==
@@ -7173,19 +7124,7 @@ glob@^10.3.10:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
-glob@^7.1.3:
-  version "7.2.3"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.4:
+glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
   resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -7439,16 +7378,6 @@ html2canvas@^1.0.0-rc.5, html2canvas@^1.4.1:
     css-line-break "^2.1.0"
     text-segmentation "^1.0.3"
 
-htmlparser2@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.0.0.tgz"
-  integrity sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-    domutils "^3.2.1"
-    entities "^6.0.0"
-
 htmlparser2@7.2.0:
   version "7.2.0"
   resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz"
@@ -7459,6 +7388,16 @@ htmlparser2@7.2.0:
     domutils "^2.8.0"
     entities "^3.0.1"
 
+htmlparser2@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.0.0.tgz"
+  integrity sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==
+  dependencies:
+    domelementtype "^2.3.0"
+    domhandler "^5.0.3"
+    domutils "^3.2.1"
+    entities "^6.0.0"
+
 http-proxy-agent@^7.0.2:
   version "7.0.2"
   resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz"
@@ -7485,7 +7424,7 @@ husky@^9.1.7:
   resolved "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz"
   integrity sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==
 
-iconv-lite@^0.6.3, iconv-lite@0.6, iconv-lite@0.6.3:
+iconv-lite@0.6, iconv-lite@0.6.3, iconv-lite@^0.6.3:
   version "0.6.3"
   resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -7551,7 +7490,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4, inherits@2:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -7857,6 +7796,11 @@ is-weakset@^2.0.3:
     call-bound "^1.0.3"
     get-intrinsic "^1.2.6"
 
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
+
 isarray@^2.0.5:
   version "2.0.5"
   resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"
@@ -7867,11 +7811,6 @@ isarray@~1.0.0:
   resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
@@ -8032,16 +7971,6 @@ jest-config@30.2.0:
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz"
-  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^29.6.3"
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
-
 jest-diff@30.1.1:
   version "30.1.1"
   resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-30.1.1.tgz"
@@ -8062,6 +7991,16 @@ jest-diff@30.2.0:
     chalk "^4.1.2"
     pretty-format "30.2.0"
 
+jest-diff@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz"
+  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^29.6.3"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
+
 jest-docblock@30.2.0:
   version "30.2.0"
   resolved "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.2.0.tgz"
@@ -8107,6 +8046,24 @@ jest-get-type@^29.6.3:
   resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz"
   integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
 
+jest-haste-map@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.2.0.tgz"
+  integrity sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==
+  dependencies:
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    anymatch "^3.1.3"
+    fb-watchman "^2.0.2"
+    graceful-fs "^4.2.11"
+    jest-regex-util "30.0.1"
+    jest-util "30.2.0"
+    jest-worker "30.2.0"
+    micromatch "^4.0.8"
+    walker "^1.0.8"
+  optionalDependencies:
+    fsevents "^2.3.3"
+
 jest-haste-map@^29.7.0:
   version "29.7.0"
   resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz"
@@ -8126,24 +8083,6 @@ jest-haste-map@^29.7.0:
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-haste-map@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.2.0.tgz"
-  integrity sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==
-  dependencies:
-    "@jest/types" "30.2.0"
-    "@types/node" "*"
-    anymatch "^3.1.3"
-    fb-watchman "^2.0.2"
-    graceful-fs "^4.2.11"
-    jest-regex-util "30.0.1"
-    jest-util "30.2.0"
-    jest-worker "30.2.0"
-    micromatch "^4.0.8"
-    walker "^1.0.8"
-  optionalDependencies:
-    fsevents "^2.3.3"
-
 jest-leak-detector@30.2.0:
   version "30.2.0"
   resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.2.0.tgz"
@@ -8152,16 +8091,6 @@ jest-leak-detector@30.2.0:
     "@jest/get-type" "30.1.0"
     pretty-format "30.2.0"
 
-jest-matcher-utils@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz"
-  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
-  dependencies:
-    chalk "^4.0.0"
-    jest-diff "^29.7.0"
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
-
 jest-matcher-utils@30.1.1:
   version "30.1.1"
   resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.1.1.tgz"
@@ -8182,20 +8111,15 @@ jest-matcher-utils@30.2.0:
     jest-diff "30.2.0"
     pretty-format "30.2.0"
 
-jest-message-util@^29.7.0:
+jest-matcher-utils@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz"
-  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
+  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz"
+  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
   dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^29.6.3"
-    "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    micromatch "^4.0.4"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
     pretty-format "^29.7.0"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
 
 jest-message-util@30.1.0:
   version "30.1.0"
@@ -8242,14 +8166,20 @@ jest-message-util@30.3.0:
     slash "^3.0.0"
     stack-utils "^2.0.6"
 
-jest-mock@^29.7.0:
+jest-message-util@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz"
-  integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==
+  resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz"
+  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
   dependencies:
+    "@babel/code-frame" "^7.12.13"
     "@jest/types" "^29.6.3"
-    "@types/node" "*"
-    jest-util "^29.7.0"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.7.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
 
 jest-mock@30.0.5:
   version "30.0.5"
@@ -8278,21 +8208,30 @@ jest-mock@30.3.0:
     "@types/node" "*"
     jest-util "30.3.0"
 
+jest-mock@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz"
+  integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    jest-util "^29.7.0"
+
 jest-pnp-resolver@^1.2.3:
   version "1.2.3"
   resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz"
   integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
-jest-regex-util@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz"
-  integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
-
 jest-regex-util@30.0.1:
   version "30.0.1"
   resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz"
   integrity sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==
 
+jest-regex-util@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz"
+  integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
+
 jest-resolve-dependencies@30.2.0:
   version "30.2.0"
   resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.2.0.tgz"
@@ -8301,7 +8240,7 @@ jest-resolve-dependencies@30.2.0:
     jest-regex-util "30.0.1"
     jest-snapshot "30.2.0"
 
-jest-resolve@*, jest-resolve@30.2.0:
+jest-resolve@30.2.0:
   version "30.2.0"
   resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.2.0.tgz"
   integrity sha512-TCrHSxPlx3tBY3hWNtRQKbtgLhsXa1WmbJEqBlTBrGafd5fiQFByy2GNCEoGR+Tns8d15GaL9cxEzKOO3GEb2A==
@@ -8371,32 +8310,6 @@ jest-runtime@30.2.0:
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-snapshot@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz"
-  integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@babel/generator" "^7.7.2"
-    "@babel/plugin-syntax-jsx" "^7.7.2"
-    "@babel/plugin-syntax-typescript" "^7.7.2"
-    "@babel/types" "^7.3.3"
-    "@jest/expect-utils" "^29.7.0"
-    "@jest/transform" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    babel-preset-current-node-syntax "^1.0.0"
-    chalk "^4.0.0"
-    expect "^29.7.0"
-    graceful-fs "^4.2.9"
-    jest-diff "^29.7.0"
-    jest-get-type "^29.6.3"
-    jest-matcher-utils "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-util "^29.7.0"
-    natural-compare "^1.4.0"
-    pretty-format "^29.7.0"
-    semver "^7.5.3"
-
 jest-snapshot@30.2.0:
   version "30.2.0"
   resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.2.0.tgz"
@@ -8424,17 +8337,31 @@ jest-snapshot@30.2.0:
     semver "^7.7.2"
     synckit "^0.11.8"
 
-jest-util@^29.7.0:
+jest-snapshot@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz"
-  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
+  resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz"
+  integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==
   dependencies:
+    "@babel/core" "^7.11.6"
+    "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-jsx" "^7.7.2"
+    "@babel/plugin-syntax-typescript" "^7.7.2"
+    "@babel/types" "^7.3.3"
+    "@jest/expect-utils" "^29.7.0"
+    "@jest/transform" "^29.7.0"
     "@jest/types" "^29.6.3"
-    "@types/node" "*"
+    babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    ci-info "^3.2.0"
+    expect "^29.7.0"
     graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+    natural-compare "^1.4.0"
+    pretty-format "^29.7.0"
+    semver "^7.5.3"
 
 jest-util@30.0.5:
   version "30.0.5"
@@ -8472,6 +8399,18 @@ jest-util@30.3.0:
     graceful-fs "^4.2.11"
     picomatch "^4.0.3"
 
+jest-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz"
+  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
+
 jest-validate@30.2.0:
   version "30.2.0"
   resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-30.2.0.tgz"
@@ -8498,6 +8437,17 @@ jest-watcher@30.2.0:
     jest-util "30.2.0"
     string-length "^4.0.2"
 
+jest-worker@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-30.2.0.tgz"
+  integrity sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==
+  dependencies:
+    "@types/node" "*"
+    "@ungap/structured-clone" "^1.3.0"
+    jest-util "30.2.0"
+    merge-stream "^2.0.0"
+    supports-color "^8.1.1"
+
 jest-worker@^27.4.5:
   version "27.5.1"
   resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"
@@ -8517,17 +8467,6 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest-worker@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-30.2.0.tgz"
-  integrity sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==
-  dependencies:
-    "@types/node" "*"
-    "@ungap/structured-clone" "^1.3.0"
-    jest-util "30.2.0"
-    merge-stream "^2.0.0"
-    supports-color "^8.1.1"
-
 jest@^30.2.0:
   version "30.2.0"
   resolved "https://registry.npmjs.org/jest/-/jest-30.2.0.tgz"
@@ -8561,7 +8500,7 @@ jpeg-exif@^1.1.4:
   resolved "https://registry.npmjs.org/jpeg-exif/-/jpeg-exif-1.1.4.tgz"
   integrity sha512-a+bKEcCjtuW5WTdgeXFzswSrdqi0jk4XlEtZlx5A94wCoBpFjfFTbo/Tra5SpNCl/YFZPvcV1dJc+TAYeg6ROQ==
 
-jquery@^3.7.1, "jquery@1.9.1 - 3":
+jquery@^3.7.1:
   version "3.7.1"
   resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz"
   integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
@@ -8586,7 +8525,7 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsdom@*, jsdom@^26.1.0:
+jsdom@^26.1.0:
   version "26.1.0"
   resolved "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz"
   integrity sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==
@@ -8661,7 +8600,7 @@ json5@^1.0.2:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.3:
+json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -8770,7 +8709,7 @@ leaflet.markercluster@^1.5.3:
   resolved "https://registry.npmjs.org/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz"
   integrity sha512-vPTw/Bndq7eQHjLBVlWpnGeLa3t+3zGiuM7fJwCkiMFq+nmRuG3RI3f7f4N4TDX7T4NpbAXpR2+NTRSEGfCSeA==
 
-leaflet@^1.3.1, leaflet@^1.8.0, leaflet@^1.9.0, leaflet@^1.9.4:
+leaflet@^1.8.0, leaflet@^1.9.4:
   version "1.9.4"
   resolved "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz"
   integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
@@ -8828,15 +8767,6 @@ loader-runner@^4.3.1:
   resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz"
   integrity sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==
 
-loader-utils@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz"
-  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^2.1.2"
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
@@ -8914,12 +8844,7 @@ loupe@^3.1.0, loupe@^3.1.3:
   resolved "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz"
   integrity sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==
 
-lru-cache@^10.2.0:
-  version "10.4.3"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"
-  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
-
-lru-cache@^10.4.3:
+lru-cache@^10.2.0, lru-cache@^10.4.3:
   version "10.4.3"
   resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"
   integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
@@ -8988,16 +8913,16 @@ md5.js@^1.3.4:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-mdn-data@^2.26.0:
-  version "2.28.0"
-  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.28.0.tgz"
-  integrity sha512-uy9AS1yt+wW5eUEefgE3lOpqPghanUttycV0GXKbiXyBjwvbeE8XPj4u1C+voRfz7dEjwU4NDHTMfZ/s/JtZrQ==
-
 mdn-data@2.12.2:
   version "2.12.2"
   resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz"
   integrity sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==
 
+mdn-data@^2.26.0:
+  version "2.28.0"
+  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.28.0.tgz"
+  integrity sha512-uy9AS1yt+wW5eUEefgE3lOpqPghanUttycV0GXKbiXyBjwvbeE8XPj4u1C+voRfz7dEjwU4NDHTMfZ/s/JtZrQ==
+
 mem@^8.0.0:
   version "8.1.1"
   resolved "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz"
@@ -9006,16 +8931,16 @@ mem@^8.0.0:
     map-age-cleaner "^0.1.3"
     mimic-fn "^3.1.0"
 
-memoize-one@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz"
-  integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
-
 "memoize-one@>=3.1.1 <6":
   version "5.2.1"
   resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
+memoize-one@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz"
+  integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
+
 meow@^13.2.0:
   version "13.2.0"
   resolved "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz"
@@ -9158,7 +9083,7 @@ moment-timezone@^0.5.33:
   dependencies:
     moment "^2.29.4"
 
-moment@^2.29.4, moment@^2.30.1, "moment@>= 2.x":
+moment@^2.29.4, moment@^2.30.1:
   version "2.30.1"
   resolved "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz"
   integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
@@ -9173,7 +9098,7 @@ ms@^2.1.1, ms@^2.1.3:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-msw@^2.10.4, msw@^2.4.9:
+msw@^2.10.4:
   version "2.11.0"
   resolved "https://registry.npmjs.org/msw/-/msw-2.11.0.tgz"
   integrity sha512-jEqa5J5B1OMD1jHu0gasCb5YriIDiWGdoS22Ie8CNNrl1iGRzCVfok3zuerdfb7GNFeIbYePXDA5c2bwRKMpBA==
@@ -9603,7 +9528,7 @@ performance-now@^2.1.0:
   resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
-picocolors@^1.0.0, picocolors@^1.1.1, picocolors@1.1.1:
+picocolors@1.1.1, picocolors@^1.0.0, picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
@@ -9613,17 +9538,12 @@ picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-"picomatch@^3 || ^4", picomatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz"
-  integrity sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==
-
 picomatch@^4.0.2:
   version "4.0.3"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz"
   integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==
 
-picomatch@^4.0.3:
+picomatch@^4.0.3, picomatch@^4.0.4:
   version "4.0.4"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz"
   integrity sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==
@@ -9670,7 +9590,7 @@ postcss-safe-parser@^7.0.1:
   resolved "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz"
   integrity sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==
 
-postcss-selector-parser@^7.0.0, postcss-selector-parser@^7.1.0:
+postcss-selector-parser@^7.1.0:
   version "7.1.0"
   resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz"
   integrity sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==
@@ -9683,7 +9603,7 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.2.0:
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.31, postcss@8.4.49:
+postcss@8.4.49:
   version "8.4.49"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz"
   integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
@@ -9692,16 +9612,7 @@ postcss@^8.4.31, postcss@8.4.49:
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
-postcss@^8.5.3:
-  version "8.5.6"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz"
-  integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==
-  dependencies:
-    nanoid "^3.3.11"
-    picocolors "^1.1.1"
-    source-map-js "^1.2.1"
-
-postcss@^8.5.6:
+postcss@^8.5.3, postcss@^8.5.6:
   version "8.5.6"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz"
   integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==
@@ -9722,11 +9633,38 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^1.19.1, prettier@>=1.13.0:
+prettier@^1.19.1:
   version "1.19.1"
   resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
+pretty-format@30.0.5, pretty-format@^30.0.0:
+  version "30.0.5"
+  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-30.0.5.tgz"
+  integrity sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==
+  dependencies:
+    "@jest/schemas" "30.0.5"
+    ansi-styles "^5.2.0"
+    react-is "^18.3.1"
+
+pretty-format@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-30.2.0.tgz"
+  integrity sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==
+  dependencies:
+    "@jest/schemas" "30.0.5"
+    ansi-styles "^5.2.0"
+    react-is "^18.3.1"
+
+pretty-format@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz"
+  integrity sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==
+  dependencies:
+    "@jest/schemas" "30.0.5"
+    ansi-styles "^5.2.0"
+    react-is "^18.3.1"
+
 pretty-format@^26.6.2:
   version "26.6.2"
   resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz"
@@ -9755,33 +9693,6 @@ pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-pretty-format@^30.0.0, pretty-format@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-30.0.5.tgz"
-  integrity sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==
-  dependencies:
-    "@jest/schemas" "30.0.5"
-    ansi-styles "^5.2.0"
-    react-is "^18.3.1"
-
-pretty-format@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-30.2.0.tgz"
-  integrity sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==
-  dependencies:
-    "@jest/schemas" "30.0.5"
-    ansi-styles "^5.2.0"
-    react-is "^18.3.1"
-
-pretty-format@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz"
-  integrity sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==
-  dependencies:
-    "@jest/schemas" "30.0.5"
-    ansi-styles "^5.2.0"
-    react-is "^18.3.1"
-
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
@@ -9795,7 +9706,7 @@ prop-types-extra@^1.1.0:
     react-is "^16.3.2"
     warning "^4.0.0"
 
-prop-types@^15.0.0, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -10319,9 +10230,9 @@ react-day-picker@^8.10.1:
   resolved "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.10.1.tgz"
   integrity sha512-TMx7fNbhLk15eqcMt+7Z7S2KF7mfTId/XJDjKE8f+IUcFn0l08/kI4FiYTL/0yuOLmEcbR4Fwe3GJf/NiiMnPA==
 
-react-dom@*, "react-dom@^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom@^15.5.x || ^16.x || ^17.x || ^18.x", "react-dom@^16 || ^17 || ^18", "react-dom@^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom@^16.12.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0", "react-dom@^16.8.0 || ^17 || ^18", "react-dom@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom@^16.9.0 || ^17 || ^18", "react-dom@^17.0.0 || ^18.0.0 || ^19.0.0", react-dom@^18.0.0, "react-dom@^18.0.0 || ^19.0.0", "react-dom@^18.0.0 || ^19.1.0", react-dom@^18.3.1, "react-dom@^19.0.0 || ^18.0.0 || ^17.0.1 || ^16.7.0", "react-dom@>= 16.8.0", react-dom@>=15, react-dom@>=15.0.0, react-dom@>=16, react-dom@>=16.0.0, react-dom@>=16.11.0, react-dom@>=16.3.0, react-dom@>=16.6.0, react-dom@>=16.8, react-dom@>=16.8.0, react-dom@>=16.8.4, react-dom@>=16.9.0, react-dom@>=18.0.0, "react-dom@~15 || ~16 || ~17 || ~18":
+react-dom@18.3.1, react-dom@^18.3.1:
   version "18.3.1"
-  resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
   integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
   dependencies:
     loose-envify "^1.1.0"
@@ -10337,47 +10248,17 @@ react-icons@^4.12.0:
   resolved "https://registry.npmjs.org/react-icons/-/react-icons-4.12.0.tgz"
   integrity sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw==
 
-react-is@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-react-is@^16.3.2:
-  version "16.13.1"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-react-is@^16.6.0:
-  version "16.13.1"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-react-is@^16.7.0:
+react-is@^16.13.1, react-is@^16.3.2, react-is@^16.6.0, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.1:
-  version "17.0.2"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
-  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
-
-react-is@^17.0.2:
+react-is@^17.0.1, react-is@^17.0.2:
   version "17.0.2"
   resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-react-is@^18.0.0:
-  version "18.3.1"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz"
-  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
-
-react-is@^18.2.0:
-  version "18.3.1"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz"
-  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
-
-react-is@^18.3.1:
+react-is@^18.0.0, react-is@^18.2.0, react-is@^18.3.1:
   version "18.3.1"
   resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz"
   integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
@@ -10392,7 +10273,7 @@ react-is@^19.2.3:
   resolved "https://registry.npmjs.org/react-is/-/react-is-19.2.5.tgz"
   integrity sha512-Dn0t8IQhCmeIT3wu+Apm1/YVsJXsGWi6k4sPdnBIdqMVtHtv0IGi6dcpNpNkNac0zB2uUAqNX3MHzN8c+z2rwQ==
 
-react-leaflet@^4.0.0, react-leaflet@4.2.1:
+react-leaflet@4.2.1, react-leaflet@^4.0.0:
   version "4.2.1"
   resolved "https://registry.npmjs.org/react-leaflet/-/react-leaflet-4.2.1.tgz"
   integrity sha512-p9chkvhcKrWn/H/1FFeVSqLdReGwn2qmiobOQGO3BifX+/vV/39qhY8dGqbdcPh1e6jxh/QHriLXr7a4eLFK4Q==
@@ -10466,7 +10347,7 @@ react-property@2.0.0:
   resolved "https://registry.npmjs.org/react-property/-/react-property-2.0.0.tgz"
   integrity sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw==
 
-react-redux@^7.2.0, "react-redux@^7.2.1 || ^8.1.3 || ^9.0.0":
+react-redux@^7.2.0:
   version "7.2.9"
   resolved "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz"
   integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
@@ -10491,7 +10372,7 @@ react-refresh@^0.17.0:
   resolved "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz"
   integrity sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==
 
-react-router-dom@^5.2.0, react-router-dom@>=4:
+react-router-dom@^5.2.0:
   version "5.3.4"
   resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz"
   integrity sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==
@@ -10511,7 +10392,7 @@ react-router-hash-link@^2.3.1:
   dependencies:
     prop-types "^15.7.2"
 
-react-router@^5.3.4, react-router@5.3.4:
+react-router@5.3.4, react-router@^5.3.4:
   version "5.3.4"
   resolved "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz"
   integrity sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==
@@ -10649,9 +10530,9 @@ react-window@^1.8.11:
     "@babel/runtime" "^7.0.0"
     memoize-one ">=3.1.1 <6"
 
-react@*, "react@^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^15.5.x || ^16.x || ^17.x || ^18.x", "react@^16 || ^17 || ^18", "react@^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^16.12.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0", "react@^16.3 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^16.8.0 || ^17 || ^18", "react@^16.8.0 || ^17.0.0 || ^18.0.0", "react@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^16.8.0 || ^17.0.0 || ^18.0.0 || ~19", "react@^16.8.3 || ^17 || ^18", "react@^16.8.3 || ^17.0.0-0 || ^18.0.0", "react@^16.9.0 || ^17 || ^18", "react@^16.9.0 || ^17.0.0 || ^18 || ^19", "react@^17.0.0 || ^18.0.0 || ^19.0.0", "react@^18 || ^19", "react@^18.0 || ^19", react@^18.0.0, "react@^18.0.0 || ^19.0.0", "react@^18.0.0 || ^19.1.0", react@^18.3.1, "react@^19.0.0 || ^18.0.0 || ^17.0.1 || ^16.7.0", "react@>= 16.8.0", react@>=0.14.0, react@>=15, react@>=15.0.0, react@>=16, react@>=16.0.0, react@>=16.11.0, react@>=16.3.0, react@>=16.3.2, react@>=16.6.0, react@>=16.8, react@>=16.8.0, react@>=16.8.4, react@>=16.9.0, react@>=18.0.0, "react@~15 || ~16 || ~17 || ~18", "react@0.14 || 15 || 16 || 17 || 18", "react@0.14.x || ^15.0.0 || ^16.0.0 || ^17.0.0":
+react@18.3.1, react@^18.3.1:
   version "18.3.1"
-  resolved "https://registry.npmjs.org/react/-/react-18.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
   integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
   dependencies:
     loose-envify "^1.1.0"
@@ -10782,14 +10663,14 @@ redux-thunk@^3.1.0:
   resolved "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz"
   integrity sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==
 
-redux@*, redux@^4, redux@^4.0.0, redux@^4.0.5, redux@>3.0.0:
+redux@^4.0.0, redux@^4.0.5:
   version "4.2.1"
   resolved "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz"
   integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
   dependencies:
     "@babel/runtime" "^7.9.2"
 
-redux@^5.0.0, redux@^5.0.1:
+redux@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz"
   integrity sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==
@@ -10956,14 +10837,6 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
 ripemd160@=2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz"
@@ -10972,6 +10845,14 @@ ripemd160@=2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
 robust-predicates@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz"
@@ -11039,12 +10920,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2,
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.0:
-  version "5.1.2"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@~5.1.1:
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -11078,7 +10954,7 @@ sass-loader@^16.0.5:
   dependencies:
     neo-async "^2.6.2"
 
-sass@*, sass@^1.3.0, sass@^1.86.3:
+sass@^1.86.3:
   version "1.91.0"
   resolved "https://registry.npmjs.org/sass/-/sass-1.91.0.tgz"
   integrity sha512-aFOZHGf+ur+bp1bCHZ+u8otKGh77ZtmFyXDo4tlYvT7PWql41Kwd8wdkPqhhT+h2879IVblcHFglIMofsFd1EA==
@@ -11140,12 +11016,7 @@ semver@^5.5.0:
   resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.3.0:
-  version "6.3.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@^6.3.1:
+semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
@@ -11279,12 +11150,7 @@ siginfo@^2.0.0:
   resolved "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz"
   integrity sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==
 
-signal-exit@^3.0.3:
-  version "3.0.7"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-signal-exit@^3.0.7:
+signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -11337,19 +11203,11 @@ slice-ansi@^7.1.0:
     ansi-styles "^6.2.1"
     is-fullwidth-code-point "^5.0.0"
 
-source-map-js@^1.0.1, source-map-js@^1.2.1, "source-map-js@>=0.6.2 <2.0.0":
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"
   integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
 
-source-map-support@~0.5.20:
-  version "0.5.21"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-support@0.5.13:
   version "0.5.13"
   resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz"
@@ -11358,6 +11216,14 @@ source-map-support@0.5.13:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
@@ -11421,13 +11287,6 @@ strict-event-emitter@^0.5.1:
   resolved "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz"
   integrity sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==
 
-string_decoder@^1.1.1, string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 string-argv@^0.3.2:
   version "0.3.2"
   resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz"
@@ -11455,16 +11314,7 @@ string-length@^4.0.2:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.2.3:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -11567,6 +11417,13 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
+string_decoder@^1.1.1, string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
 "strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -11581,14 +11438,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-ansi@^7.0.1:
-  version "7.1.2"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz"
-  integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
-  dependencies:
-    ansi-regex "^6.0.1"
-
-strip-ansi@^7.1.0:
+strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   version "7.1.2"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz"
   integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
@@ -11663,7 +11513,7 @@ stylelint-config-standard@^39.0.1:
   dependencies:
     stylelint-config-recommended "^17.0.0"
 
-stylelint@^16.23.0, stylelint@^16.25.0:
+stylelint@^16.25.0:
   version "16.25.0"
   resolved "https://registry.npmjs.org/stylelint/-/stylelint-16.25.0.tgz"
   integrity sha512-Li0avYWV4nfv1zPbdnxLYBGq4z8DVZxbRgx4Kn6V+Uftz1rMoF1qiEI3oL4kgWqyYgCgs7gT5maHNZ82Gk03vQ==
@@ -11707,11 +11557,6 @@ stylelint@^16.23.0, stylelint@^16.25.0:
     table "^6.9.0"
     write-file-atomic "^5.0.1"
 
-stylis@^4.3.4:
-  version "4.3.6"
-  resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.6.tgz"
-  integrity sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==
-
 stylis@4.2.0:
   version "4.2.0"
   resolved "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz"
@@ -11722,6 +11567,11 @@ stylis@4.3.2:
   resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz"
   integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==
 
+stylis@^4.3.4:
+  version "4.3.6"
+  resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.6.tgz"
+  integrity sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
@@ -11736,14 +11586,7 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0:
-  version "8.1.1"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-color@^8.1.1:
+supports-color@^8.0.0, supports-color@^8.1.1:
   version "8.1.1"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -11816,7 +11659,7 @@ terser-webpack-plugin@^5.3.17:
     schema-utils "^4.3.0"
     terser "^5.31.1"
 
-terser@^5.16.0, terser@^5.31.1:
+terser@^5.31.1:
   version "5.44.0"
   resolved "https://registry.npmjs.org/terser/-/terser-5.44.0.tgz"
   integrity sha512-nIVck8DK+GM/0Frwd+nIhZ84pR/BX7rmXMfYwyg+Sri5oGVE99/E3KvXqpC2xHFxyqXyGHTKBSioxxplrO4I4w==
@@ -11885,7 +11728,7 @@ tinyglobby@^0.2.13, tinyglobby@^0.2.14, tinyglobby@^0.2.15:
     fdir "^6.5.0"
     picomatch "^4.0.4"
 
-tinymce@^7.2.0, "tinymce@^8.0.0 || ^7.0.0 || ^6.0.0 || ^5.5.1", tinymce@>=4.0.0:
+tinymce@^7.2.0:
   version "7.9.1"
   resolved "https://registry.npmjs.org/tinymce/-/tinymce-7.9.1.tgz"
   integrity sha512-zaOHwmiP1EqTeLRXAvVriDb00JYnfEjWGPdKEuac7MiZJ5aiDMZ4Unc98Gmajn+PBljOmO1GKV6G0KwWn3+k8A==
@@ -12011,16 +11854,16 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^2.0.0, tslib@^2.0.3, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.5.3:
-  version "2.8.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz"
-  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
-
 tslib@2.6.2:
   version "2.6.2"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
+tslib@^2.0.0, tslib@^2.0.3, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.5.3:
+  version "2.8.1"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz"
+  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
@@ -12098,7 +11941,7 @@ typed-styles@^0.0.7:
   resolved "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz"
   integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==
 
-typescript@^4.8.4, "typescript@>= 4.8.x", typescript@>=4.2.0, typescript@>=4.8.4, "typescript@>=4.8.4 <6.1.0", typescript@>=4.9.5:
+typescript@^4.8.4:
   version "4.9.5"
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
@@ -12336,7 +12179,7 @@ vite-node@3.2.2:
     pathe "^2.0.3"
     vite "^5.0.0 || ^6.0.0 || ^7.0.0-0"
 
-"vite@^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", "vite@^5.0.0 || ^6.0.0 || ^7.0.0-0", vite@^6.3.5:
+"vite@^5.0.0 || ^6.0.0 || ^7.0.0-0", vite@^6.3.5:
   version "6.3.5"
   resolved "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz"
   integrity sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==
@@ -12350,7 +12193,7 @@ vite-node@3.2.2:
   optionalDependencies:
     fsevents "~2.3.3"
 
-vitest@*, vitest@^3.2.0, vitest@3.2.2:
+vitest@^3.2.0:
   version "3.2.2"
   resolved "https://registry.npmjs.org/vitest/-/vitest-3.2.2.tgz"
   integrity sha512-fyNn/Rp016Bt5qvY0OQvIUCwW2vnaEBLxP42PmKbNIoasSYjML+8xyeADOPvBe+Xfl/ubIw4og7Lt9jflRsCNw==
@@ -12418,7 +12261,7 @@ webpack-sources@^3.3.4:
   resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.4.tgz"
   integrity sha512-7tP1PdV4vF+lYPnkMR0jMY5/la2ub5Fc/8VQrrU+lXkiM6C4TjVfGw7iKfyhnTQOsD+6Q/iKw0eFciziRgD58Q==
 
-webpack@*, webpack@^5.0.0, webpack@^5.1.0, webpack@^5.104.1:
+webpack@^5.104.1:
   version "5.106.1"
   resolved "https://registry.npmjs.org/webpack/-/webpack-5.106.1.tgz"
   integrity sha512-EW8af29ak8Oaf4T8k8YsajjrDBDYgnKZ5er6ljWFJsXABfTNowQfvHLftwcepVgdz+IoLSdEAbBiM9DFXoll9w==
@@ -12522,14 +12365,7 @@ which-typed-array@^1.1.16, which-typed-array@^1.1.19, which-typed-array@^1.1.2:
     gopd "^1.2.0"
     has-tostringtag "^1.0.2"
 
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^1.3.1:
+which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -12556,13 +12392,6 @@ word-wrap@^1.2.5:
   resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-workerize-loader@*:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/workerize-loader/-/workerize-loader-2.0.2.tgz"
-  integrity sha512-HoZ6XY4sHWxA2w0WpzgBwUiR3dv1oo7bS+oCwIpb6n54MclQ/7KXdXsVIChTCygyuHtVuGBO1+i3HzTt699UJQ==
-  dependencies:
-    loader-utils "^2.0.0"
-
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
@@ -12666,7 +12495,7 @@ yaml@^1.10.0:
   resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yaml@^2.4.2, yaml@^2.8.1:
+yaml@^2.8.1:
   version "2.8.3"
   resolved "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz"
   integrity sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==