Skip to content

Commit 4d233ab

Browse files
authored
fix(store): check devices resolved before access (commaai#597)
1 parent 0b956e0 commit 4d233ab

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/pages/dashboard/store.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { accessToken } from '~/api/auth/client'
44
import { getDevice, getDevices } from '~/api/devices'
55
import { getProfile } from '~/api/profile'
66
import { getDeviceName } from '~/utils/device'
7+
import { resolved } from '~/utils/reactivity'
78

89
export const [profile] = createResource(accessToken, getProfile)
910

@@ -15,7 +16,7 @@ const [currentDevice, { refetch: _refetchCurrentDevice }] = createResource(
1516
() => {
1617
const dongleId = currentDongleId()
1718
if (!dongleId) return null
18-
return { dongleId, devices: devices.latest }
19+
return { dongleId, devices: resolved(devices) ? devices.latest : null }
1920
},
2021
({ dongleId, devices }) => {
2122
const device = devices?.find((device) => device.dongle_id === dongleId)
@@ -26,7 +27,7 @@ const [currentDevice, { refetch: _refetchCurrentDevice }] = createResource(
2627
const refetchCurrentDevice = () => {
2728
const dongleId = currentDongleId()
2829
if (!dongleId) return
29-
if (devices.latest?.some((device) => device.dongle_id === dongleId)) {
30+
if (resolved(devices) && devices.latest?.some((device) => device.dongle_id === dongleId)) {
3031
refetchDevices()
3132
return
3233
}

0 commit comments

Comments
 (0)