From 605752ae02a192b4aaa117fc2757e563f2f410ce Mon Sep 17 00:00:00 2001 From: csawatzky Date: Thu, 2 Apr 2026 12:04:53 -0600 Subject: [PATCH] adjustments to navigation to use its own boolean rather than piggyback off adaptive ag --- src/navigation/BottomNavigator.tsx | 15 ++++++++------- src/navigation/SideNavigator.tsx | 17 +++++++++-------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/navigation/BottomNavigator.tsx b/src/navigation/BottomNavigator.tsx index b03a153..6395bd4 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, IsMiPCA } from "services/whiteLabel"; +import { IsAdaptiveAgriculture, isBXT, IsMiVent, IsAdCon, IsOmniAir, IsMiPCA, IsIntellifarms } from "services/whiteLabel"; import FieldsIcon from "products/AgIcons/FieldsIcon"; import NexusSTIcon from "products/Construction/NexusSTIcon"; import OmniAirDeviceIcon from "products/AviationIcons/OmniAirDeviceIcon"; @@ -36,7 +36,8 @@ export default function BottomNavigator(props: Props) { const { isAuthenticated } = useAuth0(); const [{ user }] = useGlobalState(); const [route, setRoute] = useState(sideIsOpen ? "side" : ""); - const isAdaptive = IsAdaptiveAgriculture(); + const isAg = IsAdaptiveAgriculture(); + const isIntel = IsIntellifarms(); const isMiVent = IsMiVent(); const isAdCon = IsAdCon(); const isOmni = IsOmniAir(); @@ -45,7 +46,7 @@ export default function BottomNavigator(props: Props) { const reRoute = useCallback( (path: string) => { if (path === "") { - if (isAdaptive) { + if (isAg || isIntel) { return "bins"; } if (isMiVent) { @@ -74,7 +75,7 @@ export default function BottomNavigator(props: Props) { } return path; }, - [isAdaptive, isMiVent] + [isAg, isMiVent, isIntel] ); const autoDetectRoute = useCallback(() => { @@ -105,10 +106,10 @@ export default function BottomNavigator(props: Props) { const authenticatedNavigation = () => { return ( handleRouteChange(newValue)}> - {isAdaptive && ( + {isAg || isIntel && ( } value="visualFarm" /> )} - {isAdaptive && ( + {isAg || isIntel && ( } value="bins" /> )} {isAdCon && ( @@ -136,7 +137,7 @@ export default function BottomNavigator(props: Props) { ) : isAdCon ? ( diff --git a/src/navigation/SideNavigator.tsx b/src/navigation/SideNavigator.tsx index efc3635..815f30b 100644 --- a/src/navigation/SideNavigator.tsx +++ b/src/navigation/SideNavigator.tsx @@ -166,14 +166,15 @@ export default function SideNavigator(props: Props) { const authenticatedSideMenu = () => { const isMiVent = IsMiVent(); - const isAg = IsAdaptiveAgriculture() || IsIntellifarms() + const isAg = IsAdaptiveAgriculture() + const isIntel = IsIntellifarms() const isStreamline = IsStreamline() const isOmni = IsOmniAir() const isMiPCA = IsMiPCA() const isAdCon = IsAdCon() return ( - {(isAg || isStreamline || user.hasFeature("admin")) && ( + {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && ( )} - {(isAg || isStreamline || user.hasFeature("admin")) && ( + {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && ( )} - {(isAg || isStreamline || user.hasFeature("admin")) && ( + {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && ( } - {(isAg || isStreamline || user.hasFeature("admin")) && ( + {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && ( } - {(isAg || isStreamline || user.hasFeature("admin")) && ( + {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && ( )} - {(isAg || isStreamline || user.hasFeature("admin")) && ( + {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && ( } - {(isAg || isStreamline || user.hasFeature("admin")) && + {(isAg || isIntel || isStreamline || user.hasFeature("admin")) &&