diff --git a/src/context/session.tsx b/src/context/session.tsx index bb7a9235..da3e07bb 100644 --- a/src/context/session.tsx +++ b/src/context/session.tsx @@ -112,7 +112,7 @@ export const SessionProvider = (props: { initialValue: null, }) - const user = createMemo(() => session().user) + const user = createMemo(() => session()?.user) createEffect(() => { // detect confirm redirect @@ -130,11 +130,13 @@ export const SessionProvider = (props: { }) const loadSubscriptions = async (): Promise => { - const result = await apiClient.private?.getMySubscriptions() - if (result) { - setSubscriptions(result) - } else { - setSubscriptions(EMPTY_SUBSCRIPTIONS) + if (apiClient.private) { + const result = await apiClient.getMySubscriptions() + if (result) { + setSubscriptions(result) + } else { + setSubscriptions(EMPTY_SUBSCRIPTIONS) + } } }