From 27590da78fe748f3e58120c9c9f6372741c55ce5 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 23 Dec 2025 10:16:31 -0600
Subject: [PATCH 01/50] changed the component used in the bin and component
 settings to the grain selector and split out the form into another component
 that handles just the form and passing up a grainSettings object from its
 fields

---
 src/bin/BinSettings.tsx           |   4 +-
 src/bin/BinVisualizerV2.tsx       |   4 +-
 src/component/ComponentForm.tsx   |   4 +-
 src/grain/CustomGrainForm.tsx     | 172 +++++-------------------------
 src/grain/CustomGrainSelector.tsx | 155 +++++++++++++++++++++++++++
 src/navigation/Router.tsx         |   2 +
 src/pages/Grains.tsx              |  35 ++++++
 7 files changed, 225 insertions(+), 151 deletions(-)
 create mode 100644 src/grain/CustomGrainSelector.tsx
 create mode 100644 src/pages/Grains.tsx

diff --git a/src/bin/BinSettings.tsx b/src/bin/BinSettings.tsx
index 69e0510..4192974 100644
--- a/src/bin/BinSettings.tsx
+++ b/src/bin/BinSettings.tsx
@@ -65,7 +65,7 @@ import { getDistanceUnit, or, getTemperatureUnit, getGrainUnit } from "utils";
 import { makeStyles } from "@mui/styles";
 import { useNavigate } from "react-router-dom";
 import BinSelector from "./BinSelector";
-import CustomGrainForm from "grain/CustomGrainForm";
+import CustomGrainSelector from "grain/CustomGrainSelector";
 // import BinSelector from "./BinSelector";
 
 const useStyles = makeStyles((theme: Theme) => {
@@ -1054,7 +1054,7 @@ export default function BinSettings(props: Props) {
                     </React.Fragment>
                   :
                     <Box sx={{border: "1px solid white", borderRadius: 2, padding: 2, marginBottom: 2}}>
-                      <CustomGrainForm initialGrain={customGrain} onGrainSettingsChange={(newGrainSettings) => {setCustomGrain(newGrainSettings)}}/>
+                      <CustomGrainSelector initialGrain={customGrain} onGrainSettingsChange={(newGrainSettings) => {setCustomGrain(newGrainSettings)}}/>
                     </Box>
                   }
                 </React.Fragment>
diff --git a/src/bin/BinVisualizerV2.tsx b/src/bin/BinVisualizerV2.tsx
index 3895a13..be26827 100644
--- a/src/bin/BinVisualizerV2.tsx
+++ b/src/bin/BinVisualizerV2.tsx
@@ -70,7 +70,7 @@ import Edit from "@mui/icons-material/Edit";
 import { makeStyles } from "@mui/styles";
 import ButtonGroup from "common/ButtonGroup";
 import ModeChangeDialog from "./conditioning/modeChangeDialog";
-import CustomGrainForm from "grain/CustomGrainForm";
+import CustomGrainSelector from "grain/CustomGrainSelector";
 
 const useStyles = makeStyles((theme: Theme) => {
   return ({
@@ -861,7 +861,7 @@ export default function BinVisualizer(props: Props) {
                   className={classes.bottomSpacing}
                 />
               )} */}
-              <CustomGrainForm initialGrain={bin.customGrain()} onGrainSettingsChange={settings => {setNewGrainSettings(settings)}}/>
+              <CustomGrainSelector initialGrain={bin.customGrain()} onGrainSettingsChange={settings => {setNewGrainSettings(settings)}}/>
             </React.Fragment>
           ) : (
             <TextField
diff --git a/src/component/ComponentForm.tsx b/src/component/ComponentForm.tsx
index 3334b83..21ca747 100644
--- a/src/component/ComponentForm.tsx
+++ b/src/component/ComponentForm.tsx
@@ -48,7 +48,7 @@ import { getDistanceUnit } from "utils";
 import { GrainOptions } from "grain";
 import CompModes from "component/ComponentMode.json";
 import FanPicker from "fans/fanPicker";
-import CustomGrainForm from "grain/CustomGrainForm";
+import CustomGrainSelector from "grain/CustomGrainSelector";
 
 const useStyles = makeStyles((theme: Theme) => {
   return ({
@@ -654,7 +654,7 @@ export default function ComponentForm(props: Props) {
         />
         {useCustomGrain ? 
         <Box sx={{border: "1px solid white", borderRadius: 2, padding: 2, marginBottom: 2}}>
-          <CustomGrainForm onGrainSettingsChange={updateCustomGrain} initialGrain={form.component.customGrainProps()}/>
+          <CustomGrainSelector onGrainSettingsChange={updateCustomGrain} initialGrain={form.component.customGrainProps()}/>
         </Box>
         :
         <SearchSelect
diff --git a/src/grain/CustomGrainForm.tsx b/src/grain/CustomGrainForm.tsx
index ae20d93..ecdf899 100644
--- a/src/grain/CustomGrainForm.tsx
+++ b/src/grain/CustomGrainForm.tsx
@@ -1,74 +1,37 @@
-import { ExpandMore } from "@mui/icons-material"
-import { Accordion, AccordionDetails, AccordionSummary, Box, Button, MenuItem, TextField, Typography } from "@mui/material"
-import SearchSelect, { Option } from "common/SearchSelect"
+import {MenuItem, TextField } from "@mui/material"
 import { cloneDeep } from "lodash"
 import { pond } from "protobuf-ts/pond"
-import { useGlobalState } from "providers"
-import { useGrainAPI } from "providers/pond/grainAPI"
 import React, { useEffect, useState } from "react"
 
 interface Props {
-  initialGrain?: pond.GrainSettings
-  onGrainSettingsChange: (settings: pond.GrainSettings) => void
+  grainSettings?: pond.GrainSettings
+  onGrainSettingsChange: (settings: pond.GrainSettings, formValid: boolean) => void
 }
 
 export default function CustomGrainForm(props: Props) {
-  const {initialGrain, onGrainSettingsChange} = props
-  const grainAPI = useGrainAPI()
-  const [{as}] = useGlobalState()
-  const [name, setName] = useState(initialGrain ? initialGrain.name : "")
-  const [group, setGroup] = useState(initialGrain ? initialGrain.group : "")
-  const [equation, setEquation] = useState<pond.MoistureEquation>(initialGrain ? initialGrain.equation : pond.MoistureEquation.MOISTURE_EQUATION_NONE)
-  const [constantA, setConstantA] = useState(initialGrain ? initialGrain.a.toString() : "0")
-  const [constantB, setConstantB] = useState(initialGrain ? initialGrain.b.toString() : "0")
-  const [constantC, setConstantC] = useState(initialGrain ? initialGrain.c.toString() : "0")
-  const [kgPerBushel, setKgPerBushel] = useState(initialGrain ? initialGrain.kgPerBushel.toString() : "0")
-  const [bushelsPerTonne, setBushelsPerTonne] = useState(initialGrain ? initialGrain.bushelsPerTonne.toString() : "0")
-  const [newGrainSettings, setNewGrainSettings] = useState(initialGrain ?? pond.GrainSettings.create())
-  const [grainMap, setGrainMap] = useState<Map<string, pond.GrainObject>>(
-    initialGrain ? 
-      new Map([
-        ["Active", pond.GrainObject.create({key: "Active", name: initialGrain.name, settings: initialGrain})]
-      ])
-    :
-      new Map())
-  const [grainOptions, setGrainOptions] = useState<Option[]>(
-    initialGrain ? 
-      [
-        {
-          label: initialGrain.name, 
-          value: "Active", 
-          group: "Active"
-        }
-      ] 
-    : 
-      []
-    )
-  const [isNew, setIsNew] = useState(false)
-  const [selectedOption, setSelectedOption] = useState<Option | null>(initialGrain ? {
-          label: initialGrain.name, 
-          value: "Active", 
-          group: "Active"
-        } : null)
+  const {grainSettings, onGrainSettingsChange} = props
+  const [newGrainSettings, setNewGrainSettings] = useState(pond.GrainSettings.create())
+  const [name, setName] = useState("")
+  const [group, setGroup] = useState("")
+  const [equation, setEquation] = useState<pond.MoistureEquation>(pond.MoistureEquation.MOISTURE_EQUATION_NONE)
+  const [constantA, setConstantA] = useState("0")
+  const [constantB, setConstantB] = useState("0")
+  const [constantC, setConstantC] = useState("0")
+  const [kgPerBushel, setKgPerBushel] = useState("0")
+  const [bushelsPerTonne, setBushelsPerTonne] = useState("0")
 
   useEffect(()=>{
-    grainAPI.listGrains(0, 0, "asc", "name", undefined, undefined, undefined, as).then(resp => {
-      let options: Option[] = grainOptions
-      let map: Map<string, pond.GrainObject> = grainMap
-      if (resp.data.grains){
-        resp.data.grains.forEach(grain => {
-          map.set(grain.key, grain)
-          options.push({
-            label: grain.name,
-            value: grain.key,
-            group: grain.settings?.group,
-          })
-        })
-      }
-      setGrainOptions([...options])
-      setGrainMap(map)
-    })
-  },[grainAPI])
+    if(grainSettings){
+      setName(grainSettings.name)
+      setGroup(grainSettings.group)
+      setEquation(grainSettings.equation)
+      setConstantA(grainSettings.a.toString())
+      setConstantB(grainSettings.b.toString())
+      setConstantC(grainSettings.c.toString())
+      setKgPerBushel(grainSettings.kgPerBushel.toString())
+      setBushelsPerTonne(grainSettings.bushelsPerTonne.toString())
+    }
+  },[grainSettings])
 
   const invalid = () => {
     if (name === "") return true
@@ -81,21 +44,12 @@ export default function CustomGrainForm(props: Props) {
     return false
   }
 
-  const saveGrain = () => {
-    // console.log(newGrainSettings)
-    grainAPI.addGrain(newGrainSettings, as).then(resp => {
-      console.log("grain added")
-    }).catch(err => {
-      console.log("err")
-    })
-  }
-
   const settingsChanged = (newSettings: pond.GrainSettings) => {
     setNewGrainSettings(newSettings)
-    onGrainSettingsChange(newSettings)
+    onGrainSettingsChange(newSettings, !invalid())
   }
 
-  const newGrain = () => {
+  const grainForm = () => {
     return (
       <React.Fragment>
         <TextField 
@@ -106,7 +60,6 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let name = e.target.value
             setName(name)
-            setIsNew(true)
             let settings = cloneDeep(newGrainSettings)
             settings.name = name
             settingsChanged(settings)
@@ -119,7 +72,6 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let group = e.target.value
             setGroup(group)
-            setIsNew(true)
             let settings = cloneDeep(newGrainSettings)
             settings.group = group
             settingsChanged(settings)
@@ -133,7 +85,6 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let enumVal = parseFloat(e.target.value)
             setEquation(enumVal)
-            setIsNew(true)
             let settings = cloneDeep(newGrainSettings)
             settings.equation = enumVal
             settingsChanged(settings)
@@ -165,7 +116,6 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let val = e.target.value
             setConstantA(val)
-            setIsNew(true)
             if(!isNaN(parseFloat(val))){
               let settings = cloneDeep(newGrainSettings)
               settings.a = parseFloat(val)
@@ -183,7 +133,6 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let val = e.target.value
             setConstantB(val)
-            setIsNew(true)
             if(!isNaN(parseFloat(val))){
               let settings = cloneDeep(newGrainSettings)
               settings.b = parseFloat(val)
@@ -201,7 +150,6 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let val = e.target.value
             setConstantC(val)
-            setIsNew(true)
             if(!isNaN(parseFloat(val))){
               let settings = cloneDeep(newGrainSettings)
               settings.c = parseFloat(val)
@@ -219,7 +167,6 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let val = e.target.value
             setKgPerBushel(val)
-            setIsNew(true)
             if(!isNaN(parseFloat(val))){
               let settings = cloneDeep(newGrainSettings)
               settings.kgPerBushel = parseFloat(val)
@@ -237,7 +184,6 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let val = e.target.value
             setBushelsPerTonne(val)
-            setIsNew(true)
             if(!isNaN(parseFloat(val))){
               let settings = cloneDeep(newGrainSettings)
               settings.bushelsPerTonne = parseFloat(val)
@@ -245,77 +191,13 @@ export default function CustomGrainForm(props: Props) {
             }
           }}
           label="Bushels per Tonne"/>
-        {isNew &&
-          <Box display='flex' justifyContent="flex-end">
-            <Button 
-              variant="contained" 
-              disabled={invalid()}
-              onClick={() => {
-                saveGrain()
-                setIsNew(false)
-              }}
-              color="primary">
-                Save Custom Grain
-            </Button>
-          </Box>
-        }
       </React.Fragment>
     )
   }
 
-  const grainAccordion = () => {
-    return (
-      <Accordion>
-       <AccordionSummary expandIcon={<ExpandMore />}>Custom Grain Properties</AccordionSummary> 
-       <AccordionDetails>
-        {newGrain()}
-       </AccordionDetails>
-      </Accordion>
-    )
-  }
-
   return (
     <React.Fragment>
-      {grainOptions.length === 0 ? 
-        <Box>
-          <Typography sx={{marginBottom: 1}}>Custom Grain Properties</Typography>
-          {newGrain()}
-        </Box>
-      :
-      <Box>
-          <Box sx={{marginBottom: 2}}>
-            <SearchSelect
-              label="My Grains"
-              selected={selectedOption}
-              changeSelection={option => {
-                setIsNew(false)
-                setSelectedOption(option)
-                //when an option is selected set all of the state variables controlling the form entries
-                let grain = grainMap.get(option?.value)
-                if(grain && grain.settings){
-                  //set the form values
-                  setName(grain.name)
-                  setGroup(grain.settings.group)
-                  setEquation(grain.settings.equation)
-                  setConstantA(grain.settings.a.toString())
-                  setConstantB(grain.settings.b.toString())
-                  setConstantC(grain.settings.c.toString())
-                  setKgPerBushel(grain.settings.kgPerBushel.toString())
-                  setBushelsPerTonne(grain.settings.bushelsPerTonne.toString())
-                  //the the new grain settings object
-                  setNewGrainSettings(grain.settings)
-                  //pass that settings object back up
-                  settingsChanged(grain.settings)
-                }
-              }}
-              group
-              options={grainOptions}
-            />
-          </Box>
-          {grainAccordion()}
-        </Box>
-
-      }
+      {grainForm()}
     </React.Fragment>
   )
 }
\ No newline at end of file
diff --git a/src/grain/CustomGrainSelector.tsx b/src/grain/CustomGrainSelector.tsx
new file mode 100644
index 0000000..236b975
--- /dev/null
+++ b/src/grain/CustomGrainSelector.tsx
@@ -0,0 +1,155 @@
+import { ExpandMore } from "@mui/icons-material"
+import { Accordion, AccordionDetails, AccordionSummary, Box, Button, Typography } from "@mui/material"
+import SearchSelect, { Option } from "common/SearchSelect"
+import { pond } from "protobuf-ts/pond"
+import { useGlobalState } from "providers"
+import { useGrainAPI } from "providers/pond/grainAPI"
+import React, { useEffect, useState } from "react"
+import CustomGrainForm from "./CustomGrainForm"
+
+interface Props {
+  initialGrain?: pond.GrainSettings
+  onGrainSettingsChange: (settings: pond.GrainSettings) => void
+}
+
+export default function CustomGrainSelector(props: Props) {
+  const {initialGrain, onGrainSettingsChange} = props
+  const grainAPI = useGrainAPI()
+  const [{as}] = useGlobalState()
+  const [newGrainSettings, setNewGrainSettings] = useState(initialGrain ?? pond.GrainSettings.create())
+  const [formValid, setFormValid] = useState(true)
+  const [grainMap, setGrainMap] = useState<Map<string, pond.GrainObject>>(
+    initialGrain ? 
+      new Map([
+        ["Active", pond.GrainObject.create({key: "Active", name: initialGrain.name, settings: initialGrain})]
+      ])
+    :
+      new Map())
+  const [grainOptions, setGrainOptions] = useState<Option[]>(
+    initialGrain ? 
+      [
+        {
+          label: initialGrain.name, 
+          value: "Active", 
+          group: "Active"
+        }
+      ] 
+    : 
+      []
+    )
+  const [isNew, setIsNew] = useState(false)
+  const [selectedOption, setSelectedOption] = useState<Option | null>(initialGrain ? {
+          label: initialGrain.name, 
+          value: "Active", 
+          group: "Active"
+        } : null)
+
+  useEffect(()=>{
+    grainAPI.listGrains(0, 0, "asc", "name", undefined, undefined, undefined, as).then(resp => {
+      let options: Option[] = grainOptions
+      let map: Map<string, pond.GrainObject> = grainMap
+      if (resp.data.grains){
+        resp.data.grains.forEach(grain => {
+          map.set(grain.key, grain)
+          options.push({
+            label: grain.name,
+            value: grain.key,
+            group: grain.settings?.group,
+          })
+        })
+      }
+      setGrainOptions([...options])
+      setGrainMap(map)
+    })
+  },[grainAPI])
+
+  const saveGrain = () => {
+    // console.log(newGrainSettings)
+    grainAPI.addGrain(newGrainSettings, as).then(resp => {
+      console.log("grain added")
+    }).catch(err => {
+      console.log("err")
+    })
+  }
+
+  const settingsChanged = (newSettings: pond.GrainSettings, formValid: boolean) => {
+    setNewGrainSettings(newSettings)
+    setIsNew(true)
+    setFormValid(formValid)
+    onGrainSettingsChange(newSettings)
+  }
+
+  const grainAccordion = () => {
+    return (
+      <Accordion>
+       <AccordionSummary expandIcon={<ExpandMore />}>Custom Grain Properties</AccordionSummary> 
+       <AccordionDetails>
+        <CustomGrainForm grainSettings={newGrainSettings} onGrainSettingsChange={settingsChanged}/>
+        {isNew &&
+          <Box display='flex' justifyContent="flex-end">
+            <Button 
+              variant="contained" 
+              disabled={!formValid}
+              onClick={() => {
+                setIsNew(false)
+                saveGrain()
+              }}
+              color="primary">
+                Save Custom Grain
+            </Button>
+          </Box>
+        }
+       </AccordionDetails>
+      </Accordion>
+    )
+  }
+
+  return (
+    <React.Fragment>
+      {grainOptions.length === 0 ? 
+        <Box>
+          <Typography sx={{marginBottom: 1}}>Custom Grain Properties</Typography>
+          <CustomGrainForm grainSettings={newGrainSettings} onGrainSettingsChange={settingsChanged}/>
+          {isNew &&
+            <Box display='flex' justifyContent="flex-end">
+              <Button 
+                variant="contained" 
+                disabled={!formValid}
+                onClick={() => {
+                  setIsNew(false)
+                }}
+                color="primary">
+                  Save Custom Grain
+              </Button>
+            </Box>
+          }
+        </Box>
+      :
+      <Box>
+          <Box sx={{marginBottom: 2}}>
+            <SearchSelect
+              label="My Grains"
+              selected={selectedOption}
+              changeSelection={option => {
+                setIsNew(false)
+                setSelectedOption(option)
+                //when an option is selected set all of the state variables controlling the form entries
+                let grain = grainMap.get(option?.value)
+                if(grain && grain.settings){
+                  //the the new grain settings object
+                  setNewGrainSettings(grain.settings)
+                  //pass that settings object back up
+                  settingsChanged(grain.settings, true)
+                }
+              }}
+              group
+              options={grainOptions}
+            />
+          </Box>
+          {grainAccordion()}
+        </Box>
+
+      }
+    </React.Fragment>
+  )
+}
\ No newline at end of file
diff --git a/src/navigation/Router.tsx b/src/navigation/Router.tsx
index c54c291..cb97f67 100644
--- a/src/navigation/Router.tsx
+++ b/src/navigation/Router.tsx
@@ -48,6 +48,7 @@ const JohnDeere = lazy(() => import("pages/JohnDeere"));
 const CNHi = lazy(() => import("pages/CNHi"));
 const LibraCart = lazy(() => import("pages/LibraCart"));
 const FieldPage = lazy(()=>import("pages/Field"));
+const GrainsPage = lazy(()=>import("pages/Grains"));
 
 export const appendToUrl = (appendage: number | string) => {
   const basePath = location.pathname.replace(/\/$/, ""); 
@@ -360,6 +361,7 @@ export default function Router() {
           {user.hasFeature("libra-cart") &&
           <Route path="libracart" element={<LibraCart />} />
           }
+          <Route path="grains" element={<GrainsPage />} />
           {/* Map routes */}
           <Route path="visualFarm" element={<FieldMap />} />
           <Route path="aviationMap" element={<AviationMap />} />
diff --git a/src/pages/Grains.tsx b/src/pages/Grains.tsx
new file mode 100644
index 0000000..6d5fba8
--- /dev/null
+++ b/src/pages/Grains.tsx
@@ -0,0 +1,35 @@
+import { useState } from "react";
+import PageContainer from "./PageContainer";
+import CustomGrainForm from "grain/CustomGrainForm";
+import { Button } from "@mui/material";
+import { pond } from "protobuf-ts/pond";
+
+export default function Grains() {
+  const [currentCustomGrain, setCurrentCustomGrain] = useState<pond.GrainSettings>()
+
+  //function to load the first set of custom grains
+  const loadCustomGrain = () => {}
+
+  //function to update
+
+  //tabs to select supported and custom
+  const grainTab = () => {}
+
+  //table that will display the grains (both for the supported grain and custom for the user)
+  const grainTable = () => {}
+
+  //the grain display for supported grain type to show the rest of the data such as what constants are used in the formula
+  const supportedDisplay = () => {}
+
+  //the grain display for custom grain the user has defined
+  const customGrainDisplay = () => {}
+
+  return (
+    <PageContainer>
+      GRAIN PAGE
+      <CustomGrainForm grainSettings={currentCustomGrain} onGrainSettingsChange={()=>{}}/>
+        <Button onClick={() => {setCurrentCustomGrain(pond.GrainSettings.create({name: "grain one"}))}}>CG1</Button>
+        <Button onClick={() => {setCurrentCustomGrain(pond.GrainSettings.create({name: "grain two"}))}}>CG2</Button>
+    </PageContainer>
+  )
+}
\ No newline at end of file

From 3dbab9a6d312a8b7582e7a9a8d63e41ecac198ac Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Mon, 29 Dec 2025 14:49:35 -0600
Subject: [PATCH 02/50] adding the form to the right side of the page when
 veiwing custom grains

---
 src/pages/Grains.tsx | 73 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 65 insertions(+), 8 deletions(-)

diff --git a/src/pages/Grains.tsx b/src/pages/Grains.tsx
index 6d5fba8..2b6b227 100644
--- a/src/pages/Grains.tsx
+++ b/src/pages/Grains.tsx
@@ -1,11 +1,16 @@
 import { useState } from "react";
 import PageContainer from "./PageContainer";
 import CustomGrainForm from "grain/CustomGrainForm";
-import { Button } from "@mui/material";
+import { Box, Button, Grid2, Typography } from "@mui/material";
 import { pond } from "protobuf-ts/pond";
+import ButtonGroup from "common/ButtonGroup";
+import { useMobile } from "hooks";
 
 export default function Grains() {
   const [currentCustomGrain, setCurrentCustomGrain] = useState<pond.GrainSettings>()
+  const [displayCustom, setDisplayCustom] = useState(false)
+  const [grainTableData, setGrainTableData] = useState()
+  const isMobile = useMobile()
 
   //function to load the first set of custom grains
   const loadCustomGrain = () => {}
@@ -16,20 +21,72 @@ export default function Grains() {
   const grainTab = () => {}
 
   //table that will display the grains (both for the supported grain and custom for the user)
-  const grainTable = () => {}
+  const grainTable = () => {
+
+  }
 
   //the grain display for supported grain type to show the rest of the data such as what constants are used in the formula
-  const supportedDisplay = () => {}
+  const supportedDisplay = () => {
+    return (
+      <Box></Box>
+    )
+  }
 
   //the grain display for custom grain the user has defined
-  const customGrainDisplay = () => {}
+  const customGrainDisplay = () => {
+    return (
+      <Box padding={2}>
+        <CustomGrainForm grainSettings={currentCustomGrain} onGrainSettingsChange={()=>{}}/>
+      </Box>
+    )
+  }
+
+  const desktopView = () => {
+    return (
+      <Grid2 container>
+        <Grid2 size={7}>
+
+        </Grid2>
+        <Grid2 size={5}>
+          {displayCustom ? customGrainDisplay() : supportedDisplay()}
+        </Grid2>
+      </Grid2>
+    )
+  }
+
+  const mobileView = () => {
+    return (
+      <Box></Box>
+    )
+  }
 
   return (
     <PageContainer>
-      GRAIN PAGE
-      <CustomGrainForm grainSettings={currentCustomGrain} onGrainSettingsChange={()=>{}}/>
-        <Button onClick={() => {setCurrentCustomGrain(pond.GrainSettings.create({name: "grain one"}))}}>CG1</Button>
-        <Button onClick={() => {setCurrentCustomGrain(pond.GrainSettings.create({name: "grain two"}))}}>CG2</Button>
+      <Typography>
+        GRAIN PAGE
+      </Typography>
+      <Box display="flex" margin={2}>
+        <ButtonGroup 
+          toggle
+          buttons={[
+            {
+              title: "Supported",
+              function: () => {
+                setDisplayCustom(false)
+              }
+            },
+            {
+              title: "Custom",
+              function: () => {
+                setDisplayCustom(true)
+              }
+            }
+          ]}
+        />
+      </Box>
+        {!isMobile ? desktopView() : mobileView()}
+        {/* <Button onClick={() => {setCurrentCustomGrain(pond.GrainSettings.create({name: "grain one"}))}}>CG1</Button>
+        <Button onClick={() => {setCurrentCustomGrain(pond.GrainSettings.create({name: "grain two"}))}}>CG2</Button> */}
     </PageContainer>
   )
 }
\ No newline at end of file

From 586c971795cb8a007b5cb634a64d0de8b93922b6 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Wed, 31 Dec 2025 13:58:38 -0600
Subject: [PATCH 03/50] finished implementing the custom grain functionality on
 the grains page and the basic desktop view, and also am now using permissions
 to disable the buttons ro add/update/remove

---
 package-lock.json               |   2 +-
 src/grain/CustomGrainForm.tsx   |   1 +
 src/pages/Grains.tsx            | 244 +++++++++++++++++++++++++++++---
 src/providers/pond/grainAPI.tsx |  18 ++-
 4 files changed, 244 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ccb9fd3..f6a295e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10953,7 +10953,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#2aa771366c36285eac26e4e0143c1759380e2fc9",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#917c54113cbb7e14d5037a647b9f6784bf3a8aad",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }
diff --git a/src/grain/CustomGrainForm.tsx b/src/grain/CustomGrainForm.tsx
index ecdf899..2a0379a 100644
--- a/src/grain/CustomGrainForm.tsx
+++ b/src/grain/CustomGrainForm.tsx
@@ -30,6 +30,7 @@ export default function CustomGrainForm(props: Props) {
       setConstantC(grainSettings.c.toString())
       setKgPerBushel(grainSettings.kgPerBushel.toString())
       setBushelsPerTonne(grainSettings.bushelsPerTonne.toString())
+      setNewGrainSettings(grainSettings)
     }
   },[grainSettings])
 
diff --git a/src/pages/Grains.tsx b/src/pages/Grains.tsx
index 2b6b227..ae4b3ac 100644
--- a/src/pages/Grains.tsx
+++ b/src/pages/Grains.tsx
@@ -1,28 +1,144 @@
-import { useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import PageContainer from "./PageContainer";
 import CustomGrainForm from "grain/CustomGrainForm";
-import { Box, Button, Grid2, Typography } from "@mui/material";
+import { Box, Button, DialogActions, DialogContent, DialogTitle, Grid2, Typography } from "@mui/material";
 import { pond } from "protobuf-ts/pond";
 import ButtonGroup from "common/ButtonGroup";
-import { useMobile } from "hooks";
+import { useMobile, useSnackbar, useUserAPI } from "hooks";
+import { useGrainAPI } from "providers/pond/grainAPI";
+import ResponsiveTable from "common/ResponsiveTable";
+import { GrainExtension } from "grain";
+import ResponsiveDialog from "common/ResponsiveDialog";
+import { useGlobalState } from "providers";
+import { Scope } from "models";
 
 export default function Grains() {
   const [currentCustomGrain, setCurrentCustomGrain] = useState<pond.GrainSettings>()
+  const [formValid, setFormValid] = useState(false)
+  const [selectedGrain, setSelectedGrain] = useState<pond.GrainObject | undefined>()
   const [displayCustom, setDisplayCustom] = useState(false)
-  const [grainTableData, setGrainTableData] = useState()
+  const { openSnack } = useSnackbar()
+  const [tableSize, setTableSize] = useState(5)
+  const [tablePage, setTablePage] = useState(0)
+  const [tableTotal, setTableTotal] = useState(0)
+  const grainAPI = useGrainAPI()
+  const userAPI = useUserAPI()
+  const [{as, user}] = useGlobalState();
+  const [permissions, setPermissions] = useState<pond.Permission[]>([])
+  const [openRemoveConfirmation, setOpenRemoveConfirmation] = useState(false)
+  const [openUpdateConfirmation, setOpenUpdateConfirmation] = useState(false)
+  const [grainObjectTableData, setGrainObjectTableData] = useState<pond.GrainObject[]>([])
+  const [supportedGrainTableData, setSupportedGrainTableData] = useState<GrainExtension[]>([])
   const isMobile = useMobile()
 
   //function to load the first set of custom grains
-  const loadCustomGrain = () => {}
+  const loadCustomGrain = useCallback(() => {
+    grainAPI.listGrains(tableSize, tablePage * tableSize, "asc", "name").then(resp => {
+      setGrainObjectTableData(resp.data.grains)
+      setTableTotal(resp.data.total)
+    }).catch(err => {
+      openSnack("There was an issue loading your custom grains")
+    })
+  },[tableSize, tablePage])
+
+  useEffect(() => {
+    if(displayCustom){
+      loadCustomGrain()
+    }
+    //if the user is viewing as a team get their permissions to the team, if they are not then we will get their permission to the grain typ individually when a type is selected
+    if(as){
+      userAPI.getUser(user.id(), { key: as, kind: "team" } as Scope).then(resp => {
+        setPermissions(resp.permissions);
+      });
+    }
+  },[loadCustomGrain, tableSize, tablePage, displayCustom, as])
+
+  const equationName = (enumVal: number) => {
+    switch(enumVal){
+      case pond.MoistureEquation.MOISTURE_EQUATION_CHUNG_PFOST:
+        return "Chung-Pfost"
+      case pond.MoistureEquation.MOISTURE_EQUATION_HALSEY:
+        return "Halsey"
+      case pond.MoistureEquation.MOISTURE_EQUATION_HENDERSON:
+        return "Henderson"
+      case pond.MoistureEquation.MOISTURE_EQUATION_OSWIN:
+        return "Oswin"
+      default:
+        return "None"
+    }
+  }
 
   //function to update
 
-  //tabs to select supported and custom
-  const grainTab = () => {}
-
-  //table that will display the grains (both for the supported grain and custom for the user)
-  const grainTable = () => {
+  //table that will display the custom grains created by the user
+  const grainObjectTable = () => {
+    return (
+      <ResponsiveTable<pond.GrainObject>
+        rows={grainObjectTableData}
+        onRowClick={(grainObj) => {
+          setCurrentCustomGrain(grainObj.settings ?? pond.GrainSettings.create())
+          setSelectedGrain(grainObj)
+          setFormValid(true)
+          /** if they are viewin as a team leave the permissions alone, if not then use the users permissions to the grain type,
+           * for the moment grain types are not shareable so this will be unused, but this will cover our bases if we want to implement sharing in the future
+           * */
+          if (!as) {
+            userAPI.getUser(user.id(), { key: grainObj.key, kind: "grain" } as Scope).then(resp => {
+              setPermissions(resp.permissions);
+            });
+          }
+        }}
+        columns={[
+          {
+            title: "Name",
+            render: row => <Box>
+              <Typography>
+                {row.name}
+              </Typography>
+            </Box>
+          },          
+          {
+            title: "Group",
+            render: row => <Box>
+              <Typography>
+                {row.settings?.group}
+              </Typography>
+            </Box>
+          },          
+          {
+            title: "Equation",
+            render: row => <Box>
+              <Typography>
+                {equationName(row.settings?.equation ?? 0)}
+              </Typography>
+            </Box>
+          }
+        ]}
+        page={tablePage}
+        pageSize={tableSize}
+        handleRowsPerPageChange={(e) => {
+          setTableSize(e.target.value)
+        }}
+        setPage={(page) => {
+          setTablePage(page)
+        }}
+        total={tableTotal}
+      />
+    )
+  }
 
+  //table that will display the grain extensions provided by us
+  const supportedGrainTable = () => {
+    return (
+      <ResponsiveTable<GrainExtension>
+        rows={supportedGrainTableData}
+        page={tablePage}
+        pageSize={tableSize}
+        handleRowsPerPageChange={() => {}}
+        setPage={() => {}}
+        total={tableTotal}
+      />
+    )
   }
 
   //the grain display for supported grain type to show the rest of the data such as what constants are used in the formula
@@ -32,11 +148,101 @@ export default function Grains() {
     )
   }
 
+  const updateGrain = () => {
+    if(selectedGrain && currentCustomGrain){
+      grainAPI.updateGrain(selectedGrain.key, currentCustomGrain).then(resp => {
+        openSnack("Grain type updated")
+      }).catch(err => {
+        openSnack("There was an issue updating the selected grain type")
+      })
+    }
+  }
+  const updateGrainConfirmation = () => {
+    return (
+      <ResponsiveDialog open={openUpdateConfirmation} onClose={() => {setOpenUpdateConfirmation(false)}}>
+        <DialogTitle>Update Custom Grain</DialogTitle>
+        <DialogContent>
+          Update existing custom grain type?
+          <br/> 
+          Note that updating the grain here will not change any bins or components this type was used for, those will retain the old settings.
+        </DialogContent>
+        <DialogActions>
+          <Button variant="contained" color="primary" onClick={()=>{setOpenUpdateConfirmation(false)}}>Cancel</Button>
+          <Button variant="contained" color="primary" onClick={()=>{updateGrain()}}>Confirm</Button>
+        </DialogActions>
+      </ResponsiveDialog>
+    )
+  }
+
+  const addNewGrain = () => {
+    if(currentCustomGrain){
+      grainAPI.addGrain(currentCustomGrain).then(resp => {
+        //new grain added
+        openSnack("New grain type added")
+      }).catch(err => {
+        openSnack("There was a problem creating the new grain type")
+      })
+    }
+  }
+
+  const removeGrain = () => {
+    if(selectedGrain){
+      grainAPI.removeGrain(selectedGrain.key).then(resp => {
+        openSnack("Grain type removed")
+      }).catch(err => {
+        openSnack("There was a problem removing the selected grain type")
+      })
+    }
+  }
+
+
+  const removeConfirmation = () => {
+    return (
+      <ResponsiveDialog open={openRemoveConfirmation} onClose={() => {setOpenRemoveConfirmation(false)}}>
+        <DialogTitle>Remove Custom Grain</DialogTitle>
+        <DialogContent>
+          Remove custom grain type?
+          <br />
+          Note that removing the grain here will not change any bins or components this type was used for, those will retain the old settings.
+        </DialogContent>
+        <DialogActions>
+          <Button variant="contained" color="primary" onClick={()=>{setOpenRemoveConfirmation(false)}}>Cancel</Button>
+          <Button variant="contained" color="primary" onClick={()=>{removeGrain()}}>Confirm</Button>
+        </DialogActions>
+      </ResponsiveDialog>
+    )
+  }
+
+  const customGrainActions = () => {
+    return (
+        <Box display="flex" justifyContent="space-between">
+          <Box>
+            {selectedGrain &&
+              <Button disabled={!permissions.includes(pond.Permission.PERMISSION_WRITE)} variant="contained" color="error" onClick={() => {setOpenRemoveConfirmation(true)}}>Remove Grain</Button>
+            }
+          </Box>
+          <Box>
+            {selectedGrain &&
+              <Button sx={{marginRight: 1}} onClick={() => setOpenUpdateConfirmation(true)} disabled={!formValid || !permissions.includes(pond.Permission.PERMISSION_WRITE)} variant="contained" color="primary">Update</Button>
+            }
+            <Button onClick={() => addNewGrain()} disabled={!formValid || !permissions.includes(pond.Permission.PERMISSION_WRITE)} variant="contained" color="primary">Save New</Button>
+          </Box>
+        </Box>
+    )
+  }
+
   //the grain display for custom grain the user has defined
   const customGrainDisplay = () => {
     return (
-      <Box padding={2}>
-        <CustomGrainForm grainSettings={currentCustomGrain} onGrainSettingsChange={()=>{}}/>
+      <Box>
+        <CustomGrainForm 
+          grainSettings={currentCustomGrain} 
+          onGrainSettingsChange={(newSettings, formValid)=>{
+            setCurrentCustomGrain(newSettings)
+            setFormValid(formValid)
+          }}
+          />
+        {customGrainActions()}
       </Box>
     )
   }
@@ -44,10 +250,10 @@ export default function Grains() {
   const desktopView = () => {
     return (
       <Grid2 container>
-        <Grid2 size={7}>
-
+        <Grid2 size={7} padding={2}>
+          {displayCustom ? grainObjectTable() : supportedGrainTable()}
         </Grid2>
-        <Grid2 size={5}>
+        <Grid2 size={5} padding={2}>
           {displayCustom ? customGrainDisplay() : supportedDisplay()}
         </Grid2>
       </Grid2>
@@ -73,20 +279,22 @@ export default function Grains() {
               title: "Supported",
               function: () => {
                 setDisplayCustom(false)
+                setTablePage(0)
               }
             },
             {
               title: "Custom",
               function: () => {
                 setDisplayCustom(true)
+                setTablePage(0)
               }
             }
           ]}
         />
       </Box>
-        {!isMobile ? desktopView() : mobileView()}
-        {/* <Button onClick={() => {setCurrentCustomGrain(pond.GrainSettings.create({name: "grain one"}))}}>CG1</Button>
-        <Button onClick={() => {setCurrentCustomGrain(pond.GrainSettings.create({name: "grain two"}))}}>CG2</Button> */}
+      {!isMobile ? desktopView() : mobileView()}
+      {updateGrainConfirmation()}
+      {removeConfirmation()}
     </PageContainer>
   )
 }
\ No newline at end of file
diff --git a/src/providers/pond/grainAPI.tsx b/src/providers/pond/grainAPI.tsx
index 37e1dc1..0df0055 100644
--- a/src/providers/pond/grainAPI.tsx
+++ b/src/providers/pond/grainAPI.tsx
@@ -22,6 +22,7 @@ export interface IGrainInterface {
     types?: string[],
     otherTeam?: string,
   ) => Promise<AxiosResponse<pond.ListGrainsResponse>>;
+  updateGrain: (key: string, settings: pond.GrainSettings, otherTeam?: string) => Promise<AxiosResponse<pond.UpdateGrainResponse>>
   removeGrain: (key: string, otherTeam?: string) => Promise<AxiosResponse<pond.RemoveGrainResponse>>;
 }
 
@@ -31,7 +32,7 @@ interface Props {}
 
 export default function GrainProvider(props: PropsWithChildren<Props>) {
   const { children } = props;
-  const { get, del, post } = useHTTP();
+  const { get, del, post, put } = useHTTP();
   const [{ as }] = useGlobalState();
 
   //add
@@ -79,7 +80,6 @@ export default function GrainProvider(props: PropsWithChildren<Props>) {
           get<pond.ListGrainsResponse>(
             pondURL(
               "/grains?limit=" +
-                "?limit=" +
                 limit +
                 "&offset=" +
                 offset +
@@ -98,6 +98,19 @@ export default function GrainProvider(props: PropsWithChildren<Props>) {
           })
         })
   };
+
+  //update
+  const updateGrain = (key: string, settings: pond.GrainSettings, otherTeam?: string) => {
+    const view = otherTeam ? otherTeam : as
+    if (view) {
+      return put<pond.UpdateGrainResponse>(
+        pondURL("/grains/"+ key + "?&as=" + view),
+        settings
+      );
+    }
+    return put<pond.UpdateGrainResponse>(pondURL("/grains/" + key), settings);
+  }
+
   //remove
   const removeGrain = (key: string, otherTeam?: string) => {
     const view = otherTeam ? otherTeam : as
@@ -113,6 +126,7 @@ export default function GrainProvider(props: PropsWithChildren<Props>) {
         addGrain,
         getGrain,
         listGrains,
+        updateGrain,
         removeGrain
       }}>
       {children}

From cd283a0ea15f6779cc96ef971732ee3779baa71b Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Wed, 31 Dec 2025 15:29:57 -0600
Subject: [PATCH 04/50] set up the table for supported grains

---
 src/grain/GrainDescriber.ts | 89 ++++++++++++++++++++-----------------
 src/pages/Grains.tsx        | 57 +++++++++++++++++++++---
 2 files changed, 100 insertions(+), 46 deletions(-)

diff --git a/src/grain/GrainDescriber.ts b/src/grain/GrainDescriber.ts
index 46c5186..a462bdc 100644
--- a/src/grain/GrainDescriber.ts
+++ b/src/grain/GrainDescriber.ts
@@ -14,11 +14,12 @@ import WheatImg from "assets/grain/wheat.jpg";
 import { Option } from "common/SearchSelect";
 import { cloneDeep } from "lodash";
 import { pond } from "protobuf-ts/pond";
+import { Equation } from "./GrainMoisture";
 
 export interface GrainExtension {
   name: string;
   group: string;
-  equation: pond.MoistureEquation;
+  equation: Equation;
   a: number;
   b: number;
   c: number;
@@ -36,7 +37,7 @@ const defaultSetTemp = 30.0;
 const defaultGrain: GrainExtension = {
   name: "None",
   group: "",
-  equation: pond.MoistureEquation.MOISTURE_EQUATION_NONE,
+  equation: Equation.none,
   a: 0,
   b: 0,
   c: 0,
@@ -55,7 +56,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Custom Type",
       group: "",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_NONE,
+      equation: Equation.none,
       a: 0,
       b: 0,
       c: 0,
@@ -71,7 +72,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Barley",
       group: "Barley",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_CHUNG_PFOST,
+      equation: Equation.chungPfost,
       a: 475.12,
       b: 0.14843,
       c: 71.996,
@@ -88,7 +89,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Buckwheat",
       group: "Buckwheat",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_CHUNG_PFOST,
+      equation: Equation.chungPfost,
       a: 103540000,
       b: 0.1646,
       c: 15853000,
@@ -105,7 +106,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Canola",
       group: "Canola",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HALSEY,
+      equation: Equation.halsey,
       a: 3.489,
       b: -0.010553,
       c: 1.86,
@@ -123,7 +124,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Rapeseed",
       group: "Canola",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HALSEY,
+      equation: Equation.halsey,
       a: 3.0026,
       b: -0.0048967,
       c: 1.7607,
@@ -140,7 +141,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Corn (Henderson)",
       group: "Corn",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HENDERSON,
+      equation: Equation.henderson,
       a: 0.000066612,
       b: 1.9677,
       c: 42.143,
@@ -157,7 +158,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Corn (Chung-Pfost)",
       group: "Corn",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_CHUNG_PFOST,
+      equation: Equation.chungPfost,
       a: 374.34,
       b: 0.18662,
       c: 31.696,
@@ -174,7 +175,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Corn (Oswin)",
       group: "Corn",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_OSWIN,
+      equation: Equation.oswin,
       a: 15.303,
       b: -0.10164,
       c: 3.0358,
@@ -191,7 +192,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Maize White",
       group: "Corn",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HENDERSON,
+      equation: Equation.henderson,
       a: 0.000066612,
       b: 1.9677,
       c: 70.143,
@@ -208,7 +209,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Maize Yellow",
       group: "Corn",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HENDERSON,
+      equation: Equation.henderson,
       a: 0.000066612,
       b: 1.9677,
       c: 65.143,
@@ -225,7 +226,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Oats (Henderson)",
       group: "Oats",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HENDERSON,
+      equation: Equation.henderson,
       a: 0.000085511,
       b: 2.0087,
       c: 37.811,
@@ -242,7 +243,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Oats (Chung-Pfost)",
       group: "Oats",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_CHUNG_PFOST,
+      equation: Equation.chungPfost,
       a: 442.85,
       b: 0.21228,
       c: 35.803,
@@ -259,7 +260,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Oats (Oswin)",
       group: "Oats",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_OSWIN,
+      equation: Equation.oswin,
       a: 12.412,
       b: -0.060707,
       c: 2.9397,
@@ -276,7 +277,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Peanuts",
       group: "Peanuts",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_OSWIN,
+      equation: Equation.oswin,
       a: 8.6588,
       b: -0.057904,
       c: 2.6204,
@@ -293,7 +294,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Long Grain Rice",
       group: "Rice",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HENDERSON,
+      equation: Equation.henderson,
       a: 0.000041276,
       b: 2.1191,
       c: 49.828,
@@ -310,7 +311,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Medium Grain Rice",
       group: "Rice",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HENDERSON,
+      equation: Equation.henderson,
       a: 0.000035502,
       b: 2.31,
       c: 27.396,
@@ -327,7 +328,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Short Grain Rice",
       group: "Rice",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HENDERSON,
+      equation: Equation.henderson,
       a: 0.000048524,
       b: 2.0794,
       c: 45.646,
@@ -344,7 +345,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Sorghum",
       group: "Sorghum",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_CHUNG_PFOST,
+      equation: Equation.chungPfost,
       a: 797.33,
       b: 0.18159,
       c: 52.238,
@@ -361,8 +362,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Soybeans",
       group: "Soybeans",
-      //equation: Equation.chungPfost,
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_CHUNG_PFOST,
+      equation: Equation.chungPfost,
       a: 228.2,
       b: 0.2072,
       c: 30,
@@ -379,7 +379,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Sunflower",
       group: "Sunflower",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HENDERSON,
+      equation: Equation.henderson,
       a: 0.00031,
       b: 1.7459,
       c: 66.603,
@@ -396,7 +396,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Durum Wheat",
       group: "Wheat",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_OSWIN,
+      equation: Equation.oswin,
       a: 13.101,
       b: -0.052626,
       c: 2.9987,
@@ -413,8 +413,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Hard Red Wheat",
       group: "Wheat",
-      //equation: Equation.chungPfost,
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_CHUNG_PFOST,
+      equation: Equation.chungPfost,
       a: 610.34,
       b: 0.15526,
       c: 93.213,
@@ -431,8 +430,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Wheat SAWOS",
       group: "Wheat",
-      //equation: Equation.chungPfost,
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_CHUNG_PFOST,
+      equation: Equation.chungPfost,
       a: 610.34,
       b: 0.15526,
       c: 93.213,
@@ -449,7 +447,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Un-retted Flax",
       group: "Flax",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HALSEY,
+      equation: Equation.halsey,
       a: 5.11,
       b: Math.pow(-8.46 * 10, -3),
       c: 2.26,
@@ -466,7 +464,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Dew-retted Flax",
       group: "Flax",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_OSWIN,
+      equation: Equation.oswin,
       a: 6.5,
       b: Math.pow(-1.68 * 10, -2),
       c: 3.2,
@@ -483,7 +481,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Yellow Peas",
       group: "Peas",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_OSWIN,
+      equation: Equation.oswin,
       a: 14.81,
       b: -0.109,
       c: 3.019,
@@ -500,7 +498,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Blaze Lentils",
       group: "Lentils",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HALSEY,
+      equation: Equation.halsey,
       a: 5.39,
       b: -0.015,
       c: 2.273,
@@ -517,7 +515,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Redberry Lentils",
       group: "Lentils",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HALSEY,
+      equation: Equation.halsey,
       a: 4.749,
       b: -0.0116,
       c: 2.066,
@@ -534,7 +532,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Robin Lentils",
       group: "Lentils",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HALSEY,
+      equation: Equation.halsey,
       a: 5.176,
       b: -0.0065,
       c: 2.337,
@@ -551,7 +549,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Dry Beans Red",
       group: "Dry Beans",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HALSEY,
+      equation: Equation.halsey,
       a: 4.2669,
       b: -0.013382,
       c: 1.6933,
@@ -566,7 +564,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Dry Beans Black",
       group: "Dry Beans",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HALSEY,
+      equation: Equation.halsey,
       a: 5.2003,
       b: -0.022685,
       c: 1.9656,
@@ -581,7 +579,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Rye (Henderson)",
       group: "Rye",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HENDERSON,
+      equation: Equation.henderson,
       a: 0.00006343,
       b: 2.2060,
       c: 13.1810,
@@ -596,8 +594,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Rye (Chung-Pfost)",
       group: "Rye",
-      //equation: Equation.chungPfost,
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_CHUNG_PFOST,
+      equation: Equation.chungPfost,
       a: 461.0230,
       b: 0.1840,
       c: 36.7410,
@@ -612,7 +609,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Rye (Halsey)",
       group: "Rye",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_HALSEY,
+      equation: Equation.halsey,
       a: 4.2970,
       b: 0.380,
       c: 2.2710,
@@ -627,7 +624,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
     {
       name: "Rye (Oswin)",
       group: "Rye",
-      equation: pond.MoistureEquation.MOISTURE_EQUATION_OSWIN,
+      equation: Equation.oswin,
       a: 11.8870,
       b: 0.0210,
       c: 3.2620,
@@ -644,6 +641,16 @@ export function GetGrainExtensionMap(): Map<pond.Grain, GrainExtension> {
   return cloneDeep(GrainExtensions);
 }
 
+export function GetValidGrainExtensions(): GrainExtension[] {
+  let validGrains: GrainExtension[] = []
+  GrainExtensions.forEach((ext, key) => {
+    if(key !== pond.Grain.GRAIN_NONE && key !== pond.Grain.GRAIN_INVALID && key !== pond.Grain.GRAIN_CUSTOM){
+      validGrains.push(ext)
+    }
+  })
+  return validGrains
+}
+
 export default function GrainDescriber(type: pond.Grain): GrainExtension {
   let describer = GrainExtensions.get(type);
   //console.log(describer)
diff --git a/src/pages/Grains.tsx b/src/pages/Grains.tsx
index ae4b3ac..59fbead 100644
--- a/src/pages/Grains.tsx
+++ b/src/pages/Grains.tsx
@@ -7,7 +7,7 @@ import ButtonGroup from "common/ButtonGroup";
 import { useMobile, useSnackbar, useUserAPI } from "hooks";
 import { useGrainAPI } from "providers/pond/grainAPI";
 import ResponsiveTable from "common/ResponsiveTable";
-import { GrainExtension } from "grain";
+import { GetGrainExtensionMap, GetValidGrainExtensions, GrainExtension } from "grain";
 import ResponsiveDialog from "common/ResponsiveDialog";
 import { useGlobalState } from "providers";
 import { Scope } from "models";
@@ -42,16 +42,33 @@ export default function Grains() {
   },[tableSize, tablePage])
 
   useEffect(() => {
+    //load the custom grains
     if(displayCustom){
       loadCustomGrain()
+    }else{
+      let displayedGrains: GrainExtension[] = []
+      let offset = tablePage * tableSize
+      let limit = tableSize
+      let grainList = GetValidGrainExtensions()
+      let sortedGrain = grainList.sort((a, b) => (a.name.toLowerCase() > b.name.toLowerCase() ? 1 : -1))
+      sortedGrain.forEach((ext, i) => {
+        if(i >= offset && displayedGrains.length < limit){
+          displayedGrains.push(ext)
+        }
+      })
+      setSupportedGrainTableData(displayedGrains)
+      setTableTotal(sortedGrain.length)
     }
-    //if the user is viewing as a team get their permissions to the team, if they are not then we will get their permission to the grain typ individually when a type is selected
+  },[loadCustomGrain, tableSize, tablePage, displayCustom, as])
+  
+  useEffect(()=>{
+    //if the user is viewing as a team get their permissions to the team, if they are not then we will get their permission to the grain type individually when a type is selected
     if(as){
       userAPI.getUser(user.id(), { key: as, kind: "team" } as Scope).then(resp => {
         setPermissions(resp.permissions);
       });
     }
-  },[loadCustomGrain, tableSize, tablePage, displayCustom, as])
+  },[as, userAPI])
 
   const equationName = (enumVal: number) => {
     switch(enumVal){
@@ -134,8 +151,38 @@ export default function Grains() {
         rows={supportedGrainTableData}
         page={tablePage}
         pageSize={tableSize}
-        handleRowsPerPageChange={() => {}}
-        setPage={() => {}}
+                columns={[
+          {
+            title: "Name",
+            render: row => <Box>
+              <Typography>
+                {row.name}
+              </Typography>
+            </Box>
+          },          
+          {
+            title: "Group",
+            render: row => <Box>
+              <Typography>
+                {row.group}
+              </Typography>
+            </Box>
+          },          
+          {
+            title: "Equation",
+            render: row => <Box>
+              <Typography>
+                {equationName(row.equation ?? 0)}
+              </Typography>
+            </Box>
+          }
+        ]}
+        handleRowsPerPageChange={(e) => {
+          setTableSize(e.target.value)
+        }}
+        setPage={(page) => {
+          setTablePage(page)
+        }}
         total={tableTotal}
       />
     )

From eef687746e1cc199973ddb2deced8c3746bc1dbe Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 6 Jan 2026 10:41:07 -0600
Subject: [PATCH 05/50] finished the supported grain view for desktop and the
 mobile view for both

---
 src/grain/CustomGrainForm.tsx |  51 +++++-----
 src/pages/Grains.tsx          | 171 +++++++++++++++++++++++++++++-----
 2 files changed, 179 insertions(+), 43 deletions(-)

diff --git a/src/grain/CustomGrainForm.tsx b/src/grain/CustomGrainForm.tsx
index 2a0379a..905931c 100644
--- a/src/grain/CustomGrainForm.tsx
+++ b/src/grain/CustomGrainForm.tsx
@@ -1,7 +1,7 @@
 import {MenuItem, TextField } from "@mui/material"
 import { cloneDeep } from "lodash"
 import { pond } from "protobuf-ts/pond"
-import React, { useEffect, useState } from "react"
+import React, { useEffect, useRef, useState } from "react"
 
 interface Props {
   grainSettings?: pond.GrainSettings
@@ -19,6 +19,7 @@ export default function CustomGrainForm(props: Props) {
   const [constantC, setConstantC] = useState("0")
   const [kgPerBushel, setKgPerBushel] = useState("0")
   const [bushelsPerTonne, setBushelsPerTonne] = useState("0")
+  const valid = useRef(false)
 
   useEffect(()=>{
     if(grainSettings){
@@ -34,20 +35,20 @@ export default function CustomGrainForm(props: Props) {
     }
   },[grainSettings])
 
-  const invalid = () => {
-    if (name === "") return true
-    if (group === "") return true
-    if (isNaN(parseFloat(constantA))) return true
-    if (isNaN(parseFloat(constantB))) return true
-    if (isNaN(parseFloat(constantA))) return true
-    if (isNaN(parseFloat(kgPerBushel))) return true
-    if (isNaN(parseFloat(bushelsPerTonne))) return true
-    return false
+  const validate = (name: string, group: string, constA: string, constB: string, constC: string, kgPerBushel: string, bushelsPerTonne: string) => {
+    if (name === "") return false
+    if (group === "") return false
+    if (isNaN(parseFloat(constA))) return false
+    if (isNaN(parseFloat(constB))) return false
+    if (isNaN(parseFloat(constC))) return false
+    if (isNaN(parseFloat(kgPerBushel))) return false
+    if (isNaN(parseFloat(bushelsPerTonne))) return false
+    return true
   }
 
   const settingsChanged = (newSettings: pond.GrainSettings) => {
     setNewGrainSettings(newSettings)
-    onGrainSettingsChange(newSettings, !invalid())
+    onGrainSettingsChange(newSettings, valid.current)
   }
 
   const grainForm = () => {
@@ -63,6 +64,7 @@ export default function CustomGrainForm(props: Props) {
             setName(name)
             let settings = cloneDeep(newGrainSettings)
             settings.name = name
+            valid.current = validate(name, group, constantA, constantB, constantC, kgPerBushel, bushelsPerTonne)
             settingsChanged(settings)
           }}/>
         <TextField 
@@ -75,6 +77,7 @@ export default function CustomGrainForm(props: Props) {
             setGroup(group)
             let settings = cloneDeep(newGrainSettings)
             settings.group = group
+            valid.current = validate(name, group, constantA, constantB, constantC, kgPerBushel, bushelsPerTonne)
             settingsChanged(settings)
           }}/>
         <TextField 
@@ -88,6 +91,7 @@ export default function CustomGrainForm(props: Props) {
             setEquation(enumVal)
             let settings = cloneDeep(newGrainSettings)
             settings.equation = enumVal
+            valid.current = validate(name, group, constantA, constantB, constantC, kgPerBushel, bushelsPerTonne)
             settingsChanged(settings)
           }}
           select>
@@ -117,11 +121,12 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let val = e.target.value
             setConstantA(val)
+            valid.current = validate(name, group, val, constantB, constantC, kgPerBushel, bushelsPerTonne)
+            let settings = cloneDeep(newGrainSettings)
             if(!isNaN(parseFloat(val))){
-              let settings = cloneDeep(newGrainSettings)
               settings.a = parseFloat(val)
-              settingsChanged(settings)
             }
+            settingsChanged(settings)
           }}
           label="Constant A"/>
         <TextField 
@@ -134,11 +139,12 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let val = e.target.value
             setConstantB(val)
+            valid.current = validate(name, group, constantA, val, constantC, kgPerBushel, bushelsPerTonne)
+            let settings = cloneDeep(newGrainSettings)
             if(!isNaN(parseFloat(val))){
-              let settings = cloneDeep(newGrainSettings)
               settings.b = parseFloat(val)
-              settingsChanged(settings)
             }
+            settingsChanged(settings)
           }}
           label="Constant B"/>
         <TextField 
@@ -151,11 +157,12 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let val = e.target.value
             setConstantC(val)
+            valid.current = validate(name, group, constantA, constantB, val, kgPerBushel, bushelsPerTonne)
+            let settings = cloneDeep(newGrainSettings)
             if(!isNaN(parseFloat(val))){
-              let settings = cloneDeep(newGrainSettings)
               settings.c = parseFloat(val)
-              settingsChanged(settings)
             }
+            settingsChanged(settings)
           }}
           label="Constant C"/>
         <TextField 
@@ -168,11 +175,12 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let val = e.target.value
             setKgPerBushel(val)
+            valid.current = validate(name, group, constantA, constantB, constantC, val, bushelsPerTonne)
+            let settings = cloneDeep(newGrainSettings)
             if(!isNaN(parseFloat(val))){
-              let settings = cloneDeep(newGrainSettings)
               settings.kgPerBushel = parseFloat(val)
-              settingsChanged(settings)
             }
+            settingsChanged(settings)
           }}
           label="kg per Bushel"/>
         <TextField 
@@ -185,11 +193,12 @@ export default function CustomGrainForm(props: Props) {
           onChange={(e) => {
             let val = e.target.value
             setBushelsPerTonne(val)
+            valid.current = validate(name, group, constantA, constantB, constantC, kgPerBushel, val)
+            let settings = cloneDeep(newGrainSettings)
             if(!isNaN(parseFloat(val))){
-              let settings = cloneDeep(newGrainSettings)
               settings.bushelsPerTonne = parseFloat(val)
-              settingsChanged(settings)
             }
+            settingsChanged(settings)
           }}
           label="Bushels per Tonne"/>
       </React.Fragment>
diff --git a/src/pages/Grains.tsx b/src/pages/Grains.tsx
index 59fbead..2ff47eb 100644
--- a/src/pages/Grains.tsx
+++ b/src/pages/Grains.tsx
@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useState } from "react";
 import PageContainer from "./PageContainer";
 import CustomGrainForm from "grain/CustomGrainForm";
-import { Box, Button, DialogActions, DialogContent, DialogTitle, Grid2, Typography } from "@mui/material";
+import { Accordion, AccordionDetails, AccordionSummary, Box, Button, DialogActions, DialogContent, DialogTitle, Divider, Grid2, IconButton, Typography } from "@mui/material";
 import { pond } from "protobuf-ts/pond";
 import ButtonGroup from "common/ButtonGroup";
 import { useMobile, useSnackbar, useUserAPI } from "hooks";
@@ -11,6 +11,8 @@ import { GetGrainExtensionMap, GetValidGrainExtensions, GrainExtension } from "g
 import ResponsiveDialog from "common/ResponsiveDialog";
 import { useGlobalState } from "providers";
 import { Scope } from "models";
+import React from "react";
+import { AddCircle, ExpandMore } from "@mui/icons-material";
 
 export default function Grains() {
   const [currentCustomGrain, setCurrentCustomGrain] = useState<pond.GrainSettings>()
@@ -18,7 +20,7 @@ export default function Grains() {
   const [selectedGrain, setSelectedGrain] = useState<pond.GrainObject | undefined>()
   const [displayCustom, setDisplayCustom] = useState(false)
   const { openSnack } = useSnackbar()
-  const [tableSize, setTableSize] = useState(5)
+  const [tableSize, setTableSize] = useState(10)
   const [tablePage, setTablePage] = useState(0)
   const [tableTotal, setTableTotal] = useState(0)
   const grainAPI = useGrainAPI()
@@ -29,7 +31,11 @@ export default function Grains() {
   const [openUpdateConfirmation, setOpenUpdateConfirmation] = useState(false)
   const [grainObjectTableData, setGrainObjectTableData] = useState<pond.GrainObject[]>([])
   const [supportedGrainTableData, setSupportedGrainTableData] = useState<GrainExtension[]>([])
+  // const [selectedGrainExtension, setSelectedGrainExtension] = useState<GrainExtension | undefined>()
+  const [accordionKey, setAccordionKey] = useState("allClosed")
+  const [openNewGrainDialog, setOpenNewGrainDialog] = useState(false)
   const isMobile = useMobile()
+  const extraLoad = 10 //the amount of more to load on the mobile view when load more is clicked
 
   //function to load the first set of custom grains
   const loadCustomGrain = useCallback(() => {
@@ -92,8 +98,25 @@ export default function Grains() {
     return (
       <ResponsiveTable<pond.GrainObject>
         rows={grainObjectTableData}
+        noDataMessage="No Grain Types Found. Add a new custom grain to see them here"
+        loadMore={() => {
+          setTableSize(tableSize + extraLoad)
+        }}
+        renderMobile={(row) => <Accordion expanded={accordionKey === row.key} onChange={() => {
+          //close it if it is already open
+          if(accordionKey === row.key){
+            setAccordionKey("allClosed")
+          }else{
+            setAccordionKey(row.key)
+          }
+          setCurrentCustomGrain(row.settings ?? pond.GrainSettings.create())
+          }}>
+          <AccordionSummary expandIcon={<ExpandMore />}>{row.name}</AccordionSummary>
+          <AccordionDetails>
+            {customGrainDisplay()}
+          </AccordionDetails>
+        </Accordion>}
         onRowClick={(grainObj) => {
-          setCurrentCustomGrain(grainObj.settings ?? pond.GrainSettings.create())
           setSelectedGrain(grainObj)
           setFormValid(true)
           /** if they are viewin as a team leave the permissions alone, if not then use the users permissions to the grain type,
@@ -108,7 +131,7 @@ export default function Grains() {
         columns={[
           {
             title: "Name",
-            render: row => <Box>
+            render: row => <Box padding={2}>
               <Typography>
                 {row.name}
               </Typography>
@@ -116,7 +139,7 @@ export default function Grains() {
           },          
           {
             title: "Group",
-            render: row => <Box>
+            render: row => <Box padding={2}>
               <Typography>
                 {row.settings?.group}
               </Typography>
@@ -124,7 +147,7 @@ export default function Grains() {
           },          
           {
             title: "Equation",
-            render: row => <Box>
+            render: row => <Box padding={2}>
               <Typography>
                 {equationName(row.settings?.equation ?? 0)}
               </Typography>
@@ -150,11 +173,21 @@ export default function Grains() {
       <ResponsiveTable<GrainExtension>
         rows={supportedGrainTableData}
         page={tablePage}
+        // onRowClick={(ext) => {setSelectedGrainExtension(ext)}}
+        loadMore={() => {
+          setTableSize(tableSize + extraLoad)
+        }}
+        renderMobile={(row) => <Accordion>
+          <AccordionSummary expandIcon={<ExpandMore />}>{row.name}</AccordionSummary>
+          <AccordionDetails>
+            {supportedDisplay(row)}
+          </AccordionDetails>
+        </Accordion>}
         pageSize={tableSize}
-                columns={[
+        columns={[
           {
             title: "Name",
-            render: row => <Box>
+            render: row => <Box padding={2}>
               <Typography>
                 {row.name}
               </Typography>
@@ -162,7 +195,7 @@ export default function Grains() {
           },          
           {
             title: "Group",
-            render: row => <Box>
+            render: row => <Box padding={2}>
               <Typography>
                 {row.group}
               </Typography>
@@ -170,11 +203,27 @@ export default function Grains() {
           },          
           {
             title: "Equation",
-            render: row => <Box>
+            render: row => <Box padding={2}>
               <Typography>
                 {equationName(row.equation ?? 0)}
               </Typography>
             </Box>
+          },
+          {
+            title: "Kg Per Bushel",
+            render: row => <Box padding={2}>
+              <Typography>
+                {row.weightConversionKg.toFixed(2)}
+              </Typography>
+            </Box>
+          },
+          {
+            title: "Bushels Per Tonne",
+            render: row => <Box padding={2}>
+              <Typography>
+                {row.bushelsPerTonne.toFixed(2)}
+              </Typography>
+            </Box>
           }
         ]}
         handleRowsPerPageChange={(e) => {
@@ -189,9 +238,42 @@ export default function Grains() {
   }
 
   //the grain display for supported grain type to show the rest of the data such as what constants are used in the formula
-  const supportedDisplay = () => {
+  const supportedDisplay = (grain?: GrainExtension) => {
     return (
-      <Box></Box>
+      <Box>
+      {grain ?
+        <React.Fragment>
+          <Typography>
+            Info
+          </Typography>
+          <Divider />
+          <Box padding={2}>
+            <Typography>Name: {grain.name}</Typography>
+            <Typography>Group: {grain.group}</Typography>
+          </Box>
+          <Typography>
+            Formula
+          </Typography>
+          <Divider />
+          <Box padding={2}>
+            <Typography>Equation: {equationName(grain.equation)}</Typography>
+            {/* <Typography>Constant A: {grain.a}</Typography>
+            <Typography>Constant B: {grain.b}</Typography>
+            <Typography>Constant C: {grain.c}</Typography> */}
+          </Box>
+          <Typography>
+            Conversions
+          </Typography>
+          <Divider />
+          <Box padding={2}>
+            <Typography>Kg per Bushel: {grain.weightConversionKg.toFixed(2)}</Typography>
+            <Typography>Bushels per Tonne: {grain.bushelsPerTonne.toFixed(2)}</Typography>
+          </Box>
+        </React.Fragment>
+        :
+        <Typography>Select a Grain from the table to view its details</Typography>
+      }
+      </Box>
     )
   }
 
@@ -201,6 +283,9 @@ export default function Grains() {
         openSnack("Grain type updated")
       }).catch(err => {
         openSnack("There was an issue updating the selected grain type")
+      }).finally(() => {
+        setOpenUpdateConfirmation(false)
+        loadCustomGrain()
       })
     }
   }
@@ -221,6 +306,19 @@ export default function Grains() {
     )
   }
 
+  //because the form is embedded on desktop this dialog is specifically for mobile view
+  const newGrainDialog = () => {
+    return (
+      <ResponsiveDialog open={openNewGrainDialog} onClose={() => setOpenNewGrainDialog(false)}>
+        <DialogTitle>Add New Grain</DialogTitle>
+        <DialogActions>
+          {customGrainDisplay()}
+
+        </DialogActions>
+      </ResponsiveDialog>
+    )
+  }
+
   const addNewGrain = () => {
     if(currentCustomGrain){
       grainAPI.addGrain(currentCustomGrain).then(resp => {
@@ -228,6 +326,9 @@ export default function Grains() {
         openSnack("New grain type added")
       }).catch(err => {
         openSnack("There was a problem creating the new grain type")
+      }).finally(() => {
+        loadCustomGrain()
+        setOpenNewGrainDialog(false)//only for the mobile view since the desktop has it embedded
       })
     }
   }
@@ -238,6 +339,9 @@ export default function Grains() {
         openSnack("Grain type removed")
       }).catch(err => {
         openSnack("There was a problem removing the selected grain type")
+      }).finally(() => {
+        setOpenRemoveConfirmation(false)
+        loadCustomGrain()
       })
     }
   }
@@ -272,7 +376,8 @@ export default function Grains() {
             {selectedGrain &&
               <Button sx={{marginRight: 1}} onClick={() => setOpenUpdateConfirmation(true)} disabled={!formValid || !permissions.includes(pond.Permission.PERMISSION_WRITE)} variant="contained" color="primary">Update</Button>
             }
-            <Button onClick={() => addNewGrain()} disabled={!formValid || !permissions.includes(pond.Permission.PERMISSION_WRITE)} variant="contained" color="primary">Save New</Button>
+            {isMobile && !selectedGrain && <Button onClick={() => {setOpenNewGrainDialog(false)}}>Cancel</Button>}
+            <Button onClick={() => addNewGrain()} disabled={!formValid || (as !== "" && !permissions.includes(pond.Permission.PERMISSION_WRITE))} variant="contained" color="primary">Save New</Button>
           </Box>
         </Box>
     )
@@ -283,7 +388,7 @@ export default function Grains() {
     return (
       <Box>
         <CustomGrainForm 
-          grainSettings={currentCustomGrain} 
+          grainSettings={selectedGrain?.settings || undefined}
           onGrainSettingsChange={(newSettings, formValid)=>{
             setCurrentCustomGrain(newSettings)
             setFormValid(formValid)
@@ -295,30 +400,41 @@ export default function Grains() {
   }
 
   const desktopView = () => {
-    return (
+    if(displayCustom){
+      return (
       <Grid2 container>
         <Grid2 size={7} padding={2}>
-          {displayCustom ? grainObjectTable() : supportedGrainTable()}
+          {grainObjectTable()}
         </Grid2>
         <Grid2 size={5} padding={2}>
-          {displayCustom ? customGrainDisplay() : supportedDisplay()}
+          {customGrainDisplay()}
         </Grid2>
       </Grid2>
-    )
+      )
+    }else{
+      return (
+        <Box marginTop={2}>
+          {supportedGrainTable()}
+        </Box>
+      )
+    }
   }
 
   const mobileView = () => {
     return (
-      <Box></Box>
+      <Box>
+        {displayCustom ? grainObjectTable() : supportedGrainTable()}
+      </Box>
     )
   }
 
   return (
     <PageContainer>
-      <Typography>
-        GRAIN PAGE
+      <Box padding={2}>
+      <Typography variant="h4">
+        Adaptive Grains
       </Typography>
-      <Box display="flex" margin={2}>
+      <Box display="flex" marginTop={2} justifyContent="space-between">
         <ButtonGroup 
           toggle
           buttons={[
@@ -338,10 +454,21 @@ export default function Grains() {
             }
           ]}
         />
+        {isMobile && displayCustom &&
+          <IconButton sx={{padding: 0}} color="primary" onClick={()=>{
+            setSelectedGrain(undefined)
+            setCurrentCustomGrain(undefined)
+            setOpenNewGrainDialog(true)
+          }}>
+            <AddCircle />
+          </IconButton>
+        }
       </Box>
       {!isMobile ? desktopView() : mobileView()}
+      </Box>
       {updateGrainConfirmation()}
       {removeConfirmation()}
+      {newGrainDialog()}
     </PageContainer>
   )
 }
\ No newline at end of file

From a225f027956a805f329513a3481f26bf4481760f Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 6 Jan 2026 16:32:17 -0600
Subject: [PATCH 06/50] fixed issue with automatic start causing it to add
 interactions repeatedly

---
 src/bin/conditioning/modeChangeDialog.tsx | 14 +++++++---
 src/common/PromiseProgress.tsx            | 31 ++++++++++-------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/bin/conditioning/modeChangeDialog.tsx b/src/bin/conditioning/modeChangeDialog.tsx
index 2913e4a..d2b3cfb 100644
--- a/src/bin/conditioning/modeChangeDialog.tsx
+++ b/src/bin/conditioning/modeChangeDialog.tsx
@@ -436,7 +436,9 @@ if (!selectedDevice) return;
       }
       stage1.steps.push(newStep);
     });
-    stages.push(stage1)
+    if(stage1.steps.length > 0){
+      stages.push(stage1)
+    }
     //stage two is to add the new interactions
     let stage2: Stage = {
       title: "Add New Interactions",
@@ -447,7 +449,9 @@ if (!selectedDevice) return;
         }
       ]
     }
-    stages.push(stage2)
+    if(stage2.steps.length > 0){
+      stages.push(stage2)
+    }
 
     //stage three is to update the controller components
     let stage3: Stage = {
@@ -463,7 +467,9 @@ if (!selectedDevice) return;
         stage3.steps.push(newStep)
       })
     })
-    stages.push(stage3)
+    if(stage3.steps.length > 0){
+      stages.push(stage3)
+    }
     //set those stages to a state variable
     setPromiseStages(stages)
   }
@@ -721,7 +727,7 @@ if (!selectedDevice) return;
       <Box>
         <PromiseProgress 
           stages={promiseStages}
-          automaticStart
+          description="These are the changes that will occur in order to change your bin mode with the given options. Press start to begin."
           failFast 
           onStart={() => {
             startChange()
diff --git a/src/common/PromiseProgress.tsx b/src/common/PromiseProgress.tsx
index 41b71cd..1c6dc46 100644
--- a/src/common/PromiseProgress.tsx
+++ b/src/common/PromiseProgress.tsx
@@ -1,5 +1,5 @@
 import { AxiosResponse } from "axios"
-import { Box, Button, CircularProgress, DialogActions, DialogContent, DialogTitle, Typography } from "@mui/material"
+import { Box, Button, CircularProgress, DialogActions, DialogContent, DialogTitle, Divider, Typography } from "@mui/material"
 import { useEffect, useState } from "react"
 import { CheckCircle, Error, Pending } from "@mui/icons-material"
 import React from "react"
@@ -18,7 +18,7 @@ export interface Step {
 
 interface Props {
   stages: Stage[]
-  automaticStart: boolean
+  description?: string
   failFast?: boolean
   onStart?: () => void
   onComplete?: () => void
@@ -32,10 +32,11 @@ enum progress {
 }
 
 export function PromiseProgress(props: Props){
-  const {stages, failFast, onStart, onComplete, automaticStart} = props
+  const {stages, failFast, onStart, onComplete, description } = props
   const [completion, setCompletion] = useState<Map<string, progress>>(new Map())
 
   const execute = () => {
+    console.log("executing")
     let completionMap: Map<string, progress> = new Map()
     stages.forEach((stage, i) => {
       stage.steps.forEach((_, k) => {
@@ -47,6 +48,7 @@ export function PromiseProgress(props: Props){
     const runStages = async () => {
       let progMap = new Map(completionMap)
       for (const [i, stage] of stages.entries()) {
+        console.log("the for loop:" + i)
         // For each stage, map the steps into their own promise chains
         const stepPromises = stage.steps.map((step, k) => {
           // mark step as in progress
@@ -84,12 +86,6 @@ export function PromiseProgress(props: Props){
     });
   }
 
-  useEffect(() => {
-    if(automaticStart){
-      execute()
-    }
-  },[automaticStart, execute])
-
   const getCompletion = (completion?: progress) => {
     switch(completion){
       case progress.InProgress:
@@ -123,16 +119,17 @@ export function PromiseProgress(props: Props){
         Progress
       </DialogTitle>
       <DialogContent>
-        {stages.map((stage, number) => displayStage(stage, number))}
+        <Typography>{description}</Typography>
+        <Box marginTop={2}>
+          {stages.map((stage, number) => displayStage(stage, number))}
+        </Box>
       </DialogContent>
       <DialogActions>
-        {!automaticStart &&
-          <Button onClick={() => {
-            execute()
-          }}>
-              Start
-          </Button>
-        }
+      <Button variant="contained" color="primary" onClick={() => {
+        execute()
+      }}>
+          Start
+      </Button>
       </DialogActions>
     </React.Fragment>
   )

From 17728714a3a6f30785d38a66638d92e068df2b7e Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Wed, 7 Jan 2026 12:22:18 -0600
Subject: [PATCH 07/50] also now filling in the drying fields with default data
 based on the ambient component, or what was last used in the bin

---
 src/bin/BinVisualizerV2.tsx               | 21 +++++++++++++++------
 src/bin/conditioning/modeChangeDialog.tsx | 10 +++-------
 src/common/PromiseProgress.tsx            |  2 --
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/bin/BinVisualizerV2.tsx b/src/bin/BinVisualizerV2.tsx
index 483ae34..d91f698 100644
--- a/src/bin/BinVisualizerV2.tsx
+++ b/src/bin/BinVisualizerV2.tsx
@@ -332,14 +332,23 @@ export default function BinVisualizer(props: Props) {
       setNewGrainSettings(bin.customGrain());
     }
     if (bin.settings) {
-      let t = bin.settings.outdoorTemp;
+      let t = 0
+      let h = 0
+      if(ambient){
+        t = ambient.temperature
+        h = ambient.humidity
+      }else{
+        t = bin.settings.outdoorTemp;//use what is already set in the bin settings
+        h = bin.settings.outdoorHumidity
+      }
+
       if (user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT) {
         t = CtoF(t);
       }
       setOutdoorTemp(t);
+      setOutdoorHumidity(h)
     }
-    if (bin.settings) setOutdoorHumidity(bin.settings.outdoorHumidity);
-  }, [bin, user]);
+  }, [bin, user, ambient]);
 
   useEffect(() => {
     //if(loadingTrend) return
@@ -1998,7 +2007,7 @@ export default function BinVisualizer(props: Props) {
       }
       b.settings.mode = newBinMode;
     }
-
+    console.log(b.settings)
     binAPI.updateBin(bin.key(), b.settings, as).then(resp => {
       refresh();
     });
@@ -2025,8 +2034,8 @@ export default function BinVisualizer(props: Props) {
           if(refresh) updateBin();
         }}
         defaultTargetMoisture={bin.settings.inventory?.initialMoisture}
-        // defaultOutdoorTemp={get this from any ambient sensors}
-        // defaultOutdoorHumidity={get this from any ambient sensors}
+        defaultOutdoorTemp={outdoorTemp}
+        defaultOutdoorHumidity={outdoorHumidity}
         changeTargetMoisture={newMoisture => {
           setTargetMoisture(newMoisture)
         }}
diff --git a/src/bin/conditioning/modeChangeDialog.tsx b/src/bin/conditioning/modeChangeDialog.tsx
index d2b3cfb..b31c8f8 100644
--- a/src/bin/conditioning/modeChangeDialog.tsx
+++ b/src/bin/conditioning/modeChangeDialog.tsx
@@ -108,9 +108,9 @@ export default function ModeChangeDialog(props: Props){
   const [deviceOption, setDeviceOption] = useState<Option>()
 
   useEffect(()=>{
-    setMoistureInput(defaultTargetMoisture?.toFixed(2) ?? "0")
-    setOutdoorTempInput(defaultOutdoorTemp?.toFixed(2) ?? "0")
-    setOutdoorHumidityInput(defaultOutdoorHumidity?.toFixed(2) ?? "0")
+    setMoistureInput(defaultTargetMoisture?.toString() ?? "0")
+    setOutdoorTempInput(defaultOutdoorTemp?.toString() ?? "0")
+    setOutdoorHumidityInput(defaultOutdoorHumidity?.toString() ?? "0")
   },[defaultTargetMoisture, defaultOutdoorTemp, defaultOutdoorHumidity])
   
   //get the interactions and components for the device when it is selected from the dropdown
@@ -624,11 +624,7 @@ if (!selectedDevice) return;
           onChange={event => {
             setOutdoorTempInput(event.target.value)
             if(changeOutdoorTemp && !isNaN(parseFloat(event.target.value))){
-              //if the users prefs are F will need to convert it to C when sending it back
               let val = parseFloat(event.target.value)
-              if(getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT){
-                val = fahrenheitToCelsius(val)
-              }
               changeOutdoorTemp(val)
             }
           }}
diff --git a/src/common/PromiseProgress.tsx b/src/common/PromiseProgress.tsx
index 1c6dc46..0bc39e9 100644
--- a/src/common/PromiseProgress.tsx
+++ b/src/common/PromiseProgress.tsx
@@ -36,7 +36,6 @@ export function PromiseProgress(props: Props){
   const [completion, setCompletion] = useState<Map<string, progress>>(new Map())
 
   const execute = () => {
-    console.log("executing")
     let completionMap: Map<string, progress> = new Map()
     stages.forEach((stage, i) => {
       stage.steps.forEach((_, k) => {
@@ -48,7 +47,6 @@ export function PromiseProgress(props: Props){
     const runStages = async () => {
       let progMap = new Map(completionMap)
       for (const [i, stage] of stages.entries()) {
-        console.log("the for loop:" + i)
         // For each stage, map the steps into their own promise chains
         const stepPromises = stage.steps.map((step, k) => {
           // mark step as in progress

From 65e70265fbd267953a380171504a4c2b566a9849 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 15 Jan 2026 14:32:39 -0600
Subject: [PATCH 08/50] displaying status information on the gates dashboard
 now

---
 package-lock.json              |  4 +--
 package.json                   |  2 +-
 src/gate/GateList.tsx          | 65 +++++++++++++++++++++++++++++-----
 src/models/Gate.ts             |  8 +++--
 src/pages/Terminals.tsx        |  1 -
 src/providers/pond/gateAPI.tsx |  1 +
 6 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0e25c26..367ad08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "mui-tel-input": "^7.0.0",
         "notistack": "^3.0.1",
         "openweathermap-ts": "^1.2.10",
-        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
+        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#object_status",
         "query-string": "^9.2.1",
         "react": "^18.3.1",
         "react-beautiful-dnd": "^13.1.1",
@@ -10953,7 +10953,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#3f647071f211c4552c2acc23a8ecabb6904a4156",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#580cb59c08f9895384b5adc4853c480bf3bf3165",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }
diff --git a/package.json b/package.json
index fc7a1ac..3cf9d54 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "mui-tel-input": "^7.0.0",
     "notistack": "^3.0.1",
     "openweathermap-ts": "^1.2.10",
-    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
+    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#object_status",
     "query-string": "^9.2.1",
     "react": "^18.3.1",
     "react-beautiful-dnd": "^13.1.1",
diff --git a/src/gate/GateList.tsx b/src/gate/GateList.tsx
index 5c548e2..bdf58c2 100644
--- a/src/gate/GateList.tsx
+++ b/src/gate/GateList.tsx
@@ -11,8 +11,10 @@ import ResponsiveTable, { Column } from "common/ResponsiveTable";
 import AddGateFab from "./AddGateFab";
 import GateSettings from "./GateSettings";
 import { useGateAPI, useGlobalState } from "providers";
-import { Settings } from "@mui/icons-material";
+import { CheckCircleOutline, DoNotDisturb, ErrorOutline, RemoveCircleOutline, Settings } from "@mui/icons-material";
 import { cloneDeep } from "lodash";
+import moment from "moment";
+import { pond } from "protobuf-ts/pond";
 
 interface Props {
   //gates: Gate[];
@@ -89,6 +91,19 @@ export default function GateList(props: Props) {
     setPageSize(event.target.value);
   };
 
+  const displayPCAStatus = (state: pond.PCAState) => {
+    switch(state){
+      case pond.PCAState.PCA_STATE_IN_BOUNDS:
+        return <CheckCircleOutline sx={{color: "green"}}/>
+      case pond.PCAState.PCA_STATE_OUT_BOUNDS:
+        return <ErrorOutline sx={{color: "red"}} />
+      case pond.PCAState.PCA_STATE_OFF:
+        return <RemoveCircleOutline />
+      default:
+        return <DoNotDisturb />
+    }
+  }
+
   const desktopCols = (): Column<Gate>[] => {
     return [
       {
@@ -151,6 +166,29 @@ export default function GateList(props: Props) {
           </Box>
         )
       },
+      {
+        title: "PCA Status",
+        render: gate => (
+          <Box padding={2}>
+            {displayPCAStatus(gate.status.pcaState)}
+          </Box>
+        )
+      },
+      {
+        title: "Last FLow",
+        render: gate => (
+          <Box padding={2}>
+            <Box display="flex" justifyContent="space-between">
+              <Typography>Last Flow:</Typography>
+              <Typography>{gate.status.lastMassAirflow.toFixed(2)}</Typography>
+            </Box>
+            <Box display="flex" justifyContent="space-between">
+              <Typography>Last Reading:</Typography>
+              <Typography>{gate.status.lastUpdate !== "" ? moment(gate.status.lastUpdate).fromNow() : "No Reading Yet"}</Typography>
+            </Box>
+          </Box>
+        )
+      }
     ]
   }
   const mobileCols = (): Column<Gate>[] => {
@@ -162,13 +200,16 @@ export default function GateList(props: Props) {
             <Typography margin="auto" marginLeft={0} fontWeight={650} fontSize={20}>
               {gate.name}
             </Typography>
-            <IconButton onClick={(event) => {
-              event.stopPropagation()
-              setSelectedGate(gate)
-              setGateDialog(true)
-            }}>
-              <Settings />
-            </IconButton>
+            <Box display="flex" alignItems="center" gap={1}>
+              {displayPCAStatus(gate.status.pcaState)}
+              <IconButton onClick={(event) => {
+                event.stopPropagation()
+                setSelectedGate(gate)
+                setGateDialog(true)
+              }}>
+                <Settings />
+              </IconButton>
+            </Box>
           </Box>
         )
       }
@@ -198,6 +239,14 @@ export default function GateList(props: Props) {
           <Typography>PCA Unit:</Typography>
           <Typography>{gate.settings.pcaType !== "" ? gate.settings.pcaType : "None"}</Typography>
         </Box>
+        <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
+          <Typography>Last Flow:</Typography>
+          <Typography>{gate.status.lastMassAirflow}</Typography>
+        </Box>
+        <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
+          <Typography>Last Reading:</Typography>
+          <Typography>{gate.status.lastUpdate !== "" ? moment(gate.status.lastUpdate).fromNow() : "No PCA reading yet"}</Typography>
+        </Box>
       </Box>
       // <Typography variant="body2" color="textSecondary" sx={{ padding: 1 }}>
 
diff --git a/src/models/Gate.ts b/src/models/Gate.ts
index 8842e68..ccd0e77 100644
--- a/src/models/Gate.ts
+++ b/src/models/Gate.ts
@@ -5,22 +5,24 @@ import { or } from "utils/types";
 
 export class Gate {
   public settings: pond.GateSettings = pond.GateSettings.create();
+  public status: pond.GateStatus = pond.GateStatus.create();
   public name: string = "Gate";
   public key: string = "";
   public preferences: any = {};
   public gateMutations: any = {};
-  public pcaState: pond.PCAState = pond.PCAState.PCA_STATE_UNKNOWN;
+  // public pcaState: pond.PCAState = pond.PCAState.PCA_STATE_UNKNOWN;
 
   public static create(pb?: pond.Gate): Gate {
     let my = new Gate();
     if (pb) {
       let g = pond.Gate.fromObject(pb);
       my.settings = pond.GateSettings.fromObject(cloneDeep(or(g.settings, {})));
+      my.status = pond.GateStatus.fromObject(cloneDeep(or(g.status, {})));
       my.name = g.name;
       my.key = g.key;
       my.preferences = g.componentPreferences;
       my.gateMutations = g.gateMutations;
-      my.pcaState = g.pcaState;
+      // my.pcaState = g.pcaState;
     }
     return my;
   }
@@ -77,7 +79,7 @@ export class Gate {
   }
 
   public gateMarkerColour(): string {
-    switch (this.pcaState) {
+    switch (this.status.pcaState) {
       case pond.PCAState.PCA_STATE_OFF:
         return "grey";
       case pond.PCAState.PCA_STATE_IN_BOUNDS:
diff --git a/src/pages/Terminals.tsx b/src/pages/Terminals.tsx
index dd90aac..94464d5 100644
--- a/src/pages/Terminals.tsx
+++ b/src/pages/Terminals.tsx
@@ -182,7 +182,6 @@ export default function Terminals(props: Props) {
     if(loading) return
     setLoading(true)
     terminalAPI.listTerminals(200, 0, "asc", "name", undefined, as).then(resp => {
-      console.log(resp.data)
       if(resp.data.terminals){
         setTerminals(resp.data.terminals.map(a => Terminal.any(a)));
       }
diff --git a/src/providers/pond/gateAPI.tsx b/src/providers/pond/gateAPI.tsx
index 5b07606..ac63bb0 100644
--- a/src/providers/pond/gateAPI.tsx
+++ b/src/providers/pond/gateAPI.tsx
@@ -138,6 +138,7 @@ export default function GateProvider(props: PropsWithChildren<Props>) {
     return new Promise<AxiosResponse<pond.ListGatesResponse>>((resolve, reject) => {
       get<pond.ListGatesResponse>(url).then(resp => {
         resp.data = pond.ListGatesResponse.fromObject(resp.data)
+        console.log(resp)
         return resolve(resp)
       }).catch(err => {
         return reject(err)

From 4342e1f27bde4536cf1d48b0fc0e11905063ab3d Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 15 Jan 2026 15:51:56 -0600
Subject: [PATCH 09/50] some hotfixes for construction so that the url
 navigation is correct when clicking on a card and an undefined error when
 loading heater data

---
 package-lock.json                     | 2 +-
 src/common/DeviceLinkDrawer.tsx       | 9 ++-------
 src/objectHeater/ObjectHeaterCard.tsx | 4 ++--
 src/pages/Site.tsx                    | 4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index abf6c85..799a746 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10953,7 +10953,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#c08965a296f2cd0799472fd8b163186cf6885d4c",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#a646dbd472f266154f8c5f44146e0b27ccdda28f",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }
diff --git a/src/common/DeviceLinkDrawer.tsx b/src/common/DeviceLinkDrawer.tsx
index b01113c..e5d6fd8 100644
--- a/src/common/DeviceLinkDrawer.tsx
+++ b/src/common/DeviceLinkDrawer.tsx
@@ -21,6 +21,7 @@ import { pond } from "protobuf-ts/pond";
 import React, { useEffect, useState } from "react";
 import { makeStyles } from "@mui/styles";
 import { useGlobalState } from "providers";
+import { getContextKeys, getContextTypes } from "pbHelpers/Context";
 
 interface TabPanelProps {
   children?: React.ReactNode;
@@ -116,13 +117,7 @@ export default function DeviceLinkDrawer(props: Props) {
         undefined,
         undefined,
         undefined,
-        true,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        as
+        true
       )
       .then(resp => {
         let devMap = new Map<string, pond.ComprehensiveDevice>();
diff --git a/src/objectHeater/ObjectHeaterCard.tsx b/src/objectHeater/ObjectHeaterCard.tsx
index 651ae7c..92e899e 100644
--- a/src/objectHeater/ObjectHeaterCard.tsx
+++ b/src/objectHeater/ObjectHeaterCard.tsx
@@ -109,7 +109,7 @@ export default function ObjectHeaterCard(props: Props) {
           });
       }
     }
-    if (heaterData.devices[0]) {
+    if (heaterData.devices && heaterData.devices[0]) {
       setConnectedDevice(Device.any(heaterData.devices[0].device));
       heaterData.devices[0].components.forEach(c => {
         //loop through the components and assign them accordingly
@@ -171,7 +171,7 @@ export default function ObjectHeaterCard(props: Props) {
 
   const goToHeater = () => {
     //history.push("/objectHeaters/" + heater.key);
-    let path = "/objectHeaters/" + heater.key;
+    let path = "/heaters/" + heater.key;
     navigate(path, { state: {heater: heater} });
   };
 
diff --git a/src/pages/Site.tsx b/src/pages/Site.tsx
index 2685f4d..b09de66 100644
--- a/src/pages/Site.tsx
+++ b/src/pages/Site.tsx
@@ -56,8 +56,8 @@ export default function Site() {
       siteAPI
         .getSitePage(siteKey, as)
         .then(resp => {
-          setSite(ISite.any(resp.data.site));
-          setHeaters(resp.data.heaterData);
+          if(resp.data.site) setSite(ISite.any(resp.data.site));
+          if(resp.data.heaterData) setHeaters(resp.data.heaterData);
           setLoadingSite(false);
         })
         .catch(err => {

From 8d6f6517fbe99ea99cca7b7702281f7e91c388be Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 15 Jan 2026 15:53:02 -0600
Subject: [PATCH 10/50] proto update

---
 package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0e25c26..799a746 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "mui-tel-input": "^7.0.0",
         "notistack": "^3.0.1",
         "openweathermap-ts": "^1.2.10",
-        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
+        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master",
         "query-string": "^9.2.1",
         "react": "^18.3.1",
         "react-beautiful-dnd": "^13.1.1",
@@ -10953,7 +10953,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#3f647071f211c4552c2acc23a8ecabb6904a4156",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#a646dbd472f266154f8c5f44146e0b27ccdda28f",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }

From d23d1d6ed3e64210448f6b6b3c5a4950b25f7af6 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Fri, 16 Jan 2026 10:11:59 -0600
Subject: [PATCH 11/50] fixed the options disappearing for alert after closing
 the dialog box

---
 src/objects/objectInteractions/NewObjectInteraction.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/objects/objectInteractions/NewObjectInteraction.tsx b/src/objects/objectInteractions/NewObjectInteraction.tsx
index 8e76c25..64a63b0 100644
--- a/src/objects/objectInteractions/NewObjectInteraction.tsx
+++ b/src/objects/objectInteractions/NewObjectInteraction.tsx
@@ -179,7 +179,6 @@ export default function NewObjectInteraction(props: Props){
     setNewAlertComponentType(quack.ComponentType.COMPONENT_TYPE_INVALID);
     setConditions([]);
     setSelectedAlertComponents([]);
-    setValidOptions([])
     setValidComponents([])
     setValStrings(["0", "0"]);
     setNumConditions(0)

From 89d5e40d4555838b41c62efd95c5f934637e60a3 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Mon, 19 Jan 2026 09:49:12 -0600
Subject: [PATCH 12/50] fix bug where the operator wasn't being flipped where
 it was supposed to

---
 src/pages/Device.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/Device.tsx b/src/pages/Device.tsx
index ee4ae56..0a47a05 100644
--- a/src/pages/Device.tsx
+++ b/src/pages/Device.tsx
@@ -128,10 +128,9 @@ export default function DevicePage() {
           interaction.settings.nodeOne > interaction.settings.nodeTwo &&
           interaction.settings.nodeTwo !== 0
         ) {
-          //flip operator and send negative comparitor to save
+          //flip operator to display what is actually happening
           interaction.settings.conditions.forEach(condition => {
-            //coming back from the backend as a string for some reason
-            if (condition.comparison.toString() === "RELATIONAL_OPERATOR_GREATER_THAN") {
+            if (condition.comparison === quack.RelationalOperator.RELATIONAL_OPERATOR_GREATER_THAN) {
               condition.comparison = quack.RelationalOperator.RELATIONAL_OPERATOR_LESS_THAN;
             } else {
               condition.comparison = quack.RelationalOperator.RELATIONAL_OPERATOR_GREATER_THAN;

From 3a89c3b1918d990d25863ade111c918449f0cf90 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Mon, 19 Jan 2026 09:57:40 -0600
Subject: [PATCH 13/50] hitfix for the greater than operator not being flipped
 for display on a node diff subtype where node one is higher than node 2 the
 operators and value need to be 'flipped' since that is how the interactions
 are stored example: node 2 -> node 1 the user enters greater than 10 then
 what is sent down for the interaction is if node 2 minus node 1 is less than
 -10 so the display needs to flip them back to 'greater than' and +10

---
 src/pages/Device.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Device.tsx b/src/pages/Device.tsx
index ee4ae56..d96a05c 100644
--- a/src/pages/Device.tsx
+++ b/src/pages/Device.tsx
@@ -131,7 +131,7 @@ export default function DevicePage() {
           //flip operator and send negative comparitor to save
           interaction.settings.conditions.forEach(condition => {
             //coming back from the backend as a string for some reason
-            if (condition.comparison.toString() === "RELATIONAL_OPERATOR_GREATER_THAN") {
+            if (condition.comparison === quack.RelationalOperator.RELATIONAL_OPERATOR_GREATER_THAN) {
               condition.comparison = quack.RelationalOperator.RELATIONAL_OPERATOR_LESS_THAN;
             } else {
               condition.comparison = quack.RelationalOperator.RELATIONAL_OPERATOR_GREATER_THAN;

From 9b45474cb6564b7254126ddee0fe684e2feefd65 Mon Sep 17 00:00:00 2001
From: Carter <carter@adaptiveagriculture.ca>
Date: Mon, 19 Jan 2026 11:13:50 -0600
Subject: [PATCH 14/50] merged from staging and updated to master proto

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

diff --git a/package-lock.json b/package-lock.json
index e347c77..61b530e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "mui-tel-input": "^7.0.0",
         "notistack": "^3.0.1",
         "openweathermap-ts": "^1.2.10",
-        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
+        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master",
         "query-string": "^9.2.1",
         "react": "^18.3.1",
         "react-beautiful-dnd": "^13.1.1",
@@ -10953,7 +10953,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#75f64f81d9b4ba7639d9978af37c361fca34c279",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#b05bd05f5e9e9eb66c5afbeeee88b512be3135ef",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }
diff --git a/package.json b/package.json
index fc7a1ac..ee0e9b7 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "mui-tel-input": "^7.0.0",
     "notistack": "^3.0.1",
     "openweathermap-ts": "^1.2.10",
-    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
+    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master",
     "query-string": "^9.2.1",
     "react": "^18.3.1",
     "react-beautiful-dnd": "^13.1.1",

From 9f3b48c27793531d114781c71949b9a13457515a Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Mon, 19 Jan 2026 12:06:11 -0600
Subject: [PATCH 15/50] make sure to use the new version comparison for the max
 conditions as well

---
 src/models/Device.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/models/Device.ts b/src/models/Device.ts
index f4ea4ee..ae03634 100644
--- a/src/models/Device.ts
+++ b/src/models/Device.ts
@@ -176,7 +176,7 @@ export class Device {
       case pond.DevicePlatform.DEVICE_PLATFORM_V2_WIFI_BLUE:
       case pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_BLUE:
       case pond.DevicePlatform.DEVICE_PLATFORM_V2_ETHERNET_BLUE:
-        max = this.status.firmwareVersion >= "2.1.9" ? 4 : 2;
+        max = this.versionComparison(this.status.firmwareVersion, "2.1.9") ? 4 : 2;
     }
     return max
   }

From 76774b4692e2d81fbeb2a2b077b7fe774c3f405c Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Mon, 19 Jan 2026 12:31:51 -0600
Subject: [PATCH 16/50] fix bug where the version check was not functioning as
 expected when the version in the device status was empty or the
 requiredVersion was N/A

---
 src/models/Device.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/models/Device.ts b/src/models/Device.ts
index ae03634..7b25c13 100644
--- a/src/models/Device.ts
+++ b/src/models/Device.ts
@@ -182,6 +182,17 @@ export class Device {
   }
 
   private versionComparison(deviceVersion: string, requiredVersion: string): boolean {
+    // Feature explicitly not supported on this platform
+    if (!requiredVersion || requiredVersion === "N/A") {
+      return false;
+    }
+  
+    // Device firmware missing / unset
+    if (!deviceVersion || deviceVersion.trim() === "") {
+      return false;
+    }
+
+    //compare the versions
     const parse = (v: string) => {
       const [core, pre] = v.split("-");
       const parts = core.split(".").map(n => parseInt(n, 10));

From fa1130f77709f4e44df4feb6bc244d55f3b49f3e Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Mon, 19 Jan 2026 12:33:05 -0600
Subject: [PATCH 17/50] hotfix bug where the version check was not functioning
 as expected when the version in the device status was empty or the
 requiredVersion was N/A

---
 src/models/Device.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/models/Device.ts b/src/models/Device.ts
index f4ea4ee..fca9e20 100644
--- a/src/models/Device.ts
+++ b/src/models/Device.ts
@@ -182,6 +182,17 @@ export class Device {
   }
 
   private versionComparison(deviceVersion: string, requiredVersion: string): boolean {
+    // Feature explicitly not supported on this platform
+    if (!requiredVersion || requiredVersion === "N/A") {
+      return false;
+    }
+  
+    // Device firmware missing / unset
+    if (!deviceVersion || deviceVersion.trim() === "") {
+      return false;
+    }
+
+    //compare the versions
     const parse = (v: string) => {
       const [core, pre] = v.split("-");
       const parts = core.split(".").map(n => parseInt(n, 10));

From 0d0936269fb9d9929dc6f3142e7386d8c9174856 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Wed, 21 Jan 2026 16:09:14 -0600
Subject: [PATCH 18/50] modified the dialog for adding gate device interactions
 explains better what the interactions will do and an option to add a pressure
 threshold that turns off the red light if it goes below, that option will
 change the redlight from having one toggle interaction to 4 set interactions

---
 src/gate/GateDeviceInteraction.tsx | 286 +++++++++++++++++++++++------
 src/gate/GateFlowGraph.tsx         |  16 +-
 src/gate/GateList.tsx              |   8 +-
 src/gate/GateSettings.tsx          |  28 ++-
 4 files changed, 264 insertions(+), 74 deletions(-)

diff --git a/src/gate/GateDeviceInteraction.tsx b/src/gate/GateDeviceInteraction.tsx
index ca05a58..c8e97ef 100644
--- a/src/gate/GateDeviceInteraction.tsx
+++ b/src/gate/GateDeviceInteraction.tsx
@@ -1,4 +1,5 @@
-import { Button, DialogActions, DialogContent, DialogTitle, Typography } from "@mui/material";
+import { CheckBox } from "@mui/icons-material";
+import { Button, Checkbox, DialogActions, DialogContent, DialogTitle, FormControl, FormControlLabel, FormLabel, InputAdornment, TextField, Typography } from "@mui/material";
 import ResponsiveDialog from "common/ResponsiveDialog";
 import { Component, Device } from "models";
 import { Gate } from "models/Gate";
@@ -6,6 +7,7 @@ import moment from "moment";
 import { pond, quack } from "protobuf-ts/pond";
 import { useGlobalState, useInteractionsAPI, useSnackbar } from "providers";
 import React, { useEffect, useState } from "react";
+import { getPressureUnit } from "utils";
 
 interface Props {
   open: boolean;
@@ -37,6 +39,7 @@ const densityMap = new Map<number, number>([
 export default function GateDeviceInteraction(props: Props) {
   const { open, close, gate, compDevice, densityTemp } = props;
   const [{ user, as }] = useGlobalState();
+  const [device, setDevice] = useState<Device>()
   const [lowDelta, setLowDelta] = useState(0);
   const [highDelta, setHighDelta] = useState(0);
   const [greenComponent, setGreenComponent] = useState<Component>();
@@ -44,6 +47,10 @@ export default function GateDeviceInteraction(props: Props) {
   const [pressureComponent, setPressureComponent] = useState<Component>();
   const interactionsAPI = useInteractionsAPI();
   const [adding, setAdding] = useState(false);
+  //boolean to determine if a third condition should be put on the interaction for the red light, requires a V2 device running at least fromware version 2.1.9
+  const [useRedOffCondition, setUseRedOffCondition] = useState(false)
+  //if the pressure is under this value then the red light should be off
+  const [redThreshold, setRedThreshold] = useState("0")
   const { openSnack } = useSnackbar();
 
   useEffect(() => {
@@ -98,6 +105,10 @@ export default function GateDeviceInteraction(props: Props) {
         }
       }
     });
+
+    if(compDevice.device){
+      setDevice(Device.create(compDevice.device))
+    }
   }, [gate, densityTemp, user, compDevice]);
 
   // useEffect(() => {
@@ -115,26 +126,54 @@ export default function GateDeviceInteraction(props: Props) {
   //   });
   // };
 
+  const buttonDisabled = () => {
+    if (greenComponent === undefined) return true
+    if (redComponent === undefined) return true
+    if (adding) return true
+    if (useRedOffCondition && isNaN(parseFloat(redThreshold))) return true
+    return false
+  }
+
   const createInteractions = async () => {
     //the interactions to be made
 
-    //TOGGLE green ON when pressure within range of upper and lower
     if (
       greenComponent !== undefined &&
       redComponent !== undefined &&
       pressureComponent !== undefined
     ) {
-      let greenToggle: pond.InteractionSettings = pond.InteractionSettings.create({
-        sink: quack.ComponentID.create({
-          type: greenComponent.type(),
-          address: greenComponent.settings.address,
-          addressType: greenComponent.settings.addressType
-        }),
-        source: quack.ComponentID.create({
-          type: pressureComponent.type(),
-          address: pressureComponent.settings.address,
-          addressType: pressureComponent.settings.addressType
-        }),
+      
+      let lightInteractions: pond.InteractionSettings[] = []
+      //making variables for the parameters of the interactions
+      const redSink = quack.ComponentID.create({
+        type: redComponent.type(),
+        address: redComponent.settings.address,
+        addressType: redComponent.settings.addressType
+      })
+
+      const greenSink = quack.ComponentID.create({
+        type: greenComponent.type(),
+        address: greenComponent.settings.address,
+        addressType: greenComponent.settings.addressType
+      })
+
+      const pressureSource = quack.ComponentID.create({
+        type: pressureComponent.type(),
+        address: pressureComponent.settings.address,
+        addressType: pressureComponent.settings.addressType
+      })
+
+      const lightSchedule = pond.InteractionSchedule.create({
+        timezone: moment.tz.guess(),
+        weekdays: ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"],
+        timeOfDayStart: "00:00",
+        timeOfDayEnd: "24:00"
+      })
+      
+      //TOGGLE green ON when pressure within range of upper and lower, this will always be the same regardless
+      lightInteractions.push(pond.InteractionSettings.create({
+        sink: greenSink,
+        source: pressureSource,
         conditions: [
           pond.InteractionCondition.create({
             comparison: quack.RelationalOperator.RELATIONAL_OPERATOR_GREATER_THAN,
@@ -150,61 +189,146 @@ export default function GateDeviceInteraction(props: Props) {
         nodeOne: 2,
         nodeTwo: 1,
         subtype: 18,
-        schedule: pond.InteractionSchedule.create({
-          timezone: moment.tz.guess(),
-          weekdays: ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"],
-          timeOfDayStart: "00:00",
-          timeOfDayEnd: "24:00"
-        }),
+        schedule: lightSchedule,
         result: pond.InteractionResult.create({
           type: quack.InteractionResultType.INTERACTION_RESULT_TYPE_TOGGLE,
           value: 1
         })
-      });
+      }))
 
-      //TOGGLE red OFF when pressure within range of upper and lower
-      let redToggle: pond.InteractionSettings = pond.InteractionSettings.create({
-        sink: quack.ComponentID.create({
-          type: redComponent.type(),
-          address: redComponent.settings.address,
-          addressType: redComponent.settings.addressType
-        }),
-        source: quack.ComponentID.create({
-          type: pressureComponent.type(),
-          address: pressureComponent.settings.address,
-          addressType: pressureComponent.settings.addressType
-        }),
-        conditions: [
-          pond.InteractionCondition.create({
-            comparison: quack.RelationalOperator.RELATIONAL_OPERATOR_GREATER_THAN,
-            value: -highDelta,
-            measurementType: quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE
-          }),
-          pond.InteractionCondition.create({
-            comparison: quack.RelationalOperator.RELATIONAL_OPERATOR_LESS_THAN,
-            value: -lowDelta,
-            measurementType: quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE
+      //if they want the red light off when below a certain pressure, it will need 4 seperate SET interactions
+      if(useRedOffCondition){
+        //need to make sure the redthreshold is in pascals
+        let thresholdPascals = 0
+        if(!isNaN(parseFloat(redThreshold))){
+          if(getPressureUnit() === pond.PressureUnit.PRESSURE_UNIT_KILOPASCALS){
+            thresholdPascals = parseFloat(redThreshold)*1000
+          }else if (getPressureUnit() === pond.PressureUnit.PRESSURE_UNIT_INCHES_OF_WATER){
+            thresholdPascals = parseFloat(redThreshold)*249
+          }
+        }
+
+        //SET red on when above high
+        lightInteractions.push(pond.InteractionSettings.create({
+          sink: redSink,
+          source: pressureSource,
+          conditions: [
+            pond.InteractionCondition.create({
+              comparison: quack.RelationalOperator.RELATIONAL_OPERATOR_LESS_THAN,
+              value: -highDelta,
+              measurementType: quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE
+            })
+          ],
+          nodeOne: 2,
+          nodeTwo: 1,
+          subtype: 18,
+          schedule: lightSchedule,
+          result: pond.InteractionResult.create({
+            type: quack.InteractionResultType.INTERACTION_RESULT_TYPE_SET,
+            value: 1
           })
-        ],
-        nodeOne: 2,
-        nodeTwo: 1,
-        subtype: 18,
-        schedule: pond.InteractionSchedule.create({
-          timezone: moment.tz.guess(),
-          weekdays: ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"],
-          timeOfDayStart: "00:00",
-          timeOfDayEnd: "24:00"
-        }),
-        result: pond.InteractionResult.create({
-          type: quack.InteractionResultType.INTERACTION_RESULT_TYPE_TOGGLE,
-          value: 0
-        })
-      });
+        }))
+        //SET red off when below high and above low
+        lightInteractions.push(pond.InteractionSettings.create({
+          sink: redSink,
+          source: pressureSource,
+          conditions: [
+            pond.InteractionCondition.create({
+              comparison: quack.RelationalOperator.RELATIONAL_OPERATOR_GREATER_THAN,
+              value: -highDelta,
+              measurementType: quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE
+            }),
+            pond.InteractionCondition.create({
+              comparison: quack.RelationalOperator.RELATIONAL_OPERATOR_LESS_THAN,
+              value: -lowDelta,
+              measurementType: quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE
+            })
+          ],
+          nodeOne: 2,
+          nodeTwo: 1,
+          subtype: 18,
+          schedule: lightSchedule,
+          result: pond.InteractionResult.create({
+            type: quack.InteractionResultType.INTERACTION_RESULT_TYPE_SET,
+            value: 0
+          })
+        }))
+        //SET red on when below low and above threshold
+        lightInteractions.push(pond.InteractionSettings.create({
+          sink: redSink,
+          source: pressureSource,
+          conditions: [
+            pond.InteractionCondition.create({
+              comparison: quack.RelationalOperator.RELATIONAL_OPERATOR_GREATER_THAN,
+              value: -lowDelta,
+              measurementType: quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE
+            }),
+            pond.InteractionCondition.create({
+              comparison: quack.RelationalOperator.RELATIONAL_OPERATOR_LESS_THAN,
+              value: -thresholdPascals,
+              measurementType: quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE
+            }),
+          ],
+          nodeOne: 2,
+          nodeTwo: 1,
+          subtype: 18,
+          schedule: lightSchedule,
+          result: pond.InteractionResult.create({
+            type: quack.InteractionResultType.INTERACTION_RESULT_TYPE_SET,
+            value: 1
+          })
+        }))
+        //SET red off when below threshold
+        lightInteractions.push(pond.InteractionSettings.create({
+          sink: redSink,
+          source: pressureSource,
+          conditions: [
+            pond.InteractionCondition.create({
+              comparison: quack.RelationalOperator.RELATIONAL_OPERATOR_LESS_THAN,
+              value: thresholdPascals,
+              measurementType: quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE
+            }),
+          ],
+          subtype: 1,
+          schedule: lightSchedule,
+          result: pond.InteractionResult.create({
+            type: quack.InteractionResultType.INTERACTION_RESULT_TYPE_SET,
+            value: 0
+          })
+        }))
+      }else{
+        //otherwise use the regular single TOGGLE interaction
+        //TOGGLE red OFF when pressure within range of upper and lower
+        lightInteractions.push(pond.InteractionSettings.create({
+          sink: redSink,
+          source: pressureSource,
+          conditions: [
+            pond.InteractionCondition.create({
+              comparison: quack.RelationalOperator.RELATIONAL_OPERATOR_GREATER_THAN,
+              value: -highDelta,
+              measurementType: quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE
+            }),
+            pond.InteractionCondition.create({
+              comparison: quack.RelationalOperator.RELATIONAL_OPERATOR_LESS_THAN,
+              value: -lowDelta,
+              measurementType: quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE
+            })
+          ],
+          nodeOne: 2,
+          nodeTwo: 1,
+          subtype: 18,
+          schedule: lightSchedule,
+          result: pond.InteractionResult.create({
+            type: quack.InteractionResultType.INTERACTION_RESULT_TYPE_TOGGLE,
+            value: 0
+          })
+        }))
+      }
 
       let deviceID = Device.any(compDevice.device).id();
       if (deviceID !== undefined) {
         let multi = pond.MultiInteractionSettings.create({
-          interactions: [greenToggle, redToggle]
+          interactions: lightInteractions
         });
         interactionsAPI
           .addMultiInteractions(deviceID, multi, as)
@@ -230,11 +354,51 @@ export default function GateDeviceInteraction(props: Props) {
       }}>
       <DialogTitle>Set Interaction For Light Toggle</DialogTitle>
       <DialogContent>
-        Your Delta Pressures, in pascals, will be:
+        {/* Your Delta Pressures, in pascals, will be:
         <Typography>low = {lowDelta}</Typography>
         <Typography>high = {highDelta}</Typography>
         <Typography>{greenComponent ? "" : "Green LED Component not found"}</Typography>
-        <Typography>{redComponent ? "" : "Red LED Component not found"}</Typography>
+        <Typography>{redComponent ? "" : "Red LED Component not found"}</Typography> */}
+        <Typography>
+          This will set interactions on the pressure chain to toggle the green light on and the red light off 
+          when the difference between the pressures falls within this range and vice versa:
+        </Typography>
+        <br />
+        <Typography>Upper Limit: {getPressureUnit() === pond.PressureUnit.PRESSURE_UNIT_INCHES_OF_WATER ? (highDelta/249.089).toFixed(2) + " iwg" : highDelta/1000 + " kPa"}</Typography>
+        <Typography>Lower Limit: {getPressureUnit() === pond.PressureUnit.PRESSURE_UNIT_INCHES_OF_WATER ? (lowDelta/249.089).toFixed(2) + " iwg" : lowDelta/1000 + " kPa"}</Typography>
+        <br />
+
+        <Typography>If you would like to have the interactions set in such a way that if the average pressure falls below a given value set the use off condition and set the value to use</Typography>
+        <FormControlLabel
+          control={
+            <Checkbox
+              checked={useRedOffCondition}
+              onChange={(e, checked) => {
+                setUseRedOffCondition(checked)
+              }}
+            />
+          }
+          label={<Typography>Use Off Condition</Typography>}
+        />
+        <TextField 
+          type="number"
+          fullWidth
+          disabled={!useRedOffCondition}
+          value={redThreshold}
+          error={isNaN(parseFloat(redThreshold))}
+          helperText={isNaN(parseFloat(redThreshold)) ? "Must be a valid number" : ""}
+          InputProps={{
+            endAdornment: (
+              <InputAdornment position="end">
+                {getPressureUnit() === pond.PressureUnit.PRESSURE_UNIT_INCHES_OF_WATER ? "iwg" : "kPa"}
+              </InputAdornment>
+            )
+          }}
+          onChange={e => {
+            setRedThreshold(e.target.value)
+          }}
+        />
+
       </DialogContent>
       <DialogActions>
         <Button
@@ -246,7 +410,7 @@ export default function GateDeviceInteraction(props: Props) {
             setAdding(true);
             createInteractions();
           }}
-          disabled={greenComponent === undefined || redComponent === undefined || adding}>
+          disabled={buttonDisabled()}>
           {adding ? "Adding Interaction" : "Create Interaction"}
         </Button>
       </DialogActions>
diff --git a/src/gate/GateFlowGraph.tsx b/src/gate/GateFlowGraph.tsx
index 6835b63..e6cdaf4 100644
--- a/src/gate/GateFlowGraph.tsx
+++ b/src/gate/GateFlowGraph.tsx
@@ -70,13 +70,19 @@ export default function GateFlowGraph(props: Props) {
   const classes = useStyles();
   const [flowEvents, setFlowEvents] = useState<pond.AirFlowEvent[]>([]);
   const [eventsLoading, setEventsLoading] = useState(false);
-  //these two constants could be entered by the user at time of retrieval
+  //these two constants could be entered by the user at time of retrieval or set in the gates settings
   const eventThreshold = 5; //the threshold that if crossed from one measurement to the next during a flow event will end the current flow event and start a new one
-  const idleFlow = 3.5; //the mass air flow that must be crossed in order to start a flow event, anything below this will not start an event but must go below this to end an event
-
+  //const idleFlow = 3.5; //the mass air flow that must be crossed in order to start a flow event, anything below this will not start an event but must go below this to end an event
+  const [idleFlow, setIdleFlow] = useState(3.5)
+  
   useEffect(() => {
     if (loadingChartData) return;
     if (ambient && pressureComponent) {
+      let gateIdle = idleFlow
+      if(gate.settings.idleFlow){
+        gateIdle = gate.settings.idleFlow
+      }
+
       let recent: SSAreaDataPoint | undefined;
       setLoadingChartData(true);
       gateAPI
@@ -110,11 +116,11 @@ export default function GateFlowGraph(props: Props) {
 
               /** determine runtime */
               // set the start time if the values is greater than the idleFlow and start is not already set
-              if (val.airFlow >= idleFlow && !start) {
+              if (val.airFlow >= gateIdle && !start) {
                 start = time;
               }
               // set the stop time when off or at the last measurements and the start time is set
-              if ((val.airFlow < idleFlow || i === resp.data.values.length - idleFlow) && start) {
+              if ((val.airFlow < gateIdle || i === resp.data.values.length - gateIdle) && start) {
                 stop = time;
               }
               // if both start and stop are set calculate add the timeframe to the total runtime
diff --git a/src/gate/GateList.tsx b/src/gate/GateList.tsx
index bdf58c2..3e3b330 100644
--- a/src/gate/GateList.tsx
+++ b/src/gate/GateList.tsx
@@ -11,7 +11,7 @@ import ResponsiveTable, { Column } from "common/ResponsiveTable";
 import AddGateFab from "./AddGateFab";
 import GateSettings from "./GateSettings";
 import { useGateAPI, useGlobalState } from "providers";
-import { CheckCircleOutline, DoNotDisturb, ErrorOutline, RemoveCircleOutline, Settings } from "@mui/icons-material";
+import { CheckCircleOutline, DoNotDisturb, ErrorOutline, HelpOutlineOutlined, Settings } from "@mui/icons-material";
 import { cloneDeep } from "lodash";
 import moment from "moment";
 import { pond } from "protobuf-ts/pond";
@@ -94,13 +94,13 @@ export default function GateList(props: Props) {
   const displayPCAStatus = (state: pond.PCAState) => {
     switch(state){
       case pond.PCAState.PCA_STATE_IN_BOUNDS:
-        return <CheckCircleOutline sx={{color: "green"}}/>
+        return <CheckCircleOutline sx={{color: "green"}}/> 
       case pond.PCAState.PCA_STATE_OUT_BOUNDS:
         return <ErrorOutline sx={{color: "red"}} />
       case pond.PCAState.PCA_STATE_OFF:
-        return <RemoveCircleOutline />
-      default:
         return <DoNotDisturb />
+      default:
+        return <HelpOutlineOutlined />
     }
   }
 
diff --git a/src/gate/GateSettings.tsx b/src/gate/GateSettings.tsx
index b4a1d92..c2ae4fc 100644
--- a/src/gate/GateSettings.tsx
+++ b/src/gate/GateSettings.tsx
@@ -76,6 +76,7 @@ export default function GateSettings(props: Props) {
   //user set identifier to be shown on the marker on the map
   const [terminalIdentifier, setTerminalIdentifier] = useState("");
   const [gateIdentifier, setGateIdentifier] = useState("");
+  const [idleLimit, setIdleLimit] = useState<number>(0);
   const [hourlyPCA, setHourlyPCA] = useState<number>(0);
   const [hourlyAPU, setHourlyAPU] = useState<number>(0);
 
@@ -140,6 +141,7 @@ export default function GateSettings(props: Props) {
       settings.thermalResistance = ductProps.thermalResistance;
       settings.lowerFlow = lowerFlowBound;
       settings.upperFlow = upperFlowBound;
+      settings.idleFlow = idleLimit;
       settings.ductName = ductName;
       settings.pcaType = pcaUnit;
       settings.letterIdentifier = terminalIdentifier;
@@ -167,6 +169,7 @@ export default function GateSettings(props: Props) {
         thermalResistance: ductProps.thermalResistance,
         lowerFlow: lowerFlowBound,
         upperFlow: upperFlowBound,
+        idleFlow: idleLimit,
         ductName: ductName,
         pcaType: pcaUnit,
         letterIdentifier: terminalIdentifier,
@@ -283,16 +286,18 @@ export default function GateSettings(props: Props) {
     return (
       <React.Fragment>
         <TextField
+          margin="dense"
           label="Gate Name"
           fullWidth
           value={gateName}
           onChange={e => setGateName(e.target.value)}
         />
-        <Select
+        <TextField
+        margin="dense"
           id="terminal"
           label="Terminal"
           fullWidth
-          displayEmpty
+          select
           value={terminalKey}
           onChange={e => {
             setTerminalKey(e.target.value as string);
@@ -305,8 +310,9 @@ export default function GateSettings(props: Props) {
               {terminal.name}
             </MenuItem>
           ))}
-        </Select>
+        </TextField>
         <TextField
+        margin="dense"
           label="Low Mass Air Flow"
           fullWidth
           type="number"
@@ -314,19 +320,30 @@ export default function GateSettings(props: Props) {
           onChange={e => setLowerFlowBound(+e.target.value)}
         />
         <TextField
+        margin="dense"
           label="High Mass Air Flow"
           fullWidth
-          type="number"
+          type="dense"
           value={upperFlowBound}
           onChange={e => setUpperFlowBound(+e.target.value)}
         />
         <TextField
+        margin="dense"
+          label="Idle Mass Air Flow"
+          fullWidth
+          type="number"
+          value={idleLimit}
+          onChange={e => setIdleLimit(+e.target.value)}
+        />
+        <TextField
+        margin="dense"
           label="PCA Unit"
           fullWidth
           value={pcaUnit}
           onChange={e => setPcaUnit(e.target.value)}
         />
         <TextField
+        margin="dense"
           style={{ width: "45%" }}
           select
           label="Terminal Identifier"
@@ -340,6 +357,7 @@ export default function GateSettings(props: Props) {
           {tiOptions}
         </TextField>
         <TextField
+        margin="dense"
           style={{ width: "45%", marginLeft: "10%" }}
           label="Gate Identifier"
           select
@@ -351,6 +369,7 @@ export default function GateSettings(props: Props) {
           {numberOptions}
         </TextField>
         <TextField
+        margin="dense"
           label="Hourly PCA Cost"
           fullWidth
           type="number"
@@ -361,6 +380,7 @@ export default function GateSettings(props: Props) {
           onChange={e => setHourlyPCA(+e.target.value)}
         />
         <TextField
+        margin="dense"
           label="Hourly APU Cost"
           fullWidth
           type="number"

From 39ac6fd5e2fa01a62fa9266ea0cf85ba0c5e2dd6 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 22 Jan 2026 15:55:15 -0600
Subject: [PATCH 19/50] updated the interaction api to have the new call to
 clear interactions, and am now using that call to clear the interactions from
 the pressure chain and when that response comes back successfully then will
 add the new set of interactions

---
 package-lock.json                      |  2 +-
 src/gate/GateDeviceInteraction.tsx     | 39 ++++++++++----------------
 src/providers/pond/interactionsAPI.tsx | 23 ++++++++++++++-
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 367ad08..b4743f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10953,7 +10953,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#580cb59c08f9895384b5adc4853c480bf3bf3165",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#09c1448af13950a76e9097c9b374680390039c48",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }
diff --git a/src/gate/GateDeviceInteraction.tsx b/src/gate/GateDeviceInteraction.tsx
index c8e97ef..23669f3 100644
--- a/src/gate/GateDeviceInteraction.tsx
+++ b/src/gate/GateDeviceInteraction.tsx
@@ -39,7 +39,7 @@ const densityMap = new Map<number, number>([
 export default function GateDeviceInteraction(props: Props) {
   const { open, close, gate, compDevice, densityTemp } = props;
   const [{ user, as }] = useGlobalState();
-  const [device, setDevice] = useState<Device>()
+  const [device, setDevice] = useState<Device>(Device.create())
   const [lowDelta, setLowDelta] = useState(0);
   const [highDelta, setHighDelta] = useState(0);
   const [greenComponent, setGreenComponent] = useState<Component>();
@@ -52,6 +52,7 @@ export default function GateDeviceInteraction(props: Props) {
   //if the pressure is under this value then the red light should be off
   const [redThreshold, setRedThreshold] = useState("0")
   const { openSnack } = useSnackbar();
+  const [pressureSource, setPressureSource] = useState<quack.ComponentID>(quack.ComponentID.create())
 
   useEffect(() => {
     //math to determine what the delta pressures to set will be
@@ -102,6 +103,13 @@ export default function GateDeviceInteraction(props: Props) {
           gate.preferences[component.key()] === pond.GateComponentType.GATE_COMPONENT_TYPE_PRESSURE
         ) {
           setPressureComponent(component);
+          setPressureSource(
+              quack.ComponentID.create({
+              type: component.type(),
+              address: component.settings.address,
+              addressType: component.settings.addressType
+            })
+          )
         }
       }
     });
@@ -111,21 +119,6 @@ export default function GateDeviceInteraction(props: Props) {
     }
   }, [gate, densityTemp, user, compDevice]);
 
-  // useEffect(() => {
-  //   //load current interactions for the device
-  //   let deviceID = Device.any(compDevice.device).id();
-  //   interactionsAPI.listInteractionsByDevice(deviceID).then(resp => {
-  //     setCurrentInteractions(resp);
-  //   });
-  // }, [compDevice.device, interactionsAPI]);
-
-  // const removeCurrentInteractions = () => {
-  //   let deviceID = Device.any(compDevice.device).id();
-  //   currentInteractions.forEach(interaction => {
-  //     interactionsAPI.removeInteraction(deviceID, interaction.key());
-  //   });
-  // };
-
   const buttonDisabled = () => {
     if (greenComponent === undefined) return true
     if (redComponent === undefined) return true
@@ -157,12 +150,6 @@ export default function GateDeviceInteraction(props: Props) {
         addressType: greenComponent.settings.addressType
       })
 
-      const pressureSource = quack.ComponentID.create({
-        type: pressureComponent.type(),
-        address: pressureComponent.settings.address,
-        addressType: pressureComponent.settings.addressType
-      })
-
       const lightSchedule = pond.InteractionSchedule.create({
         timezone: moment.tz.guess(),
         weekdays: ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"],
@@ -360,7 +347,7 @@ export default function GateDeviceInteraction(props: Props) {
         <Typography>{greenComponent ? "" : "Green LED Component not found"}</Typography>
         <Typography>{redComponent ? "" : "Red LED Component not found"}</Typography> */}
         <Typography>
-          This will set interactions on the pressure chain to toggle the green light on and the red light off 
+          This will clear existing interactions on the pressure chain and set new ones to toggle the green light on and the red light off 
           when the difference between the pressures falls within this range and vice versa:
         </Typography>
         <br />
@@ -408,7 +395,11 @@ export default function GateDeviceInteraction(props: Props) {
             //TODO: Once we figure out how to fix the backend to handle rapid addition/removal of interactions
             //removeCurrentInteractions();
             setAdding(true);
-            createInteractions();
+            interactionsAPI.clearInteractions(device.id(), [pressureSource]).then(resp => {
+              createInteractions();
+            }).catch(err => {
+              console.error(err)
+            })
           }}
           disabled={buttonDisabled()}>
           {adding ? "Adding Interaction" : "Create Interaction"}
diff --git a/src/providers/pond/interactionsAPI.tsx b/src/providers/pond/interactionsAPI.tsx
index 26afb1e..5fa3705 100644
--- a/src/providers/pond/interactionsAPI.tsx
+++ b/src/providers/pond/interactionsAPI.tsx
@@ -36,6 +36,7 @@ export interface IInteractionsAPIContext {
     alerts: pond.AlertData[],
     otherTeam?: string
   ) => Promise<AxiosResponse<pond.SetAlertInteractionsResponse>>;
+  clearInteractions: (device: number, sources?: quack.ComponentID[], otherTeam?: string) => Promise<AxiosResponse<pond.ClearInteractionsResponse>>
 }
 
 export const InteractionsAPIContext = createContext<IInteractionsAPIContext>(
@@ -285,6 +286,25 @@ export default function InteractionProvider(props: PropsWithChildren<Props>) {
     })
   };
 
+  const clearInteractions = (device: number, sources?: quack.ComponentID[], otherTeam?: string): Promise<AxiosResponse<pond.ClearInteractionsResponse>> => {
+    const view = otherTeam ? otherTeam : as
+    let sourceArray: string[] = []
+    if (sources){
+      sources.forEach(source => {
+        sourceArray.push(componentIDToString(source))
+      })
+    }
+    let url = pondURL("/devices/"+ device + "/interactions/clear" + (view ? "?as=" + view : "") + (sources ? "&sources=" + sourceArray.toString() : ""))
+    return new Promise<AxiosResponse<pond.ClearInteractionsResponse>>((resolve, reject) => {
+      post<pond.ClearInteractionsResponse>(url).then(resp => {
+        resp.data = pond.ClearInteractionsResponse.fromObject(resp.data)
+        return resolve(resp)
+      }).catch(err => {
+        return reject(err)
+      })
+    })
+  }
+
   return (
     <InteractionsAPIContext.Provider
       value={{
@@ -296,7 +316,8 @@ export default function InteractionProvider(props: PropsWithChildren<Props>) {
         updateInteractionPondSettings,
         removeInteraction,
         listInteractionsByDevice,
-        listInteractionsByComponent
+        listInteractionsByComponent,
+        clearInteractions
       }}>
       {children}
     </InteractionsAPIContext.Provider>

From abd829a0f30aabaef42db74fc809dafc9f53991b Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Mon, 26 Jan 2026 11:48:58 -0600
Subject: [PATCH 20/50] update the readme and created a new whitelabel for
 MiPCA that will be used to replace the omniAir one

---
 README.md                                  |  37 +++++++++++++++
 public/MiPCA/android-chrome-192x192.png    | Bin 0 -> 4124 bytes
 public/MiPCA/android-chrome-512x512.png    | Bin 0 -> 11378 bytes
 public/MiPCA/apple-touch-icon.png          | Bin 0 -> 4034 bytes
 public/MiPCA/browserconfig.xml             |   9 ++++
 public/MiPCA/favicon-16x16.png             | Bin 0 -> 808 bytes
 public/MiPCA/favicon-32x32.png             | Bin 0 -> 1450 bytes
 public/MiPCA/favicon.ico                   | Bin 0 -> 15086 bytes
 public/MiPCA/manifest.json                 |  33 ++++++++++++++
 public/MiPCA/mstile-150x150.png            | Bin 0 -> 3506 bytes
 public/MiPCA/safari-pinned-tab.svg         |  50 +++++++++++++++++++++
 src/assets/whitelabels/MiPCA/MiPCALogo.png | Bin 0 -> 23120 bytes
 src/navigation/BottomNavigator.tsx         |   9 ++--
 src/navigation/SideNavigator.tsx           |   8 ++--
 src/pages/Gate.tsx                         |   2 +-
 src/services/whiteLabel.ts                 |  31 ++++++++++++-
 16 files changed, 169 insertions(+), 10 deletions(-)
 create mode 100644 public/MiPCA/android-chrome-192x192.png
 create mode 100644 public/MiPCA/android-chrome-512x512.png
 create mode 100644 public/MiPCA/apple-touch-icon.png
 create mode 100644 public/MiPCA/browserconfig.xml
 create mode 100644 public/MiPCA/favicon-16x16.png
 create mode 100644 public/MiPCA/favicon-32x32.png
 create mode 100644 public/MiPCA/favicon.ico
 create mode 100644 public/MiPCA/manifest.json
 create mode 100644 public/MiPCA/mstile-150x150.png
 create mode 100644 public/MiPCA/safari-pinned-tab.svg
 create mode 100644 src/assets/whitelabels/MiPCA/MiPCALogo.png

diff --git a/README.md b/README.md
index 74872fd..b7a7555 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,43 @@ Currently, two official plugins are available:
 - [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
 - [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
 
+### White-labeling
+
+Steps to add a new white label
+
+1.  Client Instructions:
+
+- supply assets and colours to be used for the white-label (favicon if necessary)
+- determine a sub-domain to use as mask, dashboard is preferred (ex: dashboard.example.com)
+- add a `CNAME` record pointing their custom subdomain (ex: dashboard.example.com) to brandxtech.ca
+- add a login button on their website point to `/login` of their custom subdomain (ex: dashboard.example.com/login)
+
+<!-- frontend steps -->
+2. Create a PWA folder in `public` that is named after the client and generate PWA assets using [this](https://realfavicongenerator.net/) website (use the company logo but you might need to use a custom favicon depending on the result)
+
+- https://maskable.app/ also create a maskable icon for PWA
+- create a 512x512 png as well for PWA
+
+3. Create a white-label branding folder in `src/assets/whitelabels` and create a `darkLogo.png` and `lightLogo.png` from the client's logo
+4. In `src/services/whiteLabel.ts`, add a new `Whitelabel` instance with the required fields and add its hostname mapping to the `whitelabels` map (it is very similar to step one but had some constraints when dealing with the `public` folder)
+5. If there are any pages specific to the whitelabel be sure to update the side and bottom navigator
+
+<!-- backend steps -->
+6. In `dynamic-config.prod.yml`, add a router entry for the new whitelabel
+7. In `pond/http/server.go`, add the sub-domain to the `allowedOrigins`
+8. In `pond/whitelabel.go`, add an entry for the new white label
+
+7. Create a new `Auth0` application for the client
+   - use a image bucket like [postimg](https://postimages.org/) to store their company logo and favicon
+   - add a whitelabel logo
+   - allow necessary `origins`, `callback URLs`, and `CORS domains` to the application settings (see the default application as a guideline)
+   - customize the Universal Login page to handle the new whitelabel
+     - check if the client ID matches this client's Auth0 application
+     - change the Universal Login theme using white-label colours and images stored in a bucket (ex: [postimg](https://postimages.org/))
+8. Enable the white-label sub-domain for CORS in the backend
+
+- in [http.go](https://gitlab.com/brandx/backend/blob/master/pond/http.go), add the white-label sub-domain to the `AllowedOrigins` list
+
 ## Expanding the ESLint configuration
 
 If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
diff --git a/public/MiPCA/android-chrome-192x192.png b/public/MiPCA/android-chrome-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ed494c6af7ecf7e067a1c096aa781f1a07e38ad
GIT binary patch
literal 4124
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

literal 0
HcmV?d00001

diff --git a/public/MiPCA/android-chrome-512x512.png b/public/MiPCA/android-chrome-512x512.png
new file mode 100644
index 0000000000000000000000000000000000000000..72ba79705c0f21d4a9641d27fab3b6ab0ef1457b
GIT binary patch
literal 11378
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

literal 0
HcmV?d00001

diff --git a/public/MiPCA/apple-touch-icon.png b/public/MiPCA/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5d4d8b78cce6586872434ffcda5bba11d2d0614
GIT binary patch
literal 4034
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
SYR^w10AmC5>+ke1QU3v<$8-4r

literal 0
HcmV?d00001

diff --git a/public/MiPCA/browserconfig.xml b/public/MiPCA/browserconfig.xml
new file mode 100644
index 0000000..b3930d0
--- /dev/null
+++ b/public/MiPCA/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/public/MiPCA/favicon-16x16.png b/public/MiPCA/favicon-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..f54fc91050d2db703fe96ec69555f5671a0708de
GIT binary patch
literal 808
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F
z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a><Y92N_-CR32_C||NsBLqojjC
z%DO-iT!2VraP0{7N;-Enjo)<j!=<n?kk#LoRe#gogJ0QgS&cWH*v*6(g{k1ey2L!7
zw*yLo{6Imdz$zpvCZNj6sv^qHf77z7)yJ}FUS;C?`4Zm!EHCS~b?YhlmM@y)U?kPE
zS9iyjrFC8D+X@Y)I8Lpa7*kjq-^dg{yKLDGF%DsV5p|7dlhDsVGZ~Y--CY>}GwI#~
za@b2eeO=j~bBYKu8@+z;LLDen?CIhdB5^r6VF7DGT4HMQ^9N6!JbLyp^~vM(6afJd
zAu&Nw;pr2mOqw=v>g4o*fRLcDz|i397p`2ocJb=vbOQquBQrx&<Lw)^Y`U<?Y<uE{
zt(!NO7nBsGl}s!uy<Ge~;X}%&q_5vTrlzn+y?XupytD9hW`>*meC#^|bmW27tCqM%
zl%yn<q*^5xr2;7iBLgF2T?0#9BZCk_b1MU5D^mk)0|P4qgBpV=4^cGa=BH$)RpQpb
zo2wHG)DT`35>XPASgue|l%JNFld4csS&*ubSx}P9z)&&g@h2XR!Y~buQ~syVcs>nc
zU{>bVOXe0<7WSSj!Yr)d(qM8pg;{xXh{EX`S56!`b42C{`{@Rc1zvg#ufzpQJ~^3A
Q1zN%2>FVdQ&MBb@0OPTDN&o-=

literal 0
HcmV?d00001

diff --git a/public/MiPCA/favicon-32x32.png b/public/MiPCA/favicon-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..48b5897941fe02b24ab851dc64526333475878f0
GIT binary patch
literal 1450
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+081CwEZPlzi}!5t-?|Ns93
zNi=kmUlJ%zBtX*(<lf|$B2q7!GGwD}ORJ*E63In21er}xJF;R-_APNGf+j!|VCsd7
z5N`<3D7Y>N1FP-CsDW!lQw-!{bq`z_Toxz-H00Q+n)kp&v$G_~FBnK`sj;&tt8?&Z
za%pHOaWKi6C@?Fsyn0}xdgY$3%VTGYH?N;9kYLQb`}tvR*fqn-sJ|ag(&ePG@^YsC
zDAIm$X5Tv-)|IvYzHH%`{^_lm>dPsizoK;Kd!7{fv*Wte@y#zxH2bx?Cr;R!68Y1s
z@=?WGpO(`zE|tGD^7`g&_4WDn3r*ZH0w>nWT$z{sV^i?!FFJ0Y;(8yX1%1wUkJT&O
zV>|VGYucOyP621Vhc2e~?`0p~E6Ah4!^vM57GD8$JY$l#y9-kqcTEbA!(QU)>&pI|
zQ$&#2==Fma>Og5fPZ!4!i_^&o60BdC&giV^$$29)C+1F!&7M0of0%rHnw$<PE%M><
zu}OO5!^0yqDX8a?(WatLTwPvVr?ggOy^@+0b<1kkA|IcsUu+Jn*5y)0Qj)W0aLt?<
z9T63I`^K%C))u!cEq5F2-1W97Jt^tKhcBPLef;`4ohAB&h=7EMjL<0&F}Z^x%NEE;
z9z7x;D=aNOf5MC@b0%p`n>KG^=Ip6+C!apDWZ}Un)8hjojvU#rdB>71YxXSKv})I~
zZR_?e+_-Wl>zam@Ti5PgyxDs~V)}M}|NMCSh=VMruZ20P*)9+jKCFJyf8HUJQYrJp
z=Uy78otwoQYQX*?YuQe|zR%CZ^&)m;e4MmYv6AQS>1n^$M@a6@diu&V`#Nj0NJrGV
z>(_23><f%^jdV>FX8xS!#&%3s=U()-yxZq?H*-D_cKp0msp)p*&o^)1{;XiPQgRmn
z2C+qq-9f{HT0oX+iEBhjN@7W>RdP`(kYX@0Ff!IPu+%j&2r)FbGBCC>HPALNure^H
zF_`iYMMG|WN@iLmZVkM-I<Y_v;Z-3KB|(Yh3I#>^X_+~x3MG{VsS23|CCLm76>}bc
z;^8O^)6h8OfBKB)(;x<BWp2G>Zee9%@5v&}!U`@8CWlj)l{bedoW618#E~;cWR9?(
eZtz&(rN{6}T(IPmlj&5T6%3xPelF{r5}E+7%?RND

literal 0
HcmV?d00001

diff --git a/public/MiPCA/favicon.ico b/public/MiPCA/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..48e87f644870e7f8e26a3b13fe379da340c9c919
GIT binary patch
literal 15086
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
SB1z6~N|L$1Ik2p-?!N$r*DUV<

literal 0
HcmV?d00001

diff --git a/public/MiPCA/manifest.json b/public/MiPCA/manifest.json
new file mode 100644
index 0000000..d98df92
--- /dev/null
+++ b/public/MiPCA/manifest.json
@@ -0,0 +1,33 @@
+{
+    "name": "MiPCA",
+    "short_name": "MiPCA",
+    "icons": [
+      {
+        "src": "favicon.ico",
+        "sizes": "48x48",
+        "type": "image/x-icon"
+      },
+      {
+        "src": "android-chrome-192x192.png",
+        "sizes": "192x192",
+        "type": "image/png"
+      },
+      {
+        "src": "android-chrome-512x512.png",
+        "sizes": "512x512",
+        "type": "image/png"
+      },
+      {
+        "src": "maskable_icon.png",
+        "sizes": "196x196",
+        "type": "image/png",
+        "purpose": "any maskable"
+      }
+    ],
+    "start_url": "/",
+    "theme_color": "#272727",
+    "background_color": "#303030",
+    "display": "standalone",
+    "orientation": "any"
+  }
+  
diff --git a/public/MiPCA/mstile-150x150.png b/public/MiPCA/mstile-150x150.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5b8d9824681c42a3a12dd1f9855ecc8082efa88
GIT binary patch
literal 3506
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

literal 0
HcmV?d00001

diff --git a/public/MiPCA/safari-pinned-tab.svg b/public/MiPCA/safari-pinned-tab.svg
new file mode 100644
index 0000000..2758652
--- /dev/null
+++ b/public/MiPCA/safari-pinned-tab.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="1059.000000pt" height="1059.000000pt" viewBox="0 0 1059.000000 1059.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.14, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,1059.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M7029 6666 c-2 -2 -31 -7 -64 -10 -426 -43 -727 -354 -781 -806 -10
+-89 -11 -984 -1 -1090 27 -277 151 -517 340 -659 92 -69 256 -140 366 -157 18
+-3 43 -8 55 -10 11 -3 80 -8 151 -11 408 -17 711 161 894 525 39 77 95 242
+114 335 l14 67 -36 1 c-174 5 -484 0 -490 -7 -4 -5 -15 -36 -25 -69 -40 -134
+-128 -250 -226 -300 -73 -37 -171 -51 -268 -38 -177 23 -289 121 -347 303 -16
+49 -18 107 -20 522 -3 508 1 556 51 668 15 33 30 60 34 60 3 0 13 12 20 26 20
+36 100 92 167 115 116 41 247 36 353 -14 52 -25 157 -127 182 -178 36 -73 56
+-125 63 -161 4 -21 10 -38 14 -38 9 -1 494 -1 512 -1 15 1 15 7 -2 79 -37 158
+-60 225 -114 332 -141 281 -357 448 -651 504 -62 11 -296 21 -305 12z"/>
+<path d="M0 5298 c0 -1071 3 -1348 13 -1349 55 -4 439 -1 444 4 3 3 6 420 6
+927 0 506 2 919 4 917 2 -3 62 -190 134 -418 72 -228 178 -565 236 -749 58
+-184 108 -345 110 -357 3 -13 10 -23 17 -24 6 0 107 -1 225 -2 205 -2 214 -1
+222 18 9 21 232 743 429 1390 29 94 55 173 59 177 3 4 6 -418 5 -938 -1 -861
+0 -944 15 -945 93 -5 426 -2 434 3 9 5 12 346 12 1348 l0 1340 -35 1 c-46 0
+-555 0 -601 0 l-35 -1 -28 -97 c-15 -54 -32 -111 -37 -128 -5 -16 -40 -140
+-78 -275 -38 -135 -101 -360 -141 -500 -40 -140 -81 -284 -90 -320 -10 -36
+-41 -146 -69 -245 -29 -99 -54 -191 -57 -205 -8 -39 -12 -36 -28 21 -8 30 -47
+167 -86 304 -40 138 -82 288 -95 335 -33 121 -120 427 -221 780 -47 168 -87
+311 -87 318 0 6 -7 12 -16 12 -9 1 -161 2 -339 3 l-322 2 0 -1347z"/>
+<path d="M2890 6400 l0 -245 253 0 252 0 0 245 0 245 -252 0 -253 0 0 -245z"/>
+<path d="M3948 6642 l-46 -3 0 -244 1 -244 591 -3 c575 -3 592 -4 636 -24 85
+-39 141 -114 165 -219 43 -186 -50 -367 -212 -411 -38 -10 -170 -12 -610 -10
+l-563 2 -1 -30 c-4 -176 0 -1499 5 -1503 4 -5 417 -8 486 -4 14 1 15 63 15
+521 0 343 3 520 10 521 5 0 170 1 365 3 384 3 419 7 558 63 270 108 449 345
+478 632 10 109 11 132 3 224 -22 244 -131 442 -322 581 -93 68 -273 131 -408
+142 -69 6 -1070 11 -1151 6z"/>
+<path d="M9279 6642 c-46 -3 -47 -4 -64 -50 -9 -26 -21 -56 -25 -67 -5 -11
+-50 -128 -100 -260 -50 -132 -94 -249 -99 -260 -5 -11 -55 -141 -111 -290 -56
+-148 -105 -279 -110 -290 -11 -24 2 10 -296 -770 -284 -741 -267 -697 -255
+-704 11 -7 2358 -8 2364 -1 3 4 -59 172 -126 340 -3 8 -144 377 -312 820 -169
+443 -322 843 -340 890 -18 47 -79 207 -135 355 -57 149 -106 274 -110 278 -7
+8 -198 14 -281 9z m144 -932 c8 -25 45 -130 82 -235 37 -104 86 -246 110 -315
+24 -69 71 -204 105 -300 34 -96 76 -218 95 -270 18 -52 38 -107 44 -122 6 -16
+9 -29 8 -29 -1 -1 -213 -2 -470 -3 l-468 -1 6 23 c5 22 54 162 300 862 51 146
+108 307 126 358 17 51 35 89 39 85 4 -4 14 -28 23 -53z"/>
+<path d="M2890 4720 c0 -609 3 -770 13 -771 6 0 120 -1 252 -2 l240 0 3 771 2
+772 -255 0 -255 0 0 -770z"/>
+</g>
+</svg>
diff --git a/src/assets/whitelabels/MiPCA/MiPCALogo.png b/src/assets/whitelabels/MiPCA/MiPCALogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c828035272de01051308b1de473fa7af5863e37a
GIT binary patch
literal 23120
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

literal 0
HcmV?d00001

diff --git a/src/navigation/BottomNavigator.tsx b/src/navigation/BottomNavigator.tsx
index 9e36fe8..b03a153 100644
--- a/src/navigation/BottomNavigator.tsx
+++ b/src/navigation/BottomNavigator.tsx
@@ -13,7 +13,7 @@ import BinsIcon from "products/Bindapt/BinsIcon";
 import { useGlobalState } from "providers";
 import { useCallback, useEffect, useState } from "react";
 import { useNavigate, useLocation } from "react-router-dom";
-import { IsAdaptiveAgriculture, isBXT, IsMiVent, IsAdCon, IsOmniAir } from "services/whiteLabel";
+import { IsAdaptiveAgriculture, isBXT, IsMiVent, IsAdCon, IsOmniAir, IsMiPCA } from "services/whiteLabel";
 import FieldsIcon from "products/AgIcons/FieldsIcon";
 import NexusSTIcon from "products/Construction/NexusSTIcon";
 import OmniAirDeviceIcon from "products/AviationIcons/OmniAirDeviceIcon";
@@ -40,6 +40,7 @@ export default function BottomNavigator(props: Props) {
   const isMiVent = IsMiVent();
   const isAdCon = IsAdCon();
   const isOmni = IsOmniAir();
+  const isMiPCA = IsMiPCA();
 
   const reRoute = useCallback(
     (path: string) => {
@@ -117,14 +118,14 @@ export default function BottomNavigator(props: Props) {
             value="constructionMap"
           />
         )}
-        {isOmni && (
+        {(isOmni || isMiPCA) && (
           <BottomNavigationAction
             label="Map"
             icon={<AirportMapIcon type={getType()} />}
             value="aviationMap"
           />
         )}
-        {isOmni && (
+        {(isOmni || isMiPCA) && (
           <BottomNavigationAction
             label="Terminals"
             icon={<PlaneIcon type={getType()} />}
@@ -139,7 +140,7 @@ export default function BottomNavigator(props: Props) {
               <BindaptIcon type={getType()} />
             ) : isAdCon ? (
               <NexusSTIcon type={getType()} />
-            ) : isOmni ? (
+            ) : (isOmni || isMiPCA) ? (
               <OmniAirDeviceIcon type={getType()} />
             ) : (
               <DevicesIcon />
diff --git a/src/navigation/SideNavigator.tsx b/src/navigation/SideNavigator.tsx
index 3365a72..6bab36c 100644
--- a/src/navigation/SideNavigator.tsx
+++ b/src/navigation/SideNavigator.tsx
@@ -27,6 +27,7 @@ import {
   IsAdaptiveAgriculture,
   // hasTutorialPlaylist,
   IsAdCon,
+  IsMiPCA,
   // isBXT,
   IsMiVent,
   IsOmniAir,
@@ -166,7 +167,8 @@ export default function SideNavigator(props: Props) {
     const isMiVent = IsMiVent();
     const isAg = IsAdaptiveAgriculture()
     const isStreamline = IsStreamline()
-    const isMiPCA = IsOmniAir()
+    const isOmni = IsOmniAir()
+    const isMiPCA = IsMiPCA()
     const isAdCon = IsAdCon()
     return (
       <List className={classes.list} component="nav">
@@ -184,7 +186,7 @@ export default function SideNavigator(props: Props) {
           </ListItemButton>
         </Tooltip>
         )}
-        {(isMiPCA || user.hasFeature("admin")) && (
+        {((isOmni || isMiPCA) || user.hasFeature("admin")) && (
         <Tooltip title="Aviation Map" placement="right">
           <ListItemButton
             id="tour-aviation-map"
@@ -240,7 +242,7 @@ export default function SideNavigator(props: Props) {
           </ListItemButton>
         </Tooltip>
         )}
-        {(isMiPCA || user.hasFeature("admin")) && (
+        {((isOmni || isMiPCA) || user.hasFeature("admin")) && (
           <Tooltip title="Terminals" placement="right">
             <ListItemButton
               id="tour-terminals"
diff --git a/src/pages/Gate.tsx b/src/pages/Gate.tsx
index 3d1a3ea..767bb22 100644
--- a/src/pages/Gate.tsx
+++ b/src/pages/Gate.tsx
@@ -192,7 +192,7 @@ export default function Gate(props: Props) {
   const deviceDrawer = () => {
     return (
       <DeviceLinkDrawer
-        deviceTags={["omniair"]}
+        deviceTags={["omniair", "mipca"]}
         devicePrefMap={devPrefs}
         prefOptions={[
           <MenuItem
diff --git a/src/services/whiteLabel.ts b/src/services/whiteLabel.ts
index 0cd84cf..1b6d281 100644
--- a/src/services/whiteLabel.ts
+++ b/src/services/whiteLabel.ts
@@ -10,7 +10,7 @@ import AeroGrowDarkLogo from "../assets/whitelabels/AeroGrow/darkLogo.png";
 import AeroGrowLightLogo from "../assets/whitelabels/AeroGrow/lightLogo.png";
 import MiVentLightLogo from "../assets/whitelabels/MiVent/lightLogo.png";
 // import OmniAirLogo from "../assets/whitelabels/OmniAir/OmniAirLogo.png";
-import MiPCALogo from "../assets/whitelabels/OmniAir/MiPCALogo.png";
+import MiPCALogo from "../assets/whitelabels/MiPCA/MiPCALogo.png";
 import StreamlineLogo from "../assets/whitelabels/Streamline/stream-logo.png"
 // import { green, yellow } from "@mui/material/colors";
 
@@ -284,6 +284,32 @@ export function IsOmniAir(): boolean {
   );
 }
 
+const MIPCA_WHITE_LABEL: WhiteLabel = {
+  name: "MiPCA",
+  primaryColour: "#004f9b",
+  secondaryColour: "yellow",
+  signatureColour: "#272727",
+  signatureAccentColour: "#fff",
+  //omni air and MiPCA are the same client ID in Auth0, it is to replace it, once omniair gets removed we can re-name this
+  auth0ClientId: import.meta.env.VITE_AUTH0_OMNIAIR_CLIENT_ID, 
+  redirectOnLogout: true,
+  logoutRedirectTarget: "https://mionetech.com",
+  darkLogo: MiPCALogo,
+  lightLogo: MiPCALogo,
+  transparentLogoBG: true,
+  blacklist: ["cost"],
+  docs: "MiPCA",
+  protips: protips.concat([])
+};
+
+export function IsMiPCA(): boolean {
+  return (
+    getName() === "MiPCA" ||
+    window.location.origin.includes("staging") ||
+    window.location.origin.includes("localhost")
+  );
+}
+
 const whitelabels = new Map<string, WhiteLabel>([
   ["streamline", STREAMLINE_WHITE_LABEL],
   ["adaptiveag", ADAPTIVE_AGRICULTURE_WHITE_LABEL],
@@ -296,7 +322,8 @@ const whitelabels = new Map<string, WhiteLabel>([
   ["10.0", ADAPTIVE_CONSTRUCTION_WHITE_LABEL],
   ["mivent", MIVENT_WHITE_LABEL],
   ["adaptiveconstruction", ADAPTIVE_CONSTRUCTION_WHITE_LABEL],
-  ["omniair", OMNIAIR_WHITE_LABEL]
+  ["omniair", OMNIAIR_WHITE_LABEL],
+  ["mipca", MIPCA_WHITE_LABEL]
 ]);
 
 export function getWhitelabel(): WhiteLabel {

From 22b0ea0baa2fad8ac2755149ed9ca71980a25517 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Mon, 26 Jan 2026 12:07:28 -0600
Subject: [PATCH 21/50] changing localhost whitelabel

---
 src/services/whiteLabel.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/whiteLabel.ts b/src/services/whiteLabel.ts
index 1b6d281..d9aac95 100644
--- a/src/services/whiteLabel.ts
+++ b/src/services/whiteLabel.ts
@@ -336,7 +336,7 @@ export function getWhitelabel(): WhiteLabel {
     return BXT_WHITE_LABEL;
   }
   if (window.location.origin.includes("localhost")) {
-    return STREAMLINE_WHITE_LABEL;
+    return MIPCA_WHITE_LABEL;
   }
   if (window.location.origin.includes("staging") || import.meta.env.VITE_LOCAL_STAGING=='true') {
     return STAGING_WHITELABEL;

From 8cf173e19ab220c00dd792c67bcb8595a7f0bf49 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Mon, 26 Jan 2026 12:19:28 -0600
Subject: [PATCH 22/50] proto update

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

diff --git a/package-lock.json b/package-lock.json
index 61b530e..c150062 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "mui-tel-input": "^7.0.0",
         "notistack": "^3.0.1",
         "openweathermap-ts": "^1.2.10",
-        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master",
+        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
         "query-string": "^9.2.1",
         "react": "^18.3.1",
         "react-beautiful-dnd": "^13.1.1",
@@ -10953,7 +10953,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#b05bd05f5e9e9eb66c5afbeeee88b512be3135ef",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#c9ef7906fd97cda8ef4bd149ec4a796159a7c067",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }
diff --git a/package.json b/package.json
index ee0e9b7..fc7a1ac 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "mui-tel-input": "^7.0.0",
     "notistack": "^3.0.1",
     "openweathermap-ts": "^1.2.10",
-    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master",
+    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
     "query-string": "^9.2.1",
     "react": "^18.3.1",
     "react-beautiful-dnd": "^13.1.1",

From b19b0337fa8dc0deda0d8c7cfb4ceda7d2d5942a Mon Sep 17 00:00:00 2001
From: Carter <carter@adaptiveagriculture.ca>
Date: Tue, 27 Jan 2026 10:56:20 -0600
Subject: [PATCH 23/50] switch to master proto

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fc7a1ac..ee0e9b7 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "mui-tel-input": "^7.0.0",
     "notistack": "^3.0.1",
     "openweathermap-ts": "^1.2.10",
-    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
+    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master",
     "query-string": "^9.2.1",
     "react": "^18.3.1",
     "react-beautiful-dnd": "^13.1.1",

From 41aa84d28fa3a40de9cafcfd647cf893c06c62ac Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 27 Jan 2026 12:17:21 -0600
Subject: [PATCH 24/50] hotfix for the new whitelabel not getting the correct
 client id

---
 src/services/whiteLabel.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/services/whiteLabel.ts b/src/services/whiteLabel.ts
index d9aac95..ca8bbf1 100644
--- a/src/services/whiteLabel.ts
+++ b/src/services/whiteLabel.ts
@@ -323,7 +323,8 @@ const whitelabels = new Map<string, WhiteLabel>([
   ["mivent", MIVENT_WHITE_LABEL],
   ["adaptiveconstruction", ADAPTIVE_CONSTRUCTION_WHITE_LABEL],
   ["omniair", OMNIAIR_WHITE_LABEL],
-  ["mipca", MIPCA_WHITE_LABEL]
+  ["mipca", MIPCA_WHITE_LABEL],
+  ["mionetech", MIPCA_WHITE_LABEL]
 ]);
 
 export function getWhitelabel(): WhiteLabel {

From f02aa3a6e05b40b95f8d59158424046bb7f775de Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Wed, 28 Jan 2026 13:04:34 -0600
Subject: [PATCH 25/50] added more of the status for the gate to the gates
 dashboard, also changed the sensor graphs to have them in a specific order

---
 package-lock.json       |   4 +-
 package.json            |   2 +-
 src/gate/GateDevice.tsx |  20 ++++++
 src/gate/GateGraphs.tsx |  91 +++++++++++++++++---------
 src/gate/GateList.tsx   | 139 +++++++++++++++++++++++++++-------------
 src/pages/Gate.tsx      |  14 ++--
 6 files changed, 183 insertions(+), 87 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c150062..3d7a074 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "mui-tel-input": "^7.0.0",
         "notistack": "^3.0.1",
         "openweathermap-ts": "^1.2.10",
-        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
+        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#gate_dashboard",
         "query-string": "^9.2.1",
         "react": "^18.3.1",
         "react-beautiful-dnd": "^13.1.1",
@@ -10953,7 +10953,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#c9ef7906fd97cda8ef4bd149ec4a796159a7c067",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#7b1d4cc9b83dbd50ce5fd2bc751f4f8f68471861",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }
diff --git a/package.json b/package.json
index ee0e9b7..03913bd 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "mui-tel-input": "^7.0.0",
     "notistack": "^3.0.1",
     "openweathermap-ts": "^1.2.10",
-    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master",
+    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#gate_dashboard",
     "query-string": "^9.2.1",
     "react": "^18.3.1",
     "react-beautiful-dnd": "^13.1.1",
diff --git a/src/gate/GateDevice.tsx b/src/gate/GateDevice.tsx
index f7a8746..63ec92c 100644
--- a/src/gate/GateDevice.tsx
+++ b/src/gate/GateDevice.tsx
@@ -44,6 +44,8 @@ export default function GateDevice(props: Props) {
   const [tempKey, setTempKey] = useState("");
   const [pressureKey, setPressureKey] = useState("");
   const [ambientKey, setAmbientKey] = useState("");
+  const [greenLightKey, setGreenLightKey] = useState("");
+  const [redLightKey, setRedLightKey] = useState("");
   const { openSnack } = useSnackbar();
   const [{ user }] = useGlobalState();
   const [interactionDialog, setInteractionDialog] = useState(false);
@@ -57,8 +59,18 @@ export default function GateDevice(props: Props) {
   const [lastPressures, setLastPressures] = useState({ p1: 0, p2: 0 });
 
   useEffect(() => {
+    //addresses of controller LEDs on a V1 device
+    let redAddr = "3-1-512";
+    let greenAddr = "3-1-1024";
     if (comprehensiveDevice.device) {
       setDevice(Device.any(comprehensiveDevice.device));
+
+      //check if the device is a MiPCA V2 device since the lEDs will have different addresses
+      let dev = Device.create(comprehensiveDevice.device);
+      if (dev.settings.product === pond.DeviceProduct.DEVICE_PRODUCT_MIPCA_V2) {
+        redAddr = "3-1-256";
+        greenAddr = "3-1-512";
+      }
     }
     if (comprehensiveDevice.components) {
       let components: Map<string, Component> = new Map<string, Component>();
@@ -100,6 +112,11 @@ export default function GateDevice(props: Props) {
               break;
           }
         }
+        if (c.locationString() === redAddr && c.subType() === 1) {
+          setRedLightKey(c.key());
+        } else if (c.locationString() === greenAddr && c.subType() === 1) {
+          setGreenLightKey(c.key());
+        }
       });
       setComponentOptions(components);
     }
@@ -362,6 +379,9 @@ export default function GateDevice(props: Props) {
           }}
           ambient={ambientKey}
           pressure={pressureKey}
+          tempChain={tempKey}
+          redKey={redLightKey}
+          greenKey={greenLightKey}
           device={device.id()}
         />
       </Grid>
diff --git a/src/gate/GateGraphs.tsx b/src/gate/GateGraphs.tsx
index 40c47d8..286abee 100644
--- a/src/gate/GateGraphs.tsx
+++ b/src/gate/GateGraphs.tsx
@@ -36,6 +36,9 @@ interface Props {
   device: string | number;
   pressure: string;
   ambient: string;
+  tempChain: string;
+  redKey: string;
+  greenKey: string;
   setPCAState: (state: boolean) => void;
 }
 
@@ -60,7 +63,7 @@ const useStyles = makeStyles((theme: Theme) => ({
 );
 
 export default function GateGraphs(props: Props) {
-  const { gate, display, compMap, device, pressure, ambient, setPCAState } = props;
+  const { gate, display, compMap, device, pressure, ambient, tempChain, greenKey, redKey, setPCAState } = props;
   const [{ as }] = useGlobalState();
   const [xDomain, setXDomain] = useState<string[] | number[]>(["dataMin", "dataMax"]);
   const [zoomed, setZoomed] = useState(false);
@@ -270,42 +273,68 @@ export default function GateGraphs(props: Props) {
     );
   };
 
-  const sensorGraphs = () => {
+  const graphCard = (component: Component, unitMeasurements: UnitMeasurement[]) => {
     return (
-      <Box>
-        {Array.from(compMeasurements.values()).map((compMeasurement, i) => {
-          let c = Component.create();
-          if (compMeasurement[0]) {
-            c = compMap.get(compMeasurement[0].componentId) ?? Component.create();
-          }
-          if (compMap.get(c.key())) {
-            return (
-              <Card raised key={i} style={{ padding: 10, marginBottom: 15 }}>
-                {graphHeader(c)}
-                {compMeasurement.map(um => {
-                  if (um.values[0] && um.values[0].values.length > 1) {
-                    return areaGraph(
-                      um,
-                      describeMeasurement(um.type, c.type(), c.subType()),
-                      c.settings.smoothingAverages
-                    );
-                  } else {
-                    return lineGraph(
-                      um,
-                      describeMeasurement(um.type, c.type(), c.subType()),
-                      c.settings.smoothingAverages
-                    );
-                  }
-                })}
-              </Card>
+      <Card raised key={component.key()} style={{ padding: 10, marginBottom: 15 }}>
+        {graphHeader(component)}
+        {unitMeasurements.map(um => {
+          if (um.values[0] && um.values[0].values.length > 1) {
+            return areaGraph(
+              um,
+              describeMeasurement(um.type, component.type(), component.subType()),
+              component.settings.smoothingAverages
             );
           } else {
-            return <Box></Box>;
+            return lineGraph(
+              um,
+              describeMeasurement(um.type, component.type(), component.subType()),
+              component.settings.smoothingAverages
+            );
           }
         })}
-      </Box>
+      </Card>
     );
-  };
+  }
+
+  /**
+   * This function creates the charts for the gate page using the MAIN components on the gate, it DOES NOT show any other components that could be on the device
+   * @returns list of cards for the charts
+   */
+  const sensorGraphs = () => {
+    let graphs: JSX.Element[] = []
+
+    //pressure
+    let pressureComp = compMap.get(pressure)
+    let pressureReadings = compMeasurements.get(pressure)
+    if(pressureComp && pressureReadings){
+      graphs.push(graphCard(pressureComp, pressureReadings))
+    }
+    //T/H chain
+    let tempComp = compMap.get(tempChain)
+    let tempReadings = compMeasurements.get(tempChain)
+    if(tempComp && tempReadings){
+      graphs.push(graphCard(tempComp, tempReadings))
+    }
+    //ambient
+    let ambientComp = compMap.get(ambient)
+    let ambientReadings = compMeasurements.get(ambient)
+    if (ambientComp && ambientReadings){
+      graphs.push(graphCard(ambientComp, ambientReadings))
+    }
+    //green
+    let greenComp = compMap.get(greenKey)
+    let greenReadings = compMeasurements.get(greenKey)
+    if (greenComp && greenReadings){
+      graphs.push(graphCard(greenComp, greenReadings))
+    }
+    //red
+    let redComp = compMap.get(redKey)
+    let redReadings = compMeasurements.get(redKey)
+    if (redComp && redReadings){
+      graphs.push(graphCard(redComp, redReadings))
+    }
+    return graphs
+  }
 
   const analyticGraphs = () => {
     return (
diff --git a/src/gate/GateList.tsx b/src/gate/GateList.tsx
index 3e3b330..cd316c4 100644
--- a/src/gate/GateList.tsx
+++ b/src/gate/GateList.tsx
@@ -15,6 +15,10 @@ import { CheckCircleOutline, DoNotDisturb, ErrorOutline, HelpOutlineOutlined, Se
 import { cloneDeep } from "lodash";
 import moment from "moment";
 import { pond } from "protobuf-ts/pond";
+import { UnitMeasurement } from "models/UnitMeasurement";
+import { quack } from "protobuf-ts/quack";
+import { getTemperatureUnit } from "utils";
+import { teal } from "@mui/material/colors";
 
 interface Props {
   //gates: Gate[];
@@ -47,6 +51,7 @@ export default function GateList(props: Props) {
   const navigate = useNavigate();
   const isMobile = useMobile();
   const classes = useStyles();
+  const [{user}] = useGlobalState()
   const [gateDialog, setGateDialog] = useState(false);
   const [tablePage, setTablePage] = useState(0)
   const [pageSize, setPageSize] = useState(10)
@@ -104,6 +109,38 @@ export default function GateList(props: Props) {
     }
   }
 
+  const lastOutletReading = (reading: pond.UnitMeasurementsForComponent[]) => {
+    let outletDisplay = "--"
+    let timeSince = "No Reading Yet"
+    let color = ""
+    reading.forEach(um => {
+      let clone = cloneDeep(um)
+      let measurement = UnitMeasurement.create(clone, user)
+      if(measurement.type === quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE || measurement.type === quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE){
+        let nodes = measurement.values[measurement.values.length-1].values
+        outletDisplay = nodes[nodes.length-1].toFixed(2) + " " + measurement.unit
+        timeSince = moment(measurement.timestamps[measurement.timestamps.length-1]).fromNow()
+        color = measurement.colour
+      }
+    })
+    return (
+        <Box padding={2}>
+          <Box display="flex" justifyContent="space-between">
+            <Typography>Value:</Typography>
+            <Typography color={color}>{outletDisplay}</Typography>
+          </Box>
+          <Box display="flex" justifyContent="space-between">
+            <Typography>Time:</Typography>
+            <Typography>{timeSince}</Typography>
+          </Box>
+        </Box>
+    )
+  }
+
+  const CtoF = (celsius: number) => {
+    return Math.round((celsius * (9 / 5) + 32) * 100) / 100;
+  };
+
   const desktopCols = (): Column<Gate>[] => {
     return [
       {
@@ -126,68 +163,78 @@ export default function GateList(props: Props) {
           </Box>
         )
       },
-      {
-        title: "Duct Type",
-        render: gate => (
-          <Box padding={2}>
-            <Typography>
-            {gate.settings.ductName}
-            </Typography>
-          </Box>
-        )
-      },
-      {
-        title: "Duct Size(mm)",
-        render: gate => (
-          <Box padding={2}>
-            <Typography>
-            {gate.ductDiameter()}
-            </Typography>
-          </Box>
-        )
-      },
-      {
-        title: "Duct Length(m)",
-        render: gate => (
-          <Box padding={2}>
-            <Typography>
-            {gate.settings.ductLength}
-            </Typography>
-          </Box>
-        )
-      },
-      {
-        title: "PCA Unit",
-        render: gate => (
-          <Box padding={2}>
-            <Typography>
-            {gate.settings.pcaType}
-            </Typography>
-          </Box>
-        )
-      },
       {
         title: "PCA Status",
-        render: gate => (
-          <Box padding={2}>
+        render: gate => {
+        return (<Box padding={2}>
             {displayPCAStatus(gate.status.pcaState)}
+          </Box>)
+        }
+      },
+      {
+        title: "Conditioning",
+        render: gate => {
+          let display = ""
+          if(gate.status.pcaState === pond.PCAState.PCA_STATE_OFF){
+            display = "Inactive"
+          } else if (gate.status.pcaState === pond.PCAState.PCA_STATE_UNKNOWN){
+            display = "--"
+          } else {
+            display = gate.status.heating ? "Heating" : "Cooling"
+          }
+          return (
+          <Box padding={2}>
+            <Typography>
+            {display}
+            </Typography>
           </Box>
-        )
+        )}
+      },
+      {
+        title: "Estimated Temp",
+        render: gate => {
+          let display = "--"
+          if(gate.status.pcaState !== pond.PCAState.PCA_STATE_OFF){
+            //only display it if the final temp is between -4 and 60 C, is a valid number, and is not exactly 0
+            //0 is technically a valid number but the likely hood of the calculation being exactly 0 is negligible
+            if (gate.status.finalTemp < 60 && gate.status.finalTemp > -40 && !isNaN(gate.status.finalTemp) && gate.status.finalTemp !== 0){
+              display = getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT ? CtoF(gate.status.finalTemp).toFixed(2) + "°F" : gate.status.finalTemp.toFixed(2) + "°C"
+            }
+          }
+          return (
+          <Box padding={2}>
+            <Typography >
+            {display}
+            </Typography>
+          </Box>
+        )}
       },
       {
         title: "Last FLow",
         render: gate => (
           <Box padding={2}>
             <Box display="flex" justifyContent="space-between">
-              <Typography>Last Flow:</Typography>
-              <Typography>{gate.status.lastMassAirflow.toFixed(2)}</Typography>
+              <Typography>Flow:</Typography>
+              <Typography color={teal[500]}>{gate.status.lastMassAirflow.toFixed(2)} kg/s</Typography>
             </Box>
             <Box display="flex" justifyContent="space-between">
-              <Typography>Last Reading:</Typography>
+              <Typography>Read:</Typography>
               <Typography>{gate.status.lastUpdate !== "" ? moment(gate.status.lastUpdate).fromNow() : "No Reading Yet"}</Typography>
             </Box>
           </Box>
         )
+      },
+      {
+        title: "Outlet Temperature",
+        render: gate => (
+          <Box>{lastOutletReading(gate.status.lastTempReading)}</Box>
+        )
+      },
+      {
+        title: "Outlet Pressure",
+        render: gate => (
+          <Box>{lastOutletReading(gate.status.lastPressureReading)}</Box>
+        )
       }
     ]
   }
diff --git a/src/pages/Gate.tsx b/src/pages/Gate.tsx
index 767bb22..780600a 100644
--- a/src/pages/Gate.tsx
+++ b/src/pages/Gate.tsx
@@ -192,7 +192,9 @@ export default function Gate(props: Props) {
   const deviceDrawer = () => {
     return (
       <DeviceLinkDrawer
-        deviceTags={["omniair", "mipca"]}
+        //the mipca tag was not working for some reason so just taking the tags out
+        //and this way we dont have to worry about tagging them when they are provisioned
+        //deviceTags={["omniair", "mipca", "MiPCA", "Mipca"]} 
         devicePrefMap={devPrefs}
         prefOptions={[
           <MenuItem
@@ -341,16 +343,14 @@ export default function Gate(props: Props) {
                     spacing={2}
                     alignItems="center"
                     alignContent="center">
-                    <Grid>
+                    <Grid size={12}>
                       <Box display="flex" justifyContent="center" alignItems="center">
                         <Link style={{ height: 50, width: 50 }} />
+                        <Typography paddingLeft={2} style={{ fontSize: 25, fontWeight: 650 }}>
+                          Connect Device
+                        </Typography>
                       </Box>
                     </Grid>
-                    <Grid>
-                      <Typography style={{ fontSize: 25, fontWeight: 650 }}>
-                        Connect Device
-                      </Typography>
-                    </Grid>
                     <Grid size={12}>
                       Click here to add a device to the gate. To add an additional device to a gate
                       use the "Link Device" icon on the top right side of this page

From e42f1a3fb08fe702673ebfab6db6b1cbee71dd43 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Wed, 28 Jan 2026 14:59:32 -0600
Subject: [PATCH 26/50] updated the gate page to use the pca state in the gates
 status for the lights on the visualizer and the pca fan on/off, this also
 allows me to get rid of setting those base on the data loaded for the graph
 which will fix the bug where the light could change based on what date range
 you loaded

---
 src/gate/GateDevice.tsx    | 28 ++++++++++++++--------------
 src/gate/GateFlowGraph.tsx | 24 ++++++++++++------------
 src/gate/GateGraphs.tsx    | 10 +++++-----
 src/gate/GateSVG.tsx       | 30 ++++++++++++++++++++----------
 src/pages/Gate.tsx         |  2 +-
 5 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/src/gate/GateDevice.tsx b/src/gate/GateDevice.tsx
index 63ec92c..bfc1641 100644
--- a/src/gate/GateDevice.tsx
+++ b/src/gate/GateDevice.tsx
@@ -51,8 +51,8 @@ export default function GateDevice(props: Props) {
   const [interactionDialog, setInteractionDialog] = useState(false);
   const [densityTemp, setDensityTemp] = useState(0);
   const isMobile = useMobile();
-  const [pcaState, setPCAState] = useState(false);
-  const [pcaFanOn, setPCAFanOn] = useState(false);
+  // const [pcaState, setPCAState] = useState(false);
+  // const [pcaFanOn, setPCAFanOn] = useState(false);
   const [detail, setDetail] = useState<"sensors" | "analytics">("analytics");
   const [lastAmbient, setLastAmbient] = useState(0);
   const [lastTemps, setLastTemps] = useState({ t1: 0, t2: 0 });
@@ -99,13 +99,13 @@ export default function GateDevice(props: Props) {
               break;
             case pond.GateComponentType.GATE_COMPONENT_TYPE_PRESSURE:
               setPressureKey(c.key());
-              if (
-                c.status.measurement[0] &&
-                c.status.measurement[0].values[0] &&
-                c.status.measurement[0].values[0].values[1]
-              ) {
-                setPCAFanOn(c.status.measurement[0].values[0].values[1] > 996); //apx 4 iwg
-              }
+              // if (
+              //   c.status.measurement[0] &&
+              //   c.status.measurement[0].values[0] &&
+              //   c.status.measurement[0].values[0].values[1]
+              // ) {
+              //   setPCAFanOn(c.status.measurement[0].values[0].values[1] > 996); //apx 4 iwg
+              // }
               break;
             default:
               // type is unknown, do nothing
@@ -345,8 +345,8 @@ export default function GateDevice(props: Props) {
             ambientSelector={ambientSelector}
             tempChainSelector={tempSelector}
             pressureChainSelector={pressureSelector}
-            pcaState={pcaState}
-            pcaFanState={pcaFanOn}
+            pcaState={gate.status.pcaState}
+            // pcaFanState={pcaFanOn}
             checkInTime={device.status.lastActive}
           />
           <Button
@@ -374,9 +374,9 @@ export default function GateDevice(props: Props) {
           gate={gate}
           display={detail}
           compMap={componentOptions}
-          setPCAState={(state: boolean) => {
-            setPCAState(state);
-          }}
+          // setPCAState={(state: boolean) => {
+          //   setPCAState(state);
+          // }}
           ambient={ambientKey}
           pressure={pressureKey}
           tempChain={tempKey}
diff --git a/src/gate/GateFlowGraph.tsx b/src/gate/GateFlowGraph.tsx
index e6cdaf4..c2eca79 100644
--- a/src/gate/GateFlowGraph.tsx
+++ b/src/gate/GateFlowGraph.tsx
@@ -25,7 +25,7 @@ interface Props {
   ambient?: string;
   newXDomain?: number[] | string[];
   pressureComponent?: string;
-  setPCAState: (state: boolean) => void;
+  // setPCAState: (state: boolean) => void;
   multiGraphZoom?: (domain: number[] | string[]) => void;
 }
 
@@ -55,7 +55,7 @@ export default function GateFlowGraph(props: Props) {
     device,
     ambient,
     pressureComponent,
-    setPCAState,
+    // setPCAState,
     start,
     end,
     newXDomain,
@@ -131,22 +131,22 @@ export default function GateFlowGraph(props: Props) {
               }
             });
             setRuntime(moment.duration(runtime));
-            let state = false;
-            if (
-              data.length > 1 &&
-              data[data.length - 1].value > gate.lowerFlow() &&
-              data[data.length - 1].value < gate.upperFlow()
-            ) {
-              state = true;
-            }
-            setPCAState(state);
+            // let state = false;
+            // if (
+            //   data.length > 1 &&
+            //   data[data.length - 1].value > gate.lowerFlow() &&
+            //   data[data.length - 1].value < gate.upperFlow()
+            // ) {
+            //   state = true;
+            // }
+            // setPCAState(state);
           }
           setFlowData(data);
           setLoadingChartData(false);
           setRecent(recent);
         });
     }
-  }, [gateAPI, gate, ambient, pressureComponent, start, end, device, setPCAState, as]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [gateAPI, gate, ambient, pressureComponent, start, end, device, as]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const loadFlowEvents = () => {
     if (ambient && pressureComponent) {
diff --git a/src/gate/GateGraphs.tsx b/src/gate/GateGraphs.tsx
index 286abee..66ebb85 100644
--- a/src/gate/GateGraphs.tsx
+++ b/src/gate/GateGraphs.tsx
@@ -39,7 +39,7 @@ interface Props {
   tempChain: string;
   redKey: string;
   greenKey: string;
-  setPCAState: (state: boolean) => void;
+  // setPCAState: (state: boolean) => void;
 }
 
 const useStyles = makeStyles((theme: Theme) => ({
@@ -63,7 +63,7 @@ const useStyles = makeStyles((theme: Theme) => ({
 );
 
 export default function GateGraphs(props: Props) {
-  const { gate, display, compMap, device, pressure, ambient, tempChain, greenKey, redKey, setPCAState } = props;
+  const { gate, display, compMap, device, pressure, ambient, tempChain, greenKey, redKey } = props;
   const [{ as }] = useGlobalState();
   const [xDomain, setXDomain] = useState<string[] | number[]>(["dataMin", "dataMax"]);
   const [zoomed, setZoomed] = useState(false);
@@ -347,9 +347,9 @@ export default function GateGraphs(props: Props) {
           gate={gate}
           ambient={ambient}
           pressureComponent={pressure}
-          setPCAState={(state: boolean) => {
-            setPCAState(state);
-          }}
+          // setPCAState={(state: boolean) => {
+          //   setPCAState(state);
+          // }}
           multiGraphZoom={domain => {
             setXDomain(domain);
             setZoomed(true);
diff --git a/src/gate/GateSVG.tsx b/src/gate/GateSVG.tsx
index 6e9e669..d71f857 100644
--- a/src/gate/GateSVG.tsx
+++ b/src/gate/GateSVG.tsx
@@ -48,8 +48,8 @@ interface Props {
   ambientSelector: () => JSX.Element;
   tempChainSelector: () => JSX.Element;
   pressureChainSelector: () => JSX.Element;
-  pcaState: boolean;
-  pcaFanState: boolean;
+  pcaState: pond.PCAState;
+  // pcaFanState: boolean;
   checkInTime: string;
 }
 
@@ -63,7 +63,7 @@ export default function GateSVG(props: Props) {
     tempChainSelector,
     pressureChainSelector,
     pcaState,
-    pcaFanState,
+    // pcaFanState,
     checkInTime
   } = props;
   const classes = useStyles();
@@ -242,16 +242,23 @@ export default function GateSVG(props: Props) {
     return temp;
   };
 
+  const finalTempDisplay = (temp: number) => {
+    let display = "--"
+    if(pcaState === pond.PCAState.PCA_STATE_IN_BOUNDS || pcaState === pond.PCAState.PCA_STATE_OUT_BOUNDS){
+      if(temp < 60 && temp > -40 && !isNaN(temp) && temp !== 0){
+        display = convertFinalTemp(finalTemp).toFixed(2) + (user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT ? "°F" : "°C")
+      }
+    }
+    return display
+  }
+
   const renderValues = () => {
     let values: JSX.Element[] = [];
     //add the final temp display to the array
     values.push(
       <g key={"finalTemp"} id={"finalTemp"} data-name={"finalTemp"}>
         <text fontSize={7} className={classes.fontBase} x={100} y={85}>
-          {convertFinalTemp(finalTemp).toFixed(2)}
-          {user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
-            ? "°F"
-            : "°C"}
+          {finalTempDisplay(finalTemp)}
         </text>
       </g>
     );
@@ -302,7 +309,8 @@ export default function GateSVG(props: Props) {
   const pcaRed = () => {
     return (
       <g key={"pcaRed"} id={"pcaRed"} data-name={"pcaRed"}>
-        <circle cx={175} cy={152} r={8} fill={pcaFanState ? (pcaState ? "grey" : "red") : "grey"} />
+        {/* <circle cx={175} cy={152} r={8} fill={(pcaFanState && pcaState === pond.PCAState.PCA_STATE_OUT_BOUNDS) ? "red" : "grey"} /> */}
+        <circle cx={175} cy={152} r={8} fill={pcaState === pond.PCAState.PCA_STATE_OUT_BOUNDS ? "red" : "grey"} />
       </g>
     );
   };
@@ -314,7 +322,8 @@ export default function GateSVG(props: Props) {
           cx={175}
           cy={174}
           r={8}
-          fill={pcaFanState ? (pcaState ? "green" : "grey") : "grey"}
+          //fill={(pcaFanState && pcaState === pond.PCAState.PCA_STATE_IN_BOUNDS) ? "green" : "grey"}
+          fill={pcaState === pond.PCAState.PCA_STATE_IN_BOUNDS ? "green" : "grey"}
         />
       </g>
     );
@@ -324,7 +333,8 @@ export default function GateSVG(props: Props) {
     return (
       <g key={"fanStatus"}>
         <text x={125} y={180} fontSize={5} className={classes.fontBase}>
-          PCA Fan: {pcaFanState ? "ON" : "OFF"}
+          {/* PCA Fan: {pcaFanState ? "ON" : "OFF"} */}
+          PCA Fan: {pcaState === pond.PCAState.PCA_STATE_OFF ? "OFF" : "ON"}
         </text>
       </g>
     );
diff --git a/src/pages/Gate.tsx b/src/pages/Gate.tsx
index 780600a..acaf847 100644
--- a/src/pages/Gate.tsx
+++ b/src/pages/Gate.tsx
@@ -134,7 +134,7 @@ export default function Gate(props: Props) {
     gateAPI
       .getGatePageData(id, as)
       .then(resp => {
-        //console.log(resp.data);
+        console.log(resp.data);
         let p = new Map<number, pond.GateDeviceType>();
         Object.keys(resp.data.preferences).forEach(k => {
           let prefKey = parseInt(k);

From 79c29f518a0a1ed9fe7d271a7fdb94a4098ed2ee Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 29 Jan 2026 11:24:20 -0600
Subject: [PATCH 27/50] updated the mobile view and moved the displays into
 their own function rather than in the columns so they can be used for the
 mobile views

---
 src/gate/GateList.tsx | 100 +++++++++++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 40 deletions(-)

diff --git a/src/gate/GateList.tsx b/src/gate/GateList.tsx
index cd316c4..e864980 100644
--- a/src/gate/GateList.tsx
+++ b/src/gate/GateList.tsx
@@ -19,6 +19,7 @@ import { UnitMeasurement } from "models/UnitMeasurement";
 import { quack } from "protobuf-ts/quack";
 import { getTemperatureUnit } from "utils";
 import { teal } from "@mui/material/colors";
+import { react } from "@babel/types";
 
 interface Props {
   //gates: Gate[];
@@ -123,6 +124,15 @@ export default function GateList(props: Props) {
         color = measurement.colour
       }
     })
+
+    if(isMobile){
+      return (
+        <React.Fragment>
+            <Typography color={color}>{outletDisplay}</Typography>
+            <Typography>{timeSince}</Typography>
+        </React.Fragment>
+    )
+    }
     return (
         <Box padding={2}>
           <Box display="flex" justifyContent="space-between">
@@ -137,6 +147,38 @@ export default function GateList(props: Props) {
     )
   }
 
+  const tempDisplay = (gate: Gate) => {
+    let display = "--"
+    if(gate.status.pcaState !== pond.PCAState.PCA_STATE_OFF){
+      //only display it if the final temp is between -4 and 60 C, is a valid number, and is not exactly 0
+      //0 is technically a valid number but the likely hood of the calculation being exactly 0 is negligible
+      if (gate.status.finalTemp < 60 && gate.status.finalTemp > -40 && !isNaN(gate.status.finalTemp) && gate.status.finalTemp !== 0){
+        display = getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT ? CtoF(gate.status.finalTemp).toFixed(2) + "°F" : gate.status.finalTemp.toFixed(2) + "°C"
+      }
+    }
+    return (
+      <Typography>
+        {display}
+      </Typography>
+    )
+  }
+
+  const conditionDisplay = (gate: Gate) => {
+    let display = ""
+    if(gate.status.pcaState === pond.PCAState.PCA_STATE_OFF){
+      display = "Inactive"
+    } else if (gate.status.pcaState === pond.PCAState.PCA_STATE_UNKNOWN){
+      display = "--"
+    } else {
+      display = gate.status.heating ? "Heating" : "Cooling"
+    }
+    return (
+      <Typography>
+      {display}
+      </Typography>
+    )
+  }
+
   const CtoF = (celsius: number) => {
     return Math.round((celsius * (9 / 5) + 32) * 100) / 100;
   };
@@ -174,40 +216,21 @@ export default function GateList(props: Props) {
       {
         title: "Conditioning",
         render: gate => {
-          let display = ""
-          if(gate.status.pcaState === pond.PCAState.PCA_STATE_OFF){
-            display = "Inactive"
-          } else if (gate.status.pcaState === pond.PCAState.PCA_STATE_UNKNOWN){
-            display = "--"
-          } else {
-            display = gate.status.heating ? "Heating" : "Cooling"
-          }
           return (
           <Box padding={2}>
-            <Typography>
-            {display}
-            </Typography>
+            {conditionDisplay(gate)}
           </Box>
         )}
       },
       {
         title: "Estimated Temp",
         render: gate => {
-          let display = "--"
-          if(gate.status.pcaState !== pond.PCAState.PCA_STATE_OFF){
-            //only display it if the final temp is between -4 and 60 C, is a valid number, and is not exactly 0
-            //0 is technically a valid number but the likely hood of the calculation being exactly 0 is negligible
-            if (gate.status.finalTemp < 60 && gate.status.finalTemp > -40 && !isNaN(gate.status.finalTemp) && gate.status.finalTemp !== 0){
-              display = getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT ? CtoF(gate.status.finalTemp).toFixed(2) + "°F" : gate.status.finalTemp.toFixed(2) + "°C"
-            }
-          }
           return (
-          <Box padding={2}>
-            <Typography >
-            {display}
-            </Typography>
-          </Box>
-        )}
+            <Box padding={2}>
+              {tempDisplay(gate)}
+            </Box>
+          )
+        }
       },
       {
         title: "Last FLow",
@@ -271,28 +294,25 @@ export default function GateList(props: Props) {
           <Typography>{terminalMap.get(gate.terminal()) ?? "None"}</Typography>
         </Box>
         <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
-          <Typography>Duct Type:</Typography>
-          <Typography>{gate.ductName() !== "" ? gate.ductName() : "None"}</Typography>
+          <Typography>Conditioning:</Typography>
+          {conditionDisplay(gate)}
         </Box>
         <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
-          <Typography>Duct Size(mm):</Typography>
-          <Typography>{gate.ductDiameter()}</Typography>
-        </Box>
-        <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
-          <Typography>DuctLength(m):</Typography>
-          <Typography>{gate.ductLength()}</Typography>
-        </Box>
-        <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
-          <Typography>PCA Unit:</Typography>
-          <Typography>{gate.settings.pcaType !== "" ? gate.settings.pcaType : "None"}</Typography>
+          <Typography>Estimated Temp:</Typography>
+          {tempDisplay(gate)}
         </Box>
         <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
           <Typography>Last Flow:</Typography>
-          <Typography>{gate.status.lastMassAirflow}</Typography>
+          <Typography color={teal[500]}>{gate.status.lastMassAirflow.toFixed(2)} kg/s</Typography>
+          <Typography>{gate.status.lastUpdate !== "" ? moment(gate.status.lastUpdate).fromNow() : "No PCA reading yet"}</Typography>
         </Box>
         <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
-          <Typography>Last Reading:</Typography>
-          <Typography>{gate.status.lastUpdate !== "" ? moment(gate.status.lastUpdate).fromNow() : "No PCA reading yet"}</Typography>
+          <Typography>Outlet Temp:</Typography>
+          {lastOutletReading(gate.status.lastTempReading)}
+        </Box>
+          <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
+          <Typography>Outlet Pressure:</Typography>
+          {lastOutletReading(gate.status.lastPressureReading)}
         </Box>
       </Box>
       // <Typography variant="body2" color="textSecondary" sx={{ padding: 1 }}>

From b5c8039192d18ef31380ecaeb1cebca1193656d9 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 29 Jan 2026 11:43:21 -0600
Subject: [PATCH 28/50] proto update

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

diff --git a/package-lock.json b/package-lock.json
index 3d7a074..deb5847 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "mui-tel-input": "^7.0.0",
         "notistack": "^3.0.1",
         "openweathermap-ts": "^1.2.10",
-        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#gate_dashboard",
+        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
         "query-string": "^9.2.1",
         "react": "^18.3.1",
         "react-beautiful-dnd": "^13.1.1",
@@ -10953,7 +10953,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#7b1d4cc9b83dbd50ce5fd2bc751f4f8f68471861",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#ab9e8d4fd38f9af7802398403d38fddda5eb01da",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }
diff --git a/package.json b/package.json
index 03913bd..fc7a1ac 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "mui-tel-input": "^7.0.0",
     "notistack": "^3.0.1",
     "openweathermap-ts": "^1.2.10",
-    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#gate_dashboard",
+    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
     "query-string": "^9.2.1",
     "react": "^18.3.1",
     "react-beautiful-dnd": "^13.1.1",

From b9bb31de7d6419616fcf82bdf01afa125210e399 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 3 Feb 2026 13:02:14 -0600
Subject: [PATCH 29/50] modifying the page container style to fix the issue
 where on mobile when using a browser you cant scroll to the bottom because of
 how vh works

---
 src/pages/PageContainer.tsx | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/pages/PageContainer.tsx b/src/pages/PageContainer.tsx
index 2915e5b..ed78830 100644
--- a/src/pages/PageContainer.tsx
+++ b/src/pages/PageContainer.tsx
@@ -9,9 +9,20 @@ const useStyles = makeStyles((theme: Theme) => ({
     width: "100%",
     overflowX: "hidden",
     overflowY: "auto",
-    height: `calc(100vh - 112px)`,
+    // height: `calc(100vh - 112px)`,
+    // [theme.breakpoints.up("sm")]: {
+    //   height: `calc(100vh - 64px)`
+    // }
+    minHeight: `calc(100vh - 112px)`,
+    "@supports (height: 100dvh)": {
+      minHeight: `calc(100dvh - 112px)`
+    },
     [theme.breakpoints.up("sm")]: {
-      height: `calc(100vh - 64px)`
+      minHeight: `calc(100vh - 64px)`,
+
+      "@supports (height: 100dvh)": {
+        minHeight: `calc(100dvh - 64px)`
+      }
     }
   },
   fullViewportContainer: {

From d009cf8383396d27326fce5531520014016b8855 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 3 Feb 2026 13:16:56 -0600
Subject: [PATCH 30/50] use height, not minHeight, as that stopped the ability
 to scroll at all

---
 src/pages/PageContainer.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/PageContainer.tsx b/src/pages/PageContainer.tsx
index ed78830..938acab 100644
--- a/src/pages/PageContainer.tsx
+++ b/src/pages/PageContainer.tsx
@@ -13,15 +13,16 @@ const useStyles = makeStyles((theme: Theme) => ({
     // [theme.breakpoints.up("sm")]: {
     //   height: `calc(100vh - 64px)`
     // }
-    minHeight: `calc(100vh - 112px)`,
+    minHeight: 0,
+    height: `calc(100vh - 112px)`,
     "@supports (height: 100dvh)": {
-      minHeight: `calc(100dvh - 112px)`
+      height: `calc(100dvh - 112px)`
     },
     [theme.breakpoints.up("sm")]: {
-      minHeight: `calc(100vh - 64px)`,
+      height: `calc(100vh - 64px)`,
 
       "@supports (height: 100dvh)": {
-        minHeight: `calc(100dvh - 64px)`
+        height: `calc(100dvh - 64px)`
       }
     }
   },

From 934264708fa39117685e12e2b4e7416177b22128 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 3 Feb 2026 13:19:53 -0600
Subject: [PATCH 31/50] adding the dhv support check to the
 fullViewportContainer as well, it is not actually used by anything that i can
 see, but this will futureproof it in case it is used later

---
 src/pages/PageContainer.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/PageContainer.tsx b/src/pages/PageContainer.tsx
index 938acab..3f0e605 100644
--- a/src/pages/PageContainer.tsx
+++ b/src/pages/PageContainer.tsx
@@ -31,6 +31,9 @@ const useStyles = makeStyles((theme: Theme) => ({
     top: 0,
     left: 0,
     height: "100vh",
+    "@supports (height: 100dvh)": {
+      height: "100dvh"
+    },
     width: "100vw",
     backgroundColor: theme.palette.background.default,
     zIndex: 2000,

From 5f44cf6f091a47a5d705c2e6fd5e0c97ee8c89f3 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 3 Feb 2026 15:14:49 -0600
Subject: [PATCH 32/50] chaging the gate list display slightly to show the
 delta temp of the last temp reading on the gate

---
 src/gate/GateList.tsx | 203 +++++++++++++++++++++++-------------------
 1 file changed, 109 insertions(+), 94 deletions(-)

diff --git a/src/gate/GateList.tsx b/src/gate/GateList.tsx
index e864980..5c7fb0c 100644
--- a/src/gate/GateList.tsx
+++ b/src/gate/GateList.tsx
@@ -110,67 +110,83 @@ export default function GateList(props: Props) {
     }
   }
 
-  const lastOutletReading = (reading: pond.UnitMeasurementsForComponent[]) => {
-    let outletDisplay = "--"
-    let timeSince = "No Reading Yet"
-    let color = ""
-    reading.forEach(um => {
-      let clone = cloneDeep(um)
-      let measurement = UnitMeasurement.create(clone, user)
-      if(measurement.type === quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE || measurement.type === quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE){
-        let nodes = measurement.values[measurement.values.length-1].values
-        outletDisplay = nodes[nodes.length-1].toFixed(2) + " " + measurement.unit
-        timeSince = moment(measurement.timestamps[measurement.timestamps.length-1]).fromNow()
-        color = measurement.colour
-      }
-    })
+  // const lastOutletReading = (reading: pond.UnitMeasurementsForComponent[]) => {
+  //   let outletDisplay = "--"
+  //   let timeSince = "No Reading Yet"
+  //   let color = ""
+  //   reading.forEach(um => {
+  //     let clone = cloneDeep(um)
+  //     let measurement = UnitMeasurement.create(clone, user)
+  //     if(measurement.type === quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE || measurement.type === quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE){
+  //       let nodes = measurement.values[measurement.values.length-1].values
+  //       outletDisplay = nodes[nodes.length-1].toFixed(2) + " " + measurement.unit
+  //       timeSince = moment(measurement.timestamps[measurement.timestamps.length-1]).fromNow()
+  //       color = measurement.colour
+  //     }
+  //   })
 
-    if(isMobile){
-      return (
-        <React.Fragment>
-            <Typography color={color}>{outletDisplay}</Typography>
-            <Typography>{timeSince}</Typography>
-        </React.Fragment>
-    )
-    }
-    return (
-        <Box padding={2}>
-          <Box display="flex" justifyContent="space-between">
-            <Typography>Value:</Typography>
-            <Typography color={color}>{outletDisplay}</Typography>
-          </Box>
-          <Box display="flex" justifyContent="space-between">
-            <Typography>Time:</Typography>
-            <Typography>{timeSince}</Typography>
-          </Box>
-        </Box>
-    )
-  }
+  //   if(isMobile){
+  //     return (
+  //       <React.Fragment>
+  //           <Typography color={color}>{outletDisplay}</Typography>
+  //           <Typography>{timeSince}</Typography>
+  //       </React.Fragment>
+  //   )
+  //   }
+  //   return (
+  //       <Box padding={2}>
+  //         <Box display="flex" justifyContent="space-between">
+  //           <Typography>Value:</Typography>
+  //           <Typography color={color}>{outletDisplay}</Typography>
+  //         </Box>
+  //         <Box display="flex" justifyContent="space-between">
+  //           <Typography>Time:</Typography>
+  //           <Typography>{timeSince}</Typography>
+  //         </Box>
+  //       </Box>
+  //   )
+  // }
 
-  const tempDisplay = (gate: Gate) => {
-    let display = "--"
-    if(gate.status.pcaState !== pond.PCAState.PCA_STATE_OFF){
-      //only display it if the final temp is between -4 and 60 C, is a valid number, and is not exactly 0
-      //0 is technically a valid number but the likely hood of the calculation being exactly 0 is negligible
-      if (gate.status.finalTemp < 60 && gate.status.finalTemp > -40 && !isNaN(gate.status.finalTemp) && gate.status.finalTemp !== 0){
-        display = getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT ? CtoF(gate.status.finalTemp).toFixed(2) + "°F" : gate.status.finalTemp.toFixed(2) + "°C"
-      }
-    }
-    return (
-      <Typography>
-        {display}
-      </Typography>
-    )
-  }
+  // const tempDisplay = (gate: Gate) => {
+  //   let display = "--"
+  //   if(gate.status.pcaState !== pond.PCAState.PCA_STATE_OFF){
+  //     //only display it if the final temp is between -4 and 60 C, is a valid number, and is not exactly 0
+  //     //0 is technically a valid number but the likely hood of the calculation being exactly 0 is negligible
+  //     if (gate.status.finalTemp < 60 && gate.status.finalTemp > -40 && !isNaN(gate.status.finalTemp) && gate.status.finalTemp !== 0){
+  //       display = getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT ? CtoF(gate.status.finalTemp).toFixed(2) + "°F" : gate.status.finalTemp.toFixed(2) + "°C"
+  //     }
+  //   }
+  //   return (
+  //     <Typography>
+  //       {display}
+  //     </Typography>
+  //   )
+  // }
 
   const conditionDisplay = (gate: Gate) => {
+    console.log(gate)
     let display = ""
+    let deltaTemp = 0
     if(gate.status.pcaState === pond.PCAState.PCA_STATE_OFF){
       display = "Inactive"
     } else if (gate.status.pcaState === pond.PCAState.PCA_STATE_UNKNOWN){
       display = "--"
-    } else {
-      display = gate.status.heating ? "Heating" : "Cooling"
+    } else { //the pca is currently active calulate the delta temp (T2 - T1) provided there are two temps
+      //loop to find the temp readings
+      let clone = cloneDeep(gate.status.lastTempReading)
+      clone.forEach(unitMeasurement => {
+        let um = UnitMeasurement.create(unitMeasurement, user) 
+        if(um.type === quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE){
+          if(um.values.length > 0){ //as long as there is at least on thing in the measurements
+            let lastReading = um.values[um.values.length-1] //there should only be one measurement in here but just make sure to get the end of the array
+            if(lastReading.values.length > 1){ //make sure there are at least two values in the array
+              console.log(lastReading.values)
+              deltaTemp = lastReading.values[lastReading.values.length -1] - lastReading.values[0] //subtract the first value from the last value to get the delta
+            }
+          }
+        }
+      })
+      display = deltaTemp.toFixed(2) + (getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT ? "°F" : "°C")
     }
     return (
       <Typography>
@@ -222,43 +238,44 @@ export default function GateList(props: Props) {
           </Box>
         )}
       },
-      {
-        title: "Estimated Temp",
-        render: gate => {
-          return (
-            <Box padding={2}>
-              {tempDisplay(gate)}
-            </Box>
-          )
-        }
-      },
-      {
-        title: "Last FLow",
-        render: gate => (
-          <Box padding={2}>
-            <Box display="flex" justifyContent="space-between">
-              <Typography>Flow:</Typography>
-              <Typography color={teal[500]}>{gate.status.lastMassAirflow.toFixed(2)} kg/s</Typography>
-            </Box>
-            <Box display="flex" justifyContent="space-between">
-              <Typography>Read:</Typography>
-              <Typography>{gate.status.lastUpdate !== "" ? moment(gate.status.lastUpdate).fromNow() : "No Reading Yet"}</Typography>
-            </Box>
-          </Box>
-        )
-      },
-      {
-        title: "Outlet Temperature",
-        render: gate => (
-          <Box>{lastOutletReading(gate.status.lastTempReading)}</Box>
-        )
-      },
-      {
-        title: "Outlet Pressure",
-        render: gate => (
-          <Box>{lastOutletReading(gate.status.lastPressureReading)}</Box>
-        )
-      }
+      //taking out these columns for now because were not sure if the customer actually wants them
+      // {
+      //   title: "Estimated Temp",
+      //   render: gate => {
+      //     return (
+      //       <Box padding={2}>
+      //         {tempDisplay(gate)}
+      //       </Box>
+      //     )
+      //   }
+      // },
+      // {
+      //   title: "Last FLow",
+      //   render: gate => (
+      //     <Box padding={2}>
+      //       <Box display="flex" justifyContent="space-between">
+      //         <Typography>Flow:</Typography>
+      //         <Typography color={teal[500]}>{gate.status.lastMassAirflow.toFixed(2)} kg/s</Typography>
+      //       </Box>
+      //       <Box display="flex" justifyContent="space-between">
+      //         <Typography>Read:</Typography>
+      //         <Typography>{gate.status.lastUpdate !== "" ? moment(gate.status.lastUpdate).fromNow() : "No Reading Yet"}</Typography>
+      //       </Box>
+      //     </Box>
+      //   )
+      // },
+      // {
+      //   title: "Outlet Temperature",
+      //   render: gate => (
+      //     <Box>{lastOutletReading(gate.status.lastTempReading)}</Box>
+      //   )
+      // },
+      // {
+      //   title: "Outlet Pressure",
+      //   render: gate => (
+      //     <Box>{lastOutletReading(gate.status.lastPressureReading)}</Box>
+      //   )
+      // }
     ]
   }
   const mobileCols = (): Column<Gate>[] => {
@@ -297,7 +314,8 @@ export default function GateList(props: Props) {
           <Typography>Conditioning:</Typography>
           {conditionDisplay(gate)}
         </Box>
-        <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
+        {/* taking these out for now because we are not sure if the customer wants them */}
+        {/* <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
           <Typography>Estimated Temp:</Typography>
           {tempDisplay(gate)}
         </Box>
@@ -313,11 +331,8 @@ export default function GateList(props: Props) {
           <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
           <Typography>Outlet Pressure:</Typography>
           {lastOutletReading(gate.status.lastPressureReading)}
-        </Box>
+        </Box> */}
       </Box>
-      // <Typography variant="body2" color="textSecondary" sx={{ padding: 1 }}>
-
-      // </Typography>
     )
   }
 

From 92114bb22cc5bdd2ce6d05133c12300a4e3cf738 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 3 Feb 2026 16:20:43 -0600
Subject: [PATCH 33/50] changing the column label

---
 src/gate/GateList.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gate/GateList.tsx b/src/gate/GateList.tsx
index 5c7fb0c..bbc5ecd 100644
--- a/src/gate/GateList.tsx
+++ b/src/gate/GateList.tsx
@@ -195,9 +195,9 @@ export default function GateList(props: Props) {
     )
   }
 
-  const CtoF = (celsius: number) => {
-    return Math.round((celsius * (9 / 5) + 32) * 100) / 100;
-  };
+  // const CtoF = (celsius: number) => {
+  //   return Math.round((celsius * (9 / 5) + 32) * 100) / 100;
+  // };
 
   const desktopCols = (): Column<Gate>[] => {
     return [
@@ -230,7 +230,7 @@ export default function GateList(props: Props) {
         }
       },
       {
-        title: "Conditioning",
+        title: "Delta Temperature",
         render: gate => {
           return (
           <Box padding={2}>
@@ -311,7 +311,7 @@ export default function GateList(props: Props) {
           <Typography>{terminalMap.get(gate.terminal()) ?? "None"}</Typography>
         </Box>
         <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
-          <Typography>Conditioning:</Typography>
+          <Typography>Delta Temperature:</Typography>
           {conditionDisplay(gate)}
         </Box>
         {/* taking these out for now because we are not sure if the customer wants them */}

From caf9fada15f70a9b61bdbfe7749965877e483960 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 5 Feb 2026 11:39:21 -0600
Subject: [PATCH 34/50] modified the SingleSetAreaChart to take in a few more
 parameters to be able to customize the tooltip a little better as well as
 have multicolour for above 0 and below 0 for the new graph on the gate page
 for showing the delta temp over time

---
 src/charts/SingleSetAreaChart.tsx |  75 ++++++++++++++-
 src/gate/GateDeltaTempGraph.tsx   | 152 ++++++++++++++++++++++++++++++
 src/gate/GateFlowGraph.tsx        |   2 +
 src/gate/GateGraphs.tsx           |  12 ++-
 src/gate/GateList.tsx             |   2 +-
 src/pages/Gate.tsx                |   1 -
 6 files changed, 235 insertions(+), 9 deletions(-)
 create mode 100644 src/gate/GateDeltaTempGraph.tsx

diff --git a/src/charts/SingleSetAreaChart.tsx b/src/charts/SingleSetAreaChart.tsx
index 99dc52a..22477d6 100644
--- a/src/charts/SingleSetAreaChart.tsx
+++ b/src/charts/SingleSetAreaChart.tsx
@@ -1,9 +1,10 @@
 import { useTheme } from "@mui/material";
 import moment from "moment";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import {
   Area,
   AreaChart,
+  Legend,
   ReferenceArea,
   ReferenceLine,
   ResponsiveContainer,
@@ -13,25 +14,38 @@ import {
   YAxis
 } from "recharts";
 import MaterialChartTooltip from "./MaterialChartTooltip";
+import { blue, orange } from "@mui/material/colors";
+import { Payload } from "recharts/types/component/DefaultLegendContent";
 
 export interface SSAreaDataPoint {
   timestamp: number;
   value: number;
 }
 
+export interface ColourData {
+  colour: string,
+  label: string
+}
+
 interface Props {
   data: SSAreaDataPoint[];
+  tooltipLabel: string
+  tooltipUnit?: string
+  yAxisLabel: string
   maxRef?: number;
   minRef?: number;
   newXDomain?: number[] | string[];
   multiGraphZoom?: (domain: number[] | string[]) => void;
+  colourAboveZero?: ColourData
+  colourBelowZero?: ColourData
 }
 
 export default function SingleSetAreaChart(props: Props) {
-  const { data, maxRef, minRef, newXDomain, multiGraphZoom } = props;
+  const { data, maxRef, minRef, newXDomain, multiGraphZoom, yAxisLabel, colourAboveZero, colourBelowZero, tooltipLabel, tooltipUnit } = props;
   const [xDomain, setXDomain] = useState<string[] | number[]>(["dataMin", "dataMax"]);
   const [refLeft, setRefLeft] = useState<number | undefined>();
   const [refRight, setRefRight] = useState<number | undefined>();
+  const [legendPayload, setLegendPayload] = useState<Payload[]>([])
   const theme = useTheme();
   const now = moment();
 
@@ -41,6 +55,40 @@ export default function SingleSetAreaChart(props: Props) {
     }
   }, [newXDomain]);
 
+  useEffect(() => {
+    let legend: Payload[] = []
+    if(colourAboveZero){
+      legend.push({
+        value: colourAboveZero.label,
+        color: colourAboveZero.colour,
+        id: colourAboveZero.label,
+        type: "square"
+      })
+    }
+    if(colourBelowZero){
+      legend.push({
+        value: colourBelowZero.label,
+        color: colourBelowZero.colour,
+        id: colourBelowZero.label,
+        type: "square"
+      })
+    }
+    setLegendPayload(legend)
+  }, [colourAboveZero, colourBelowZero])
+
+  const gradientOffset = useMemo(() => {
+  if (!data.length) return 0;
+
+  const values = data.map(p => p.value);
+  const max = Math.max(...values);
+  const min = Math.min(...values);
+
+  if (max <= 0) return 0;
+  if (min >= 0) return 1;
+
+  return max / (max - min);
+}, [data]);
+
   const zoom = () => {
     let newDomain: number[] | string[] = ["dataMin", "dataMax"];
     if (refLeft && refRight && refLeft !== refRight) {
@@ -75,12 +123,16 @@ export default function SingleSetAreaChart(props: Props) {
             setRefRight(undefined);
             zoom();
           }}>
+          <Legend
+            verticalAlign="top"
+            payload={legendPayload}
+          />
           <Tooltip
             animationEasing="ease-out"
             cursor={{ fill: theme.palette.text.primary, opacity: "0.15" }}
             labelFormatter={timestamp => moment(timestamp).format("lll")}
             content={(props: TooltipProps<any, any>) => (
-              <MaterialChartTooltip {...props} valueFormatter={value => `${value}`} />
+              <MaterialChartTooltip {...props} valueFormatter={value => `${value}` + (tooltipUnit ? tooltipUnit : "")} />
             )}
           />
           <XAxis
@@ -102,13 +154,26 @@ export default function SingleSetAreaChart(props: Props) {
             type="number"
             domain={["auto", "auto"]}
             label={{
-              value: "Mass Flow (kg/s)",
+              value: yAxisLabel,
               position: "insideLeft",
               angle: -90,
               fill: theme.palette.text.primary
             }}
           />
-          <Area dataKey={"value"} strokeWidth={3} />
+          <defs>
+            {colourAboveZero && colourBelowZero &&
+              <linearGradient id="solidColour" x1="0" y1="0" x2="0" y2="1">
+                <stop offset={gradientOffset} stopColor={colourAboveZero.colour} stopOpacity="75%" />
+                <stop offset={gradientOffset} stopColor={colourBelowZero.colour} stopOpacity="75%" />
+              </linearGradient>
+            }
+          </defs>
+          <Area dataKey={"value"} strokeWidth={3}
+            type="monotone"
+            name={tooltipLabel}
+            stroke={(colourAboveZero && colourBelowZero) && "url(#solidColour)"}
+            fill={(colourAboveZero && colourBelowZero) && "url(#solidColour)"}
+          />
           <ReferenceLine
             ifOverflow="extendDomain"
             y={maxRef}
diff --git a/src/gate/GateDeltaTempGraph.tsx b/src/gate/GateDeltaTempGraph.tsx
new file mode 100644
index 0000000..6a883bd
--- /dev/null
+++ b/src/gate/GateDeltaTempGraph.tsx
@@ -0,0 +1,152 @@
+import { Box, Card, CardHeader, Grid2, Typography } from "@mui/material"
+import { blue, orange } from "@mui/material/colors"
+import SingleSetAreaChart, { SSAreaDataPoint } from "charts/SingleSetAreaChart"
+import { useComponentAPI } from "hooks"
+import { cloneDeep } from "lodash"
+import { Component } from "models"
+import { UnitMeasurement } from "models/UnitMeasurement"
+import moment from "moment"
+import { Moment } from "moment"
+import { pond } from "protobuf-ts/pond"
+import { quack } from "protobuf-ts/quack"
+import { useGlobalState } from "providers"
+import { useEffect, useState } from "react"
+import { getTemperatureUnit } from "utils"
+
+
+interface Props {
+  //the key for the temperature chain, this may be overhauled to only be a single node in the future for the outlet and the 'inlet' would be the ambient
+  deviceID: number
+  tempComponent: Component
+  ambient?: Component
+  start: Moment;
+  end: Moment;
+}
+
+export default function GateDeltaTempGraph(props: Props){
+  const {
+    tempComponent, 
+    ambient, 
+    deviceID,
+    start,
+    end
+  } = props
+  const [data, setData] = useState<SSAreaDataPoint[]>([])
+  const [{user}] = useGlobalState()
+  const componentAPI = useComponentAPI();
+  const [recent, setRecent] = useState<SSAreaDataPoint>()
+  const warmingColour = orange["500"]
+  const coolingColour = blue["500"]
+
+  /**
+   * the use effect will use the temp component passed in get the measurements, then use the first node and the last node to determine the difference,
+   * if there is only one node, or only one node is reading due to errors, then it will use that as both the inlet and outlet so the delta will be 0,
+   * 
+   * //NOT IMPLEMENTED YET//
+   * if an ambient is passed in it will use the readings from the ambient as the inlet and the temp component as the outlet 
+   */
+  useEffect(()=>{
+    //get the measurements for the temp component
+    componentAPI.listUnitMeasurements(
+      deviceID, 
+      tempComponent.key(), 
+      start.toISOString(),
+      end.toISOString(), 
+      500, 
+      0, 
+      "timestamp",
+    ).then(resp => {
+      if(resp.data.measurements){
+        let tempCompMeasurements = resp.data.measurements.map(um => UnitMeasurement.any(um, user));
+        //if there is an ambient component, then treat the temp component like a single sensor and not a chain, and use the ambient measurements as the inlet
+        if(ambient){
+          //TODO: this is just an idea of how to handle a possible path for the overhaul of gates, if that is the route we take then this needs to be coded
+
+        }else{//else no ambient is passed in treat the temp component like a chain
+          let deltas: SSAreaDataPoint[] = []
+          tempCompMeasurements.forEach(um => {
+            if (um.type === quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE){
+              um.values.forEach((nodes, index) => {
+                if (nodes.values && nodes.values.length > 0 && um.timestamps[index]){
+                  //use the first node as the inlet
+                  let inletNode = nodes.values[0]
+                  //use the second node as the outlet, if there is an error or there is only one node then it will be used as both and the delta will be 0
+                  let outletNode = nodes.values[nodes.values.length -1]
+                  let newDelta: SSAreaDataPoint = {
+                    value: Math.round((outletNode - inletNode)*100)/100,
+                    timestamp: moment(um.timestamps[index]).valueOf(),
+                  }
+                  deltas.push(newDelta)
+                }
+              })
+            }
+          })
+          setData(deltas)
+          //use the components status to set the recent to show in the header of the card
+          let recent: SSAreaDataPoint | undefined
+          if(tempComponent.status.measurement){
+            tempComponent.status.measurement.forEach(um => {
+              if(um.type === quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE){
+                let clone = cloneDeep(um)
+                let m = UnitMeasurement.create(clone, user)
+                if(m.values.length > 0){
+                  let lastReading = m.values[m.values.length - 1]
+                  if (lastReading.values.length > 0){
+                    recent = {
+                      value: lastReading.values[lastReading.values.length -1] - lastReading.values[0],
+                      timestamp: moment(m.timestamps[m.values.length - 1]).valueOf()
+                    }
+                  }
+                }
+              }
+            })
+          }
+          setRecent(recent)
+        }
+      }
+    })
+  },[tempComponent, ambient, deviceID, start, end])
+
+  return (
+    <Card raised style={{ padding: 10, marginBottom: 15, marginTop: 15 }}>
+      <CardHeader 
+      title={<Typography style={{ fontSize: 25, fontWeight: 650 }}>Delta Temp</Typography>}
+      subheader={
+        recent ?
+        (
+          <Grid2 container>
+            <Grid2 size={12}>
+              <span>
+                {"Delta Temp: "}
+                <span style={{ color: recent.value > 0 ? warmingColour : coolingColour, fontWeight: 500 }}>
+                  {recent.value.toFixed(2) + (getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT ? " °F" : " °C")}  
+                </span>
+                <br />
+              </span>
+            </Grid2>
+            <Grid2 size={12}>
+              <Typography color="textSecondary" variant={"caption"}>
+                {moment(recent.timestamp).fromNow()}
+              </Typography>
+            </Grid2>
+          </Grid2>
+        )
+        : (
+            <Typography variant="body1" color="textPrimary">
+              No Data
+            </Typography>
+          )
+        
+      }
+      />
+      <SingleSetAreaChart 
+        data={data} 
+        tooltipLabel="Delta Temp" 
+        tooltipUnit={getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT ? " °F" : " °C"} 
+        yAxisLabel={"Delta T" + (getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT ? " °F" : " °C")} 
+        colourAboveZero={{colour: warmingColour, label: "Heating"}} 
+        colourBelowZero={{colour: coolingColour, label: "Cooling"}}/>
+    </Card>
+  )
+
+}
\ No newline at end of file
diff --git a/src/gate/GateFlowGraph.tsx b/src/gate/GateFlowGraph.tsx
index c2eca79..b9a85b1 100644
--- a/src/gate/GateFlowGraph.tsx
+++ b/src/gate/GateFlowGraph.tsx
@@ -209,6 +209,8 @@ export default function GateFlowGraph(props: Props) {
         {flowData.length !== 0 ? (
           <SingleSetAreaChart
             data={flowData}
+            tooltipLabel="Flow"
+            yAxisLabel="Mass Flow (kg/s)"
             maxRef={gate.upperFlow()}
             minRef={gate.lowerFlow()}
             newXDomain={newXDomain}
diff --git a/src/gate/GateGraphs.tsx b/src/gate/GateGraphs.tsx
index 66ebb85..4f9c7fa 100644
--- a/src/gate/GateGraphs.tsx
+++ b/src/gate/GateGraphs.tsx
@@ -28,12 +28,13 @@ import { avg } from "utils";
 import GateFlowGraph from "./GateFlowGraph";
 import { makeStyles } from "@mui/styles";
 import { cloneDeep } from "lodash";
+import GateDeltaTempGraph from "./GateDeltaTempGraph";
 
 interface Props {
   gate: Gate;
   display: "analytics" | "sensors";
   compMap: Map<string, Component>;
-  device: string | number;
+  device: number;
   pressure: string;
   ambient: string;
   tempChain: string;
@@ -297,7 +298,7 @@ export default function GateGraphs(props: Props) {
   }
 
   /**
-   * This function creates the charts for the gate page using the MAIN components on the gate, it DOES NOT show any other components that could be on the device
+   * This function creates the charts for the gate page using the MAIN components on the gate, and delta time, it DOES NOT show any other components that could be on the device
    * @returns list of cards for the charts
    */
   const sensorGraphs = () => {
@@ -309,6 +310,8 @@ export default function GateGraphs(props: Props) {
     if(pressureComp && pressureReadings){
       graphs.push(graphCard(pressureComp, pressureReadings))
     }
+    // maybe also put the delta time graph here as well
+
     //T/H chain
     let tempComp = compMap.get(tempChain)
     let tempReadings = compMeasurements.get(tempChain)
@@ -337,6 +340,7 @@ export default function GateGraphs(props: Props) {
   }
 
   const analyticGraphs = () => {
+    let tempComp = compMap.get(tempChain)
     return (
       <Box>
         <GateFlowGraph
@@ -355,6 +359,10 @@ export default function GateGraphs(props: Props) {
             setZoomed(true);
           }}
         />
+        {/* add a new chart here for the delta temp over time */}
+        {tempComp &&
+          <GateDeltaTempGraph deviceID={device} start={startDate} end={endDate} tempComponent={tempComp}/>
+        }
       </Box>
     );
   };
diff --git a/src/gate/GateList.tsx b/src/gate/GateList.tsx
index 5c7fb0c..b07c113 100644
--- a/src/gate/GateList.tsx
+++ b/src/gate/GateList.tsx
@@ -311,7 +311,7 @@ export default function GateList(props: Props) {
           <Typography>{terminalMap.get(gate.terminal()) ?? "None"}</Typography>
         </Box>
         <Box padding={2} display="flex" flexDirection="row" justifyContent="space-between">
-          <Typography>Conditioning:</Typography>
+          <Typography>Delta Temp:</Typography>
           {conditionDisplay(gate)}
         </Box>
         {/* taking these out for now because we are not sure if the customer wants them */}
diff --git a/src/pages/Gate.tsx b/src/pages/Gate.tsx
index acaf847..db876e4 100644
--- a/src/pages/Gate.tsx
+++ b/src/pages/Gate.tsx
@@ -134,7 +134,6 @@ export default function Gate(props: Props) {
     gateAPI
       .getGatePageData(id, as)
       .then(resp => {
-        console.log(resp.data);
         let p = new Map<number, pond.GateDeviceType>();
         Object.keys(resp.data.preferences).forEach(k => {
           let prefKey = parseInt(k);

From 489ac39e7347d0cc62c546b221ce4caefe80d083 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 5 Feb 2026 12:32:07 -0600
Subject: [PATCH 35/50] also putting the delta graph in the sensors section

---
 src/gate/GateGraphs.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gate/GateGraphs.tsx b/src/gate/GateGraphs.tsx
index 4f9c7fa..3ce5932 100644
--- a/src/gate/GateGraphs.tsx
+++ b/src/gate/GateGraphs.tsx
@@ -302,6 +302,7 @@ export default function GateGraphs(props: Props) {
    * @returns list of cards for the charts
    */
   const sensorGraphs = () => {
+    const tempComp = compMap.get(tempChain)
     let graphs: JSX.Element[] = []
 
     //pressure
@@ -310,10 +311,13 @@ export default function GateGraphs(props: Props) {
     if(pressureComp && pressureReadings){
       graphs.push(graphCard(pressureComp, pressureReadings))
     }
-    // maybe also put the delta time graph here as well
-
+    
+    if(tempComp){
+      graphs.push(
+        <GateDeltaTempGraph deviceID={device} start={startDate} end={endDate} tempComponent={tempComp}/>
+      )
+    }
     //T/H chain
-    let tempComp = compMap.get(tempChain)
     let tempReadings = compMeasurements.get(tempChain)
     if(tempComp && tempReadings){
       graphs.push(graphCard(tempComp, tempReadings))

From 6206a898d1d6402fc8cbb15c768eb3753aa82181 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Fri, 6 Feb 2026 12:48:15 -0600
Subject: [PATCH 36/50] fix for the bin utilization area having the graphs be
 1px by 1px

---
 src/charts/BinUtilizationChart.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/charts/BinUtilizationChart.tsx b/src/charts/BinUtilizationChart.tsx
index c205493..99122e0 100644
--- a/src/charts/BinUtilizationChart.tsx
+++ b/src/charts/BinUtilizationChart.tsx
@@ -29,7 +29,7 @@ export default function BinUtilizationChart(props: Props) {
   const theme = useTheme();
   const grainColour = customColour ? customColour : GrainColour(grain);
   return (
-    <Box height={1} width={1}>
+    <Box height={200} width={200}>
       <CardActionArea
         onClick={onClick}
         style={{ height: "100%", borderRadius: theme.shape.borderRadius }}>

From e9281b281228fa07d7939595d9f92847cf5d33b9 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Mon, 9 Feb 2026 16:51:39 -0600
Subject: [PATCH 37/50] bug with harvest plans on the map, when you look at a
 plan that has tasks, and then look at one that doesn't it was retaining the
 tasks from the previous plan and not resetting it to an ampty array

---
 src/harvestPlan/HarvestSettings.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/harvestPlan/HarvestSettings.tsx b/src/harvestPlan/HarvestSettings.tsx
index 4873146..812f7a3 100644
--- a/src/harvestPlan/HarvestSettings.tsx
+++ b/src/harvestPlan/HarvestSettings.tsx
@@ -187,7 +187,11 @@ export default function HarvestSettings(props: Props) {
   const loadTasks = useCallback(() => {
     if (planKey) {
       taskAPI.getMultiTasks([planKey], as).then(resp => {
-        setPlanTasks(resp.data.tasks.map(t => Task.any(t)));
+        if(resp.data.tasks){
+          setPlanTasks(resp.data.tasks.map(t => Task.any(t)));
+        }else{
+          setPlanTasks([])
+        }
       });
     }
   }, [taskAPI, planKey, as]);

From 43f817c8759db34badff815d7216ef2557c8eced Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 10 Feb 2026 15:59:26 -0600
Subject: [PATCH 38/50] fixing bug that would show the previous harvest plan
 when you click on a field that does not have one set without closing the
 drawer first

---
 src/maps/mapDrawers/FieldDrawer.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/maps/mapDrawers/FieldDrawer.tsx b/src/maps/mapDrawers/FieldDrawer.tsx
index 14f0da7..c54276c 100644
--- a/src/maps/mapDrawers/FieldDrawer.tsx
+++ b/src/maps/mapDrawers/FieldDrawer.tsx
@@ -134,7 +134,8 @@ export default function FieldDrawer(props: Props) {
       hPlanAPI
         .listHarvestPlans(1, 0, "desc", "createDate", field.key(), as)
         .then(resp => {
-          if (resp.data.harvestPlan.length > 0) {
+          console.log(resp)
+          if (resp.data.harvestPlan) {
             let plan = resp.data.harvestPlan[0];
             setHPlan(HarvestPlan.any(plan));
           } else {

From 85568e6ce5c9a7e3a70b1d10c59c3767557fc931 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 10 Feb 2026 15:59:46 -0600
Subject: [PATCH 39/50] remove console log

---
 src/maps/mapDrawers/FieldDrawer.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/maps/mapDrawers/FieldDrawer.tsx b/src/maps/mapDrawers/FieldDrawer.tsx
index c54276c..724cf5d 100644
--- a/src/maps/mapDrawers/FieldDrawer.tsx
+++ b/src/maps/mapDrawers/FieldDrawer.tsx
@@ -134,7 +134,6 @@ export default function FieldDrawer(props: Props) {
       hPlanAPI
         .listHarvestPlans(1, 0, "desc", "createDate", field.key(), as)
         .then(resp => {
-          console.log(resp)
           if (resp.data.harvestPlan) {
             let plan = resp.data.harvestPlan[0];
             setHPlan(HarvestPlan.any(plan));

From af90e8893c5b72c14f63f11422effc3bdacadf70 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Tue, 10 Feb 2026 16:58:20 -0600
Subject: [PATCH 40/50] fixing an issue with the break evens where if the
 bushel price or yield target were not set it would try to divide by 0 and get
 infinity, now it will just display 0 if not set

---
 src/harvestPlan/HarvestPlanDisplay.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/harvestPlan/HarvestPlanDisplay.tsx b/src/harvestPlan/HarvestPlanDisplay.tsx
index ab16547..6917332 100644
--- a/src/harvestPlan/HarvestPlanDisplay.tsx
+++ b/src/harvestPlan/HarvestPlanDisplay.tsx
@@ -58,25 +58,25 @@ export default function HarvestPlanDisplay(props: Props) {
         <Grid container direction="column">
           <Grid className={classes.dark}>
             <Box style={{ display: "flex", justifyContent: "space-between" }}>
-              <Typography variant="subtitle1">Break Even Yield:</Typography>
+              <Typography variant="subtitle1">Break Even Yield (acre):</Typography>
               <Typography variant="subtitle1">
-                {(
+                {plan.bushelPrice() !== 0 ? (
                   (plan.totalEquipmentCost() + plan.totalMaterialCost()) /
                   plan.bushelPrice()
-                ).toFixed(2)}{" "}
+                ).toFixed(2) : 0}{" "} 
                 BU
               </Typography>
             </Box>
           </Grid>
           <Grid className={classes.light}>
             <Box style={{ display: "flex", justifyContent: "space-between" }}>
-              <Typography variant="subtitle1">Break Even Sales Price</Typography>
+              <Typography variant="subtitle1">Break Even Sales Price (BU):</Typography>
               <Typography variant="subtitle1">
                 $
-                {(
+                {plan.yieldTarget() !== 0 ? (
                   (plan.totalEquipmentCost() + plan.totalMaterialCost()) /
                   plan.yieldTarget()
-                ).toFixed(2)}
+                ).toFixed(2) : 0}
               </Typography>
             </Box>
           </Grid>

From 71eacc8faa04fed929e2cd8ded31da4f3244b926 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Wed, 11 Feb 2026 12:57:16 -0600
Subject: [PATCH 41/50] changing some labeling for the task settings in harvest
 plans for the costs

---
 src/harvestPlan/HarvestSettings.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/harvestPlan/HarvestSettings.tsx b/src/harvestPlan/HarvestSettings.tsx
index 812f7a3..a33e0eb 100644
--- a/src/harvestPlan/HarvestSettings.tsx
+++ b/src/harvestPlan/HarvestSettings.tsx
@@ -714,7 +714,7 @@ export default function HarvestSettings(props: Props) {
       <TaskSettings
         task={taskToEdit}
         hasCost
-        costTitle="Material Cost(acres)"
+        costTitle="Material Cost(acre)"
         secondaryCostTitle="Equipment Cost(acre)"
         objectKey={planKey}
         type={type}

From 9966e90f7ad2d20d8e1459b092ee8388d3ff10ca Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Wed, 11 Feb 2026 14:40:40 -0600
Subject: [PATCH 42/50] fixed a broken button in the accordion of the mobile
 view of the field dashboard

---
 src/field/FieldList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/field/FieldList.tsx b/src/field/FieldList.tsx
index b22e23b..b437840 100644
--- a/src/field/FieldList.tsx
+++ b/src/field/FieldList.tsx
@@ -235,7 +235,7 @@ const columns: Column<Field>[] = [
                       <Typography textAlign="center">{row.grainName()}</Typography>
                       <Typography textAlign="center">{row.acres()} Acres</Typography>
                     </Stack>
-                    <Button variant="contained" color="primary">Go</Button>
+                    <Button variant="contained" color="primary" fullWidth onClick={() => goTo(row)}>Go</Button>
                   </Grid2>
                 </Grid2>
               </AccordionDetails>

From f6e53aff1c618d1175495848570d90cbd3ef6355 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 12 Feb 2026 14:55:43 -0600
Subject: [PATCH 43/50] added some minor functionality to the field page so
 clicking a harvest plan from the table updated the overview with it, also
 fixed a bug that came up regarding that with the settings using the plan
 permissions when they should be using the permissions passed in

---
 src/field/FieldList.tsx                | 20 ++------------------
 src/harvestPlan/HarvestPlanActions.tsx |  1 +
 src/harvestPlan/HarvestPlanTable.tsx   |  6 +++++-
 src/harvestPlan/HarvestSettings.tsx    |  9 ++++++---
 src/pages/Field.tsx                    |  4 ++--
 src/tasks/TaskCard.tsx                 | 10 +++++++---
 6 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/field/FieldList.tsx b/src/field/FieldList.tsx
index b437840..f8ad8ef 100644
--- a/src/field/FieldList.tsx
+++ b/src/field/FieldList.tsx
@@ -6,26 +6,17 @@ import {
   Button,
   Grid2,
   IconButton,
-  Paper,
   Stack,
   Tab,
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableHead,
-  TableRow,
   Tabs,
   Typography
 } from "@mui/material";
 import React, { useCallback, useEffect, useState } from "react";
-import { useMobile, useSnackbar, useUserAPI } from "hooks";
+import { useMobile, useSnackbar } from "hooks";
 import { useGlobalState, useFieldAPI, useJohnDeereProxyAPI, useCNHiProxyAPI } from "providers";
 //import HarvestTable from "harvestPlan/HarvestTable";
-import { Field, fieldScope, teamScope } from "models";
+import { Field } from "models";
 import GrainDescriber from "grain/GrainDescriber";
-import { pond } from "protobuf-ts/pond";
-import HarvestSettings from "harvestPlan/HarvestSettings";
 import ResponsiveTable, { Column } from "common/ResponsiveTable";
 import FieldMinimap from "./Fieldminimap";
 import FieldActions from "./FieldActions";
@@ -36,12 +27,6 @@ import ShareAllFields from "./ShareAllFields";
 import EventBlocker from "common/EventBlocker";
 import { useNavigate } from "react-router-dom";
 
-interface TabPanelProps {
-  children?: React.ReactNode;
-  index: any;
-  value: any;
-}
-
 export default function FieldList() {
   const [{ as }] = useGlobalState();
   const isMobile = useMobile();
@@ -50,7 +35,6 @@ export default function FieldList() {
   const cnhAPI = useCNHiProxyAPI();
   const { openSnack } = useSnackbar();
   const [tabValue, setTabValue] = React.useState(0);
-  const [openHarvestSettings, setOpenHarvestSettings] = useState(false);
   // const [fieldForPlan, setFieldForPlan] = useState(Field.create());
   const [fields, setFields] = useState<Field[]>([]);
   const [total, setTotal] = useState(0)
diff --git a/src/harvestPlan/HarvestPlanActions.tsx b/src/harvestPlan/HarvestPlanActions.tsx
index f29c1e4..a3de850 100644
--- a/src/harvestPlan/HarvestPlanActions.tsx
+++ b/src/harvestPlan/HarvestPlanActions.tsx
@@ -161,6 +161,7 @@ export default function HarvestPlanActions(props: Props) {
           update={updatePlan}
           open={openState.settings}
           plan={plan.key() !== "" ? plan : undefined}
+          permissions={permissions}
           close={(refresh, updatedPlan) => {
             setOpenState({ ...openState, settings: false });
             if (refresh) {
diff --git a/src/harvestPlan/HarvestPlanTable.tsx b/src/harvestPlan/HarvestPlanTable.tsx
index a4f48c1..645b804 100644
--- a/src/harvestPlan/HarvestPlanTable.tsx
+++ b/src/harvestPlan/HarvestPlanTable.tsx
@@ -11,6 +11,7 @@ import { getThemeType } from "theme"
 
 interface Props {
   field: Field
+  planSelected: (plan: HarvestPlan) => void
 }
 
 const useStyles = makeStyles((theme: Theme) => ({
@@ -25,7 +26,7 @@ const useStyles = makeStyles((theme: Theme) => ({
 }));
 
 export default function HarvestPlanTable(props: Props){
-  const {field} = props
+  const {field, planSelected} = props
   const harvestAPI = useHarvestPlanAPI()
   const [page, setPage] = useState(0)
   const [pageSize, setPageSize] = useState(10)
@@ -114,6 +115,9 @@ export default function HarvestPlanTable(props: Props){
       title={"Harvest Plans"}
       resizeable
       page={page}
+      onRowClick={(row) => {
+        planSelected(row)
+      }}
       pageSize={pageSize}
       rows={loadedPlans}
       total={total}
diff --git a/src/harvestPlan/HarvestSettings.tsx b/src/harvestPlan/HarvestSettings.tsx
index a33e0eb..966c528 100644
--- a/src/harvestPlan/HarvestSettings.tsx
+++ b/src/harvestPlan/HarvestSettings.tsx
@@ -35,6 +35,7 @@ interface Props {
   field: Field;
   update?: boolean;
   plan?: HarvestPlan;
+  permissions?: pond.Permission[]
 }
 
 const cropOptions = [
@@ -160,7 +161,7 @@ const useStyles = makeStyles((theme: Theme) => ({
 const steps = ["Pre-Seeding", "Seeding", "Post-Seeding", "Harvest", "Fall"];
 
 export default function HarvestSettings(props: Props) {
-  const { open, plan, close, field, update } = props;
+  const { open, plan, close, field, update, permissions } = props;
   const [{as}] = useGlobalState()
   const [planKey, setPlanKey] = useState<string>();
   const [newPlan, setNewPlan] = useState(HarvestPlan.create());
@@ -184,6 +185,8 @@ export default function HarvestSettings(props: Props) {
   const { openSnack } = useSnackbar();
   const [deleteOpen, setDeleteOpen] = useState(false);
 
+
+
   const loadTasks = useCallback(() => {
     if (planKey) {
       taskAPI.getMultiTasks([planKey], as).then(resp => {
@@ -201,7 +204,7 @@ export default function HarvestSettings(props: Props) {
   }, [loadTasks]);
 
   useEffect(() => {
-    if (!plan || (plan && plan.permissions.includes(pond.Permission.PERMISSION_WRITE))) {
+    if (!plan || (permissions && permissions.includes(pond.Permission.PERMISSION_WRITE))) {
       setActiveStep(0);
     } else {
       setActiveStep(1);
@@ -415,7 +418,7 @@ export default function HarvestSettings(props: Props) {
             key={0}
             classes={{ root: classes.tab }}
             disabled={
-              !planKey || !(plan && plan.permissions.includes(pond.Permission.PERMISSION_WRITE))
+              !planKey || !(permissions && permissions.includes(pond.Permission.PERMISSION_WRITE))
             }
             label={"General"}
             aria-label={"general"}
diff --git a/src/pages/Field.tsx b/src/pages/Field.tsx
index 19472ae..15c29db 100644
--- a/src/pages/Field.tsx
+++ b/src/pages/Field.tsx
@@ -227,7 +227,7 @@ export default function FieldPage() {
           </Grid2>
           <Grid2 size={8}>
             <Card raised>
-              <HarvestPlanTable field={field}/>
+              <HarvestPlanTable field={field} planSelected={(plan) => {setHPlan(plan)}}/>
             </Card>
           </Grid2>
         </Grid2>
@@ -276,7 +276,7 @@ export default function FieldPage() {
                 </Card>
               </Grid2>
               <Grid2>
-                <HarvestPlanTable field={field}/>
+                <HarvestPlanTable field={field} planSelected={(plan) => {setHPlan(plan)}}/>
               </Grid2>
             </Grid2>
           </TabPanel>
diff --git a/src/tasks/TaskCard.tsx b/src/tasks/TaskCard.tsx
index 6151b01..bac70e0 100644
--- a/src/tasks/TaskCard.tsx
+++ b/src/tasks/TaskCard.tsx
@@ -20,7 +20,7 @@ import Edit from "@mui/icons-material/Edit";
 import DeleteIcon from "@mui/icons-material/Delete";
 import { red } from "@mui/material/colors";
 import { pond } from "protobuf-ts/pond";
-import { taskScope } from "models/Scope";
+import { taskScope, teamScope } from "models/Scope";
 import EventBlocker from "common/EventBlocker";
 
 interface Props {
@@ -58,19 +58,22 @@ export default function TaskCard(props: Props) {
   const [day, setDay] = useState(0);
   const classes = useStyles();
   const [permissions, setPermissions] = useState<pond.Permission[]>([]);
-  const [{ user }] = useGlobalState();
+  const [{ user, as }] = useGlobalState();
   const userAPI = useUserAPI();
   const [menuAnchorEl, setMenuAnchorEl] = useState<Element | null>(null);
 
   const loadPermissions = useCallback(() => {
     let scope = taskScope(props.task.key);
+    if(as){//if viewing as a team use the permissions to the team, and not the task itself
+      scope = teamScope(as)
+    }
     userAPI
       .getUser(user.id(), scope)
       .then(resp => {
         setPermissions(resp.permissions);
       })
       .catch(err => {});
-  }, [props.task, userAPI, user]);
+  }, [props.task, userAPI, user, as]);
 
   useEffect(() => {
     loadPermissions();
@@ -176,3 +179,4 @@ export default function TaskCard(props: Props) {
     </Card>
   );
 }
+

From 73a4d6afea4288a5f652cfe7f5882cab5c3d13d4 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 12 Feb 2026 14:59:40 -0600
Subject: [PATCH 44/50] fixing airflow component measurement types

---
 src/pbHelpers/ComponentTypes/Airflow.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pbHelpers/ComponentTypes/Airflow.ts b/src/pbHelpers/ComponentTypes/Airflow.ts
index b441256..ddfbc48 100644
--- a/src/pbHelpers/ComponentTypes/Airflow.ts
+++ b/src/pbHelpers/ComponentTypes/Airflow.ts
@@ -33,13 +33,13 @@ export function Airflow(subtype: number = 0): ComponentTypeExtension {
 
   let measurementTypes = [
       {
-        measurementType: quack.MeasurementType.MEASUREMENT_TYPE_PPM,
+        measurementType: quack.MeasurementType.MEASUREMENT_TYPE_CFM,
         label: cfm.label(),
         colour: cfm.colour(),
         graphType: cfm.graph()
       } as ComponentMeasurement,
       {
-        measurementType: quack.MeasurementType.MEASUREMENT_TYPE_VOLTAGE,
+        measurementType: quack.MeasurementType.MEASUREMENT_TYPE_SPEED,
         label: velocity.label(),
         colour: velocity.colour(),
         graphType: velocity.graph()

From e41670be8f319af19470783a204706a5520b377f Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 12 Feb 2026 15:02:43 -0600
Subject: [PATCH 45/50] added comment in the measurement describer

---
 src/pbHelpers/MeasurementDescriber.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pbHelpers/MeasurementDescriber.ts b/src/pbHelpers/MeasurementDescriber.ts
index 790b9a9..67a5b38 100644
--- a/src/pbHelpers/MeasurementDescriber.ts
+++ b/src/pbHelpers/MeasurementDescriber.ts
@@ -453,7 +453,7 @@ export class MeasurementDescriber {
       case quack.MeasurementType.MEASUREMENT_TYPE_SPEED:
         let speedUnit = getDistanceUnit()
         this.details.label = "Speed";
-        this.details.unit = speedUnit === pond.DistanceUnit.DISTANCE_UNIT_METERS ? "m/s" : "ft/m";
+        this.details.unit = speedUnit === pond.DistanceUnit.DISTANCE_UNIT_METERS ? "m/s" : "ft/m"; //yes this is meters per second and feet per minute
         this.details.colour = green["500"];
         this.details.path = "edgeTriggered.rises";
         this.details.max = 500;

From b5f6139bc0aa730bbbd4e9d6084184db953eb4c9 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 12 Feb 2026 15:43:29 -0600
Subject: [PATCH 46/50] added place to set the actual yield for harvest plans
 at their completion

---
 src/harvestPlan/HarvestSettings.tsx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/harvestPlan/HarvestSettings.tsx b/src/harvestPlan/HarvestSettings.tsx
index 966c528..ca5802e 100644
--- a/src/harvestPlan/HarvestSettings.tsx
+++ b/src/harvestPlan/HarvestSettings.tsx
@@ -178,6 +178,7 @@ export default function HarvestSettings(props: Props) {
   const [variety, setVariety] = useState("");
   const [harvestYear, setHarvestYear] = useState(new Date().getFullYear());
   const [targetYield, setTargetYield] = useState(0);
+  const [actualYield, setActualYield] = useState(0);
   const [price, setPrice] = useState("");
   const [newTaskDialog, setNewTaskDialog] = useState(false);
   const [type, setType] = useState("");
@@ -365,6 +366,7 @@ export default function HarvestSettings(props: Props) {
     tempPlan.settings.grainType = variety;
     tempPlan.settings.harvestYear = harvestYear;
     tempPlan.settings.yieldTarget = targetYield;
+    tempPlan.settings.actualYield = 
     tempPlan.settings.bushelPrice = !isNaN(parseFloat(price))
       ? Math.round(parseFloat(price) * 100) / 100
       : 0;
@@ -501,6 +503,16 @@ export default function HarvestSettings(props: Props) {
             !isNaN(+e.target.value) && setTargetYield(+e.target.value);
           }}
         />
+        <TextField
+          fullWidth
+          margin="normal"
+          type="number"
+          label="Actual Yield per acre"
+          value={actualYield}
+          onChange={e => {
+            !isNaN(+e.target.value) && setActualYield(+e.target.value);
+          }}
+        />
         <TextField
           margin="dense"
           id="bushPrice"

From 1487c78466521e866d83a59797e1dab221523301 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 12 Feb 2026 16:16:53 -0600
Subject: [PATCH 47/50] fixed bug where the linear progress never went away
 because the loading boolean was never being reset when no contracts were
 loaded, also added to the note in the contracts that the names of custom
 types have to match

---
 src/contract/contractSettings.tsx |  2 +-
 src/pages/Contracts.tsx           | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/contract/contractSettings.tsx b/src/contract/contractSettings.tsx
index d52fb15..097c9d5 100644
--- a/src/contract/contractSettings.tsx
+++ b/src/contract/contractSettings.tsx
@@ -402,7 +402,7 @@ export default function ContractSettings(props: Props) {
               borderRadius: 5,
               margin: 20
             }}>
-            Note: When delivering grain on contract from a field or a bin the Grain Types must match
+            Note: When delivering grain on contract from a field or a bin the Grain Types must match, if it is a custom type the names must match.
           </Typography>
         </Box>
         <Grid
diff --git a/src/pages/Contracts.tsx b/src/pages/Contracts.tsx
index bd42f72..e93850b 100644
--- a/src/pages/Contracts.tsx
+++ b/src/pages/Contracts.tsx
@@ -40,16 +40,18 @@ export default function Contracts() {
         .then(resp => {
           let contracts: Contract[] = [];
           let contractPermissions: Map<string, pond.Permission[]> = new Map();
-          resp.data.contracts.forEach(contract => {
-            let c = Contract.create(contract);
-            contracts.push(c);
-            let p = pond.EvaluatePermissionsResponse.fromObject(
-              resp.data.contractPermissions[c.key()]
-            );
-            contractPermissions.set(c.key(), p.permissions);
-          });
-          setContracts(contracts);
-          setContractPermissions(contractPermissions);
+          if (resp.data.contracts){
+            resp.data.contracts.forEach(contract => {
+              let c = Contract.create(contract);
+              contracts.push(c);
+              let p = pond.EvaluatePermissionsResponse.fromObject(
+                resp.data.contractPermissions[c.key()]
+              );
+              contractPermissions.set(c.key(), p.permissions);
+            });
+            setContracts(contracts);
+            setContractPermissions(contractPermissions);
+          }
           setLoading(false);
         })
         .catch(err => {});

From 762a630659aaa6691889d49a9ce33259c779fd6f Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Fri, 13 Feb 2026 12:51:26 -0600
Subject: [PATCH 48/50] some permission changes the team permission in the
 global state was coming back empty, so am now retrieving the team permissions
 for file uploads in grain transacitons, also adjusted the bin visualizer to
 disable the slider and inventory button when they do not have write
 permissions so they cant even open the transaction window, this should help
 prevent a case in the possible future where we allow bin transactions to have
 uploadable files from having a bin shared to them and uploading a file but
 not being able to create the transaction that it would be linked to thus
 causing the file to be uploaded to digital ocean, but not connected in our
 backend to anything

---
 src/bin/BinVisualizerV2.tsx             |  7 +++++--
 src/common/FileUploads/FileSelector.tsx | 11 ++++++-----
 src/common/FileUploads/FileUploader.tsx |  5 ++++-
 src/grain/GrainTransaction.tsx          | 23 ++++++++++++++++++++---
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/bin/BinVisualizerV2.tsx b/src/bin/BinVisualizerV2.tsx
index d91f698..9997927 100644
--- a/src/bin/BinVisualizerV2.tsx
+++ b/src/bin/BinVisualizerV2.tsx
@@ -1434,6 +1434,7 @@ export default function BinVisualizer(props: Props) {
 
   const controls = () => {
     if (bin.settings.inventory?.empty === true) return null;
+    const canEdit = permissions ? permissions.includes(pond.Permission.PERMISSION_WRITE) : false;
     return (
       <Box
         height={1}
@@ -1447,12 +1448,13 @@ export default function BinVisualizer(props: Props) {
           <React.Fragment>
             <Box display="flex" height={isMobile ? 35 : 40} marginBottom={1}>
               <IconButton
+                disabled={!canEdit}
                 onClick={() => {
                   setGrainUpdate(true);
                 }}
                 style={{
                   margin: "auto",
-                  backgroundColor: "gold",
+                  backgroundColor: canEdit ? "gold" : "grey",
                   color: "black",
                   height: "100%",
                   width: isMobile ? 35 : 40
@@ -1468,6 +1470,7 @@ export default function BinVisualizer(props: Props) {
               alignContent="flex-end">
               {fillPercentage !== null && (
                 <Slider
+                  disabled={!canEdit}
                   orientation="vertical"
                   value={fillPercentage}
                   classes={{
@@ -1477,7 +1480,7 @@ export default function BinVisualizer(props: Props) {
                   //   thumb: isMobile ? classes.mobileSliderThumb : classes.sliderThumb,
                     valueLabel: classes.sliderValLabel,
                   }}
-                  style={{ height: "100%", color: sliderColour }}
+                  style={{ height: "100%", color: canEdit ? sliderColour : "gray" }}
                   min={0}
                   max={100}
                   valueLabelDisplay="auto"
diff --git a/src/common/FileUploads/FileSelector.tsx b/src/common/FileUploads/FileSelector.tsx
index b97326b..da39047 100644
--- a/src/common/FileUploads/FileSelector.tsx
+++ b/src/common/FileUploads/FileSelector.tsx
@@ -9,7 +9,7 @@ import {
   Typography
 } from "@mui/material";
 import { useFileControllerAPI, useGlobalState } from "providers";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import ErrorIcon from "@mui/icons-material/Error";
 import CheckCircleOutlineIcon from "@mui/icons-material/CheckCircleOutline";
 import { getThemeType } from "theme";
@@ -25,6 +25,7 @@ interface Props {
   uniqueID?: string;
   keys?: string[];
   types?: string[];
+  hasFilePermission: boolean;
 }
 
 const useStyles = makeStyles((theme: Theme) => {
@@ -53,8 +54,8 @@ const useStyles = makeStyles((theme: Theme) => {
 });
 
 export default function FileSelector(props: Props) {
-  const { uploadEnd, uploadStart, uniqueID, toAttach, keys, types } = props;
-  const [{ userTeamPermissions }] = useGlobalState();
+  const { uploadEnd, uploadStart, uniqueID, toAttach, keys, types, hasFilePermission } = props;
+  // const [{ userTeamPermissions }] = useGlobalState();
   const [fileList, setFileList] = useState<FileList | undefined>();
   const classes = useStyles();
   const fileAPI = useFileControllerAPI();
@@ -142,7 +143,7 @@ export default function FileSelector(props: Props) {
             disabled={
               uploading ||
               (!uploadFailed && fileID !== "") ||
-              !userTeamPermissions.includes(pond.Permission.PERMISSION_FILE_MANAGEMENT)
+              !hasFilePermission
             }
             multiple={false}
             name={uniqueID || "fileInput"}
@@ -163,7 +164,7 @@ export default function FileSelector(props: Props) {
           <label
             htmlFor={uniqueID || "fileInput"}
             className={
-              userTeamPermissions.includes(pond.Permission.PERMISSION_FILE_MANAGEMENT)
+              hasFilePermission
                 ? classes.fileSelect
                 : classes.fileDisabled
             }>
diff --git a/src/common/FileUploads/FileUploader.tsx b/src/common/FileUploads/FileUploader.tsx
index c55c1cf..f803114 100644
--- a/src/common/FileUploads/FileUploader.tsx
+++ b/src/common/FileUploads/FileUploader.tsx
@@ -10,19 +10,22 @@ interface Props {
   uploadEnd: (fileID?: string, fileName?: string) => void;
   keys?: string[];
   types?: string[];
+  hasFilePermission: boolean
 }
 
 export default function FileUploader(props: Props) {
-  const { uploadStart, uploadEnd, startingSelectorCount, toAttach, keys, types } = props;
+  const { uploadStart, uploadEnd, startingSelectorCount, toAttach, keys, types, hasFilePermission } = props;
   const [numSelectors, setNumSelectors] = useState(startingSelectorCount || 1);
   const [selectors, setSelectors] = useState<JSX.Element[]>([]);
 
+
   useEffect(() => {
     let currentSelectors: JSX.Element[] = [];
     for (let i = 0; i < numSelectors; i++) {
       currentSelectors.push(
         <Box key={i} margin={2}>
           <FileSelector
+            hasFilePermission={hasFilePermission}
             toAttach={toAttach}
             keys={keys}
             types={types}
diff --git a/src/grain/GrainTransaction.tsx b/src/grain/GrainTransaction.tsx
index 66fd329..8bef939 100644
--- a/src/grain/GrainTransaction.tsx
+++ b/src/grain/GrainTransaction.tsx
@@ -14,8 +14,8 @@ import {
 import FileUploader from "common/FileUploads/FileUploader";
 import ResponsiveDialog from "common/ResponsiveDialog";
 import SearchSelect, { Option } from "common/SearchSelect";
-import { useMobile } from "hooks";
-import { Bin, Field, Contract, GrainBag } from "models";
+import { useMobile, useUserAPI } from "hooks";
+import { Bin, Field, Contract, GrainBag, teamScope } from "models";
 // import { Contract } from "models/Contract";
 // import { GrainBag } from "models/GrainBag";
 import moment from "moment";
@@ -66,7 +66,7 @@ export default function GrainTransaction(props: Props) {
   const binAPI = useBinAPI();
   const grainBagAPI = useGrainBagAPI();
   const fieldAPI = useFieldAPI();
-  const [{ as }] = useGlobalState();
+  const [{ as, user }] = useGlobalState();
   const { openSnack } = useSnackbar();
   const [grainChangeDialog, setGrainChangeDialog] = useState(false);
   const [grainEntry, setGrainEntry] = useState("0");
@@ -79,6 +79,8 @@ export default function GrainTransaction(props: Props) {
   const [fieldsLoading, setFieldsLoading] = useState(false);
   const [uploadingFile, setUploadingFile] = useState(false);
   const [imageIDs, setImageIDs] = useState<string[]>([]);
+  const userAPI = useUserAPI();
+  const [filePermission, setFilePermission] = useState(false);
 
   const closeDialogs = (confirmed: boolean, newTransaction?: pond.Transaction) => {
     close();
@@ -91,6 +93,20 @@ export default function GrainTransaction(props: Props) {
     }
   };
 
+  useEffect(()=>{
+    //if they are viewing as a team make sure they have file permission to the team for the transactions
+    if(as){
+      let scope = teamScope(as)
+      userAPI.getUser(user.id(), scope).then(resp => {
+        setFilePermission(resp.permissions.includes(pond.Permission.PERMISSION_FILE_MANAGEMENT))
+      });
+    }else{
+      //if they are not viewing as a team and they were able to open this window, they have edit permission to at least the one object they started the change with
+      //a transaction is a new object that permissions will not exist for yet so just allow them to do it
+      setFilePermission(true)
+    }
+  },[as])
+
   //get the possible destinations/options (grainbags and bins)
   useEffect(() => {
     if (open) {
@@ -527,6 +543,7 @@ export default function GrainTransaction(props: Props) {
         <Box marginTop={1}>
           {allowAttachmentUploads && (
             <FileUploader
+              hasFilePermission={filePermission}
               uploadEnd={fileID => {
                 if (fileID) {
                   let ids = imageIDs;

From eef15ce93b0d505d16c2802920c8cd68ecab335f Mon Sep 17 00:00:00 2001
From: Carter <carter@adaptiveagriculture.ca>
Date: Mon, 23 Feb 2026 13:38:36 -0600
Subject: [PATCH 49/50] making the crisp chatbox button sit above the bottom
 navigator when in mobile

---
 src/app/UserWrapper.tsx | 54 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/app/UserWrapper.tsx b/src/app/UserWrapper.tsx
index 9ead445..bf07306 100644
--- a/src/app/UserWrapper.tsx
+++ b/src/app/UserWrapper.tsx
@@ -13,7 +13,7 @@ import { CssBaseline, Theme } from '@mui/material'
 import { AppThemeProvider } from 'theme/AppThemeProvider'
 import HTTPProvider from 'providers/http'
 import { Crisp } from "crisp-sdk-web";
-import { useSnackbar } from 'hooks'
+import { useMobile, useSnackbar } from 'hooks'
 // import FirmwareLoader from './FirmwareLoader'
 
 const reducer = (state: GlobalState, action: GlobalStateAction): GlobalState => {
@@ -67,6 +67,7 @@ export default function UserWrapper(props: Props) {
   const hasFetched = useRef(false);
   const [global, setGlobal] = useState<undefined | GlobalState>(undefined)
   const snackbar = useSnackbar()
+  const isMobile = useMobile()
 
   const user_id = or(useAuth.user?.sub, "")
 
@@ -128,6 +129,57 @@ export default function UserWrapper(props: Props) {
       Crisp.setTokenId(global?.user.id()); // e.g., your DB user ID
     }
   }, [global]);
+
+  // useEffect(() => {
+  //   if (window.$crisp) {
+  //     if (isMobile) {
+  //       $crisp.push(["config", "position:offset", [20, 120]]);
+  //     } else {
+  //       $crisp.push(["config", "position:offset", [20, 20]]);
+  //     }
+  //   }
+  // }, [isMobile]);
+
+  // useEffect(() => {
+  //   console.log("crisb")
+  //   const crispEl = document.getElementById("crisp-chatbox");
+  //   console.log(crispEl)
+  //   if (crispEl) {
+  //     if (isMobile) {
+  //       console.log("setting margin")
+  //       crispEl.style.setProperty("margin-bottom", "180px", "important");
+  //     } else {
+  //       crispEl.style.setProperty("margin-bottom", "0px", "important");
+  //     }
+  //   }
+  // }, [isMobile]);
+
+  useEffect(() => {
+    let style = document.getElementById("crisp-offset-override");
+    if (!style) {
+      style = document.createElement("style");
+      style.id = "crisp-offset-override";
+      document.head.appendChild(style);
+    }
+
+    console.log(isMobile)
+
+    if (isMobile) {
+      console.log("isMobile")
+      style.textContent = `
+        #crisp-chatbox [aria-label="Open chat"] {
+          bottom: 6em !important;
+        }
+        // #crisp-chatbox [data-visible][style*="width: 360px"] {
+        //   bottom: 180px !important;
+        // }
+      `;
+    } else {
+      style.textContent = "";
+    }
+
+    return () => style?.remove();
+  }, [isMobile]);
   
   useEffect(() => {
     if (loading) return;

From 98d87ed8f75b23875031946916ad894d24fe9026 Mon Sep 17 00:00:00 2001
From: Carter <carter@adaptiveagriculture.ca>
Date: Tue, 24 Feb 2026 12:58:35 -0600
Subject: [PATCH 50/50] added column on the left side of the chat drawer for
 team icons

---
 src/app/UserWrapper.tsx |   3 --
 src/chat/ChatDrawer.tsx | 112 ++++++++++++++++++++++++++--------------
 2 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/src/app/UserWrapper.tsx b/src/app/UserWrapper.tsx
index bf07306..e69ea85 100644
--- a/src/app/UserWrapper.tsx
+++ b/src/app/UserWrapper.tsx
@@ -162,10 +162,7 @@ export default function UserWrapper(props: Props) {
       document.head.appendChild(style);
     }
 
-    console.log(isMobile)
-
     if (isMobile) {
-      console.log("isMobile")
       style.textContent = `
         #crisp-chatbox [aria-label="Open chat"] {
           bottom: 6em !important;
diff --git a/src/chat/ChatDrawer.tsx b/src/chat/ChatDrawer.tsx
index 51f7c2c..1c2c9e9 100644
--- a/src/chat/ChatDrawer.tsx
+++ b/src/chat/ChatDrawer.tsx
@@ -1,41 +1,39 @@
 import { ChevronRight } from "@mui/icons-material";
-import { Box, Drawer, IconButton, Theme, Typography } from "@mui/material";
+import { Avatar, Box, Drawer, IconButton, Theme, Typography } from "@mui/material";
 import { makeStyles } from "@mui/styles";
 import { useMobile } from "hooks";
 import { Team } from "models";
 import Chat from "./Chat";
 import { pond } from "protobuf-ts/pond";
 
-const useStyles = makeStyles((theme: Theme) => {
-  return ({
-    chatDrawer: {
-      display: "flex",
-      flexDirection: "column", // Arrange children vertically
-      backgroundColor: theme.palette.background.default,
-      height: "100%",
-      maxHeight: "100%",
-      minHeight: "100%",
-      minWidth: theme.spacing(54),
-      maxWidth: theme.spacing(54),
-    },
-    chatContainer: {
-      flex: 1, 
-      overflow: "hidden", 
-    },
-    chatDrawerMobile: {
-      backgroundColor: theme.palette.background.default,
-      height: "auto",
-      width: "100%"
-    },
-    drawerHeader: {
-      display: "flex",
-      alignItems: "center",
-      padding: theme.spacing(1),
-      ...theme.mixins.toolbar,
-      justifyContent: "flex-start"
-    }
-  });
-});
+const useStyles = makeStyles<Theme>((theme: Theme) => ({
+  chatDrawer: {
+    display: "flex",
+    flexDirection: "column",
+    backgroundColor: theme.palette.background.default,
+    height: "100%",
+    maxHeight: "100%",
+    minHeight: "100%",
+    minWidth: theme.spacing(54),
+    maxWidth: theme.spacing(54),
+  },
+  chatContainer: {
+    flex: 1,
+    overflow: "hidden",
+  },
+  chatDrawerMobile: {
+    backgroundColor: theme.palette.background.default,
+    height: "auto",
+    width: "100%",
+  },
+  drawerHeader: {
+    display: "flex",
+    alignItems: "center",
+    padding: theme.spacing(1),
+    ...theme.mixins.toolbar,
+    justifyContent: "flex-start",
+  },
+}));
 
 interface Props {
   open: boolean;
@@ -48,17 +46,53 @@ export function ChatDrawer(props: Props) {
   const isMobile = useMobile();
   const classes = useStyles()
 
+  console.log(team.settings.avatar)
+
   return (
-    <Drawer open={open} onClose={onClose} anchor="right" >
-      <Box className={isMobile ? classes.chatDrawerMobile : classes.chatDrawer}>
-        <Box className={classes.drawerHeader}>
-          <IconButton onClick={onClose}>
-            <ChevronRight />
+    <Drawer
+      open={open}
+      onClose={onClose}
+      anchor="right"
+      slotProps={{
+        paper: {
+          sx: isMobile ? { width: "100%" } : undefined,
+        },
+      }}
+    >
+      <Box display="flex" flexDirection="row" height="100%">
+        {/* Side icon column */}
+        <Box
+          display="flex"
+          flexDirection="column"
+          alignItems="center"
+          padding={1}
+          gap={1}
+          sx={(theme: Theme) => ({
+            backgroundColor: theme.palette.background.paper,
+            borderRight: `1px solid ${theme.palette.divider}`,
+          })}
+        >
+          {/* Add your icons here */}
+          <IconButton >
+            {/* <SomeIcon /> */}
+            <Avatar src={team.settings.avatar} />
+          </IconButton>
+          <IconButton>
+            {/* <AnotherIcon /> */}
           </IconButton>
-          <Typography>{team.name()} Chat</Typography>
         </Box>
-        <Box className={classes.chatContainer}>
-          <Chat objectKey={team.settings.key} type={pond.NoteType.NOTE_TYPE_TEAM}/>
+
+        {/* Main chat area */}
+        <Box className={isMobile ? classes.chatDrawerMobile : classes.chatDrawer}>
+          <Box className={classes.drawerHeader}>
+            <IconButton onClick={onClose}>
+              <ChevronRight />
+            </IconButton>
+            <Typography>{team.name()} Chat</Typography>
+          </Box>
+          <Box className={classes.chatContainer}>
+            <Chat objectKey={team.settings.key} type={pond.NoteType.NOTE_TYPE_TEAM} />
+          </Box>
         </Box>
       </Box>
     </Drawer>