Browse Source

Fix mqtt diabled indicator

pull/21/head
Sacha Weatherstone 5 years ago
parent
commit
9e07e39ba5
  1. 20
      src/components/menu/BottomNav.tsx

20
src/components/menu/BottomNav.tsx

@ -32,6 +32,7 @@ import { Tooltip } from '../generic/Tooltip';
// } // }
export const BottomNav = (): JSX.Element => { export const BottomNav = (): JSX.Element => {
const [showVersionInfo, setShowVersionInfo] = React.useState(false);
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
const meshtasticState = useAppSelector((state) => state.meshtastic); const meshtasticState = useAppSelector((state) => state.meshtastic);
const appState = useAppSelector((state) => state.app); const appState = useAppSelector((state) => state.app);
@ -81,11 +82,14 @@ export const BottomNav = (): JSX.Element => {
<Tooltip contents={`MQTT Status`}> <Tooltip contents={`MQTT Status`}>
<div className="flex p-1 border-r border-gray-300 cursor-pointer select-none group dark:border-gray-600 dark:text-white hover:bg-gray-200 dark:hover:bg-primaryDark"> <div className="flex p-1 border-r border-gray-300 cursor-pointer select-none group dark:border-gray-600 dark:text-white hover:bg-gray-200 dark:hover:bg-primaryDark">
{primaryChannelSettings?.uplinkEnabled && {primaryChannelSettings?.uplinkEnabled &&
primaryChannelSettings?.downlinkEnabled ? ( primaryChannelSettings?.downlinkEnabled &&
!meshtasticState.radio.preferences.mqttDisabled ? (
<RiArrowUpDownLine className="p-0.5 group-active:scale-90" /> <RiArrowUpDownLine className="p-0.5 group-active:scale-90" />
) : primaryChannelSettings?.uplinkEnabled ? ( ) : primaryChannelSettings?.uplinkEnabled &&
!meshtasticState.radio.preferences.mqttDisabled ? (
<RiArrowUpLine className="p-0.5 group-active:scale-90" /> <RiArrowUpLine className="p-0.5 group-active:scale-90" />
) : primaryChannelSettings?.downlinkEnabled ? ( ) : primaryChannelSettings?.downlinkEnabled &&
!meshtasticState.radio.preferences.mqttDisabled ? (
<RiArrowDownLine className="p-0.5 group-active:scale-90" /> <RiArrowDownLine className="p-0.5 group-active:scale-90" />
) : ( ) : (
<FiX className="p-0.5" /> <FiX className="p-0.5" />
@ -96,15 +100,15 @@ export const BottomNav = (): JSX.Element => {
<div className="flex"> <div className="flex">
<Tooltip contents={`Current Commit`}> <Tooltip contents={`Current Commit`}>
<a <div
href={`https://github.com/meshtastic/meshtastic-web/commit/${process.env.COMMIT_HASH}`} onClick={(): void => {
target="_blank" setShowVersionInfo(true);
rel="noreferrer" }}
className="flex p-1 border-l border-gray-300 cursor-pointer select-none group dark:border-gray-600 dark:text-white hover:bg-gray-200 dark:hover:bg-primaryDark" className="flex p-1 border-l border-gray-300 cursor-pointer select-none group dark:border-gray-600 dark:text-white hover:bg-gray-200 dark:hover:bg-primaryDark"
> >
<FiGitBranch className="p-0.5 mr-1 group-active:scale-90" /> <FiGitBranch className="p-0.5 mr-1 group-active:scale-90" />
<p className="text-xs opacity-60">{process.env.COMMIT_HASH}</p> <p className="text-xs opacity-60">{process.env.COMMIT_HASH}</p>
</a> </div>
</Tooltip> </Tooltip>
<Tooltip contents={`Notifications`}> <Tooltip contents={`Notifications`}>
<div className="flex p-1 border-l border-gray-300 cursor-pointer select-none group dark:border-gray-600 dark:text-white hover:bg-gray-200 dark:hover:bg-primaryDark"> <div className="flex p-1 border-l border-gray-300 cursor-pointer select-none group dark:border-gray-600 dark:text-white hover:bg-gray-200 dark:hover:bg-primaryDark">

Loading…
Cancel
Save