Merge branch 'main' into drumwolf/userprofile/hero

waterthetrees · Jan 4, 2024 · e89b5f4 · e89b5f4
2 parents 2d174e9 + 8911649
commit e89b5f4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/client/src/pages/Tree/Tree.js b/client/src/pages/Tree/Tree.js
@@ -65,7 +65,7 @@ export default function Tree({
  setTimeout(() => {
  setMaintenanceAlert(null);
  setMaintenanceAlertVisible(false);
- }, 10000);
+ }, 6000);
  }
 
  const closeMaintenanceAlert = () => {
@@ -112,7 +112,6 @@ export default function Tree({
  <TreeMaintenance
  currentTreeData={currentTreeData}
  isTreeQueryError={isTreeQueryError}
- closeTreeDetails={handleClose}
  maintenanceAlert={handleMaintenanceAlert}
  closeMaintenanceAlert={closeMaintenanceAlert}
  />

diff --git a/client/src/pages/Tree/TreeMaintenance.js b/client/src/pages/Tree/TreeMaintenance.js
@@ -11,7 +11,7 @@ import useAuthUtils from '@/components/Auth/useAuthUtils';
 import TreeMaintenanceSidebar from './TreeMaintenanceSidebar';
 import './TreeMaintenance.scss';
 
-export default function TreeMaintenance({ currentTreeData, isTreeQueryError, closeTreeDetails, maintenanceAlert, closeMaintenanceAlert }) {
+export default function TreeMaintenance({ currentTreeData, isTreeQueryError, maintenanceAlert, closeMaintenanceAlert }) {
  const { id } = currentTreeData;
  const { user = {}, isAuthenticated } = useAuth0();
  const { loginToCurrentPage } = useAuthUtils();
@@ -55,7 +55,6 @@ export default function TreeMaintenance({ currentTreeData, isTreeQueryError, clo
 
  const handleConfirm = ({ actions, volunteer, comment }) => {
  closeMaintenanceSidebar();
- closeTreeDetails()
  MaintenanceSubmitNotification("success", "Thank you for submitting a maintenance request!")
 
  if (comment || Object.keys(actions).length) {

diff --git a/client/src/pages/Tree/TreeMaintenance.scss b/client/src/pages/Tree/TreeMaintenance.scss
@@ -11,6 +11,7 @@
  place-items: center;
  width: 100%;
  height: 0px;
+ z-index: 1000000;
 }
 
 .alert-success {