brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment

Browse source
This commit is contained in:
csawatzky 2025-04-09 14:49:21 -06:00
commit c184db268b
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/ResponsiveTable.tsx
View file

@ -48,9 +48,7 @@ const useStyles = makeStyles((theme: Theme) => {
marginBottom: theme.spacing(1.5), marginBottom: theme.spacing(1.5),
}, },
card: { card: {
// padding: theme.spacing(1),
margin: theme.spacing(1), margin: theme.spacing(1),
}, },
rowHover: { rowHover: {
cursor: "pointer", cursor: "pointer",

3
src/device/DeviceActions.tsx
View file

@ -195,6 +195,7 @@ export default function DeviceActions(props: Props) {
const isWifi = device.settings.platform === pond.DevicePlatform.DEVICE_PLATFORM_PHOTON; const isWifi = device.settings.platform === pond.DevicePlatform.DEVICE_PLATFORM_PHOTON;
// const isShareLink = isShareableLink(match.params.deviceID); // const isShareLink = isShareableLink(match.params.deviceID);
const isShareLink = false const isShareLink = false
const isV2 = device.settings.platform >= pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR
return ( return (
<Menu <Menu
@ -274,7 +275,7 @@ export default function DeviceActions(props: Props) {
<ListItemText secondary="Resume Data" /> <ListItemText secondary="Resume Data" />
</MenuItem> </MenuItem>
)} )}
{isWifi && canWrite && ( {(isWifi || isV2) && canWrite && (
<MenuItem onClick={() => openDialog("isConnectionDialogOpen")} dense> <MenuItem onClick={() => openDialog("isConnectionDialogOpen")} dense>
<ListItemIcon> <ListItemIcon>
<WifiIcon /> <WifiIcon />

1
src/navigation/SideNavigator.tsx
View file

@ -62,6 +62,7 @@ const useStyles = makeStyles((theme: Theme) => ({
}) })
}, },
sideMenuOnClosed: { sideMenuOnClosed: {
pointerEvents: "none",
transition: theme.transitions.create(["width", "z-index", "opacity"], { transition: theme.transitions.create(["width", "z-index", "opacity"], {
easing: theme.transitions.easing.sharp, easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen duration: theme.transitions.duration.leavingScreen