From 5d697091e09509af69e4ef305dda0b232bbe8e8c Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 24 Apr 2025 10:57:21 -0600
Subject: [PATCH] fixed the actions on the bin settings and the bottom
 navigator opening up the side when buttons other than more waere clicked

---
 src/app/Header.tsx        |  2 +-
 src/bin/BinSettings.tsx   |  2 +-
 src/teams/ObjectTeams.tsx | 40 +++++++++++++++++++++++----------------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/app/Header.tsx b/src/app/Header.tsx
index 4bb8e1f..6e4dbaf 100644
--- a/src/app/Header.tsx
+++ b/src/app/Header.tsx
@@ -125,7 +125,7 @@ export default function Header() {
 			</Toolbar>
 			</AppBar>
 			<SideNavigator open={navOpen} onOpen={() => {setNavOpen(true)}} onClose={() => {setNavOpen(false)}} />
-			{isMobile && <BottomNavigator setNavOpen={() => {setNavOpen(true)}} sideIsOpen={navOpen} />}
+			{isMobile && <BottomNavigator setNavOpen={isOpen => {setNavOpen(isOpen)}} sideIsOpen={navOpen} />}
     </>
   )
 }
\ No newline at end of file
diff --git a/src/bin/BinSettings.tsx b/src/bin/BinSettings.tsx
index 3a9f15d..e280917 100644
--- a/src/bin/BinSettings.tsx
+++ b/src/bin/BinSettings.tsx
@@ -2255,7 +2255,7 @@ export default function BinSettings(props: Props) {
     }
     return (
       <DialogActions>
-        <Grid container justifyContent="space-between" direction="row">
+        <Grid container justifyContent="space-between" direction="row" width="100%">
           <Grid size={{ xs: 5 }}>
             {mode === "add" ? (
               <Button
diff --git a/src/teams/ObjectTeams.tsx b/src/teams/ObjectTeams.tsx
index 409b363..d327291 100644
--- a/src/teams/ObjectTeams.tsx
+++ b/src/teams/ObjectTeams.tsx
@@ -40,6 +40,7 @@ import { blue, red } from "@mui/material/colors";
 import { useNavigate } from "react-router-dom";
 import { makeStyles } from "@mui/styles";
 import { Share, RemoveCircle as RemoveUserIcon } from "@mui/icons-material";
+import CancelSubmit from "common/CancelSubmit";
 
 const useStyles = makeStyles((theme: Theme) => {
   const avatarBG = theme.palette.secondary["700" as keyof PaletteColor];
@@ -547,22 +548,29 @@ export default function ObjectTeams(props: Props) {
 
   const actions = () => {
     return (
-      <Grid container direction="row" justifyContent="space-between">
-        <Grid size={{ xs: 4 }}></Grid>
-        <Grid size={{ xs: 8 }} container justifyContent="flex-end">
-          {!cardMode && (
-            <Button onClick={close} color="primary">
-              Cancel
-            </Button>
-          )}
-          {canManageUsers && (
-            <Button onClick={submit} color="primary" disabled={objectUsersUnchanged()}>
-              {cardMode ? "Update" : "Submit"}
-            </Button>
-          )}
-        </Grid>
-      </Grid>
-    );
+      <CancelSubmit 
+        onCancel={close}
+        onSubmit={submit}
+        submitText={cardMode ? "Update" : "Submit"}
+      />
+    )
+    // return (
+    //   <Grid container direction="row" justifyContent="space-between">
+    //     <Grid size={{ xs: 4 }}></Grid>
+    //     <Grid size={{ xs: 8 }} container justifyContent="flex-end">
+    //       {!cardMode && (
+    //         <Button onClick={close} color="primary">
+    //           Cancel
+    //         </Button>
+    //       )}
+    //       {canManageUsers && (
+    //         <Button onClick={submit} color="primary" disabled={objectUsersUnchanged()}>
+    //           {cardMode ? "Update" : "Submit"}
+    //         </Button>
+    //       )}
+    //     </Grid>
+    //   </Grid>
+    // );
   };
 
   const dialogs = () => {