admin/ota-admin-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into release/0.0.3

Browse Source
This commit is contained in:
jwu-fisker
2022-10-06 08:18:59 -07:00
parent 036f3f8c48 ed57b5e023
commit cd52e40988
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/VehicleMap/popup.jsx
View File

@@ -9,8 +9,14 @@ import Typography from "@material-ui/core/Typography";
import useStyles from "../useStyles"; import useStyles from "../useStyles";
import DigitalTwin from "../DigitalTwin"; import DigitalTwin from "../DigitalTwin";
import CANSignals from "../Cars/CANSignals"; import CANSignals from "../Cars/CANSignals";
import { useUserContext } from "../Contexts/UserContext";
const VehiclePopUp = (props) => { const VehiclePopUp = (props) => {
const {
token: {
idToken: { jwtToken: token },
},
} = useUserContext();
const classes = useStyles(); const classes = useStyles();
const [viewCAN, setViewCAN] = useState(false); const [viewCAN, setViewCAN] = useState(false);
const { vin, online, onClose, onlineHMI } = props; const { vin, online, onClose, onlineHMI } = props;
@@ -46,7 +52,7 @@ const VehiclePopUp = (props) => {
<p> <p>
<b>ICC Connected</b>: {onlineHMI?.toString()} <b>ICC Connected</b>: {onlineHMI?.toString()}
</p> </p>
{viewCAN && <CANSignals vin={vin} />} {viewCAN && <CANSignals vin={vin} token={token} />}
{!viewCAN && <DigitalTwin {...props} />} {!viewCAN && <DigitalTwin {...props} />}
</div> </div>
</Dialog> </Dialog>