session-context-fix

2023-12-16 19:44:25 +03:00 · 2023-12-16 19:44:25 +03:00 · c12d752ad0
commit c12d752ad0
parent 2b6738d35b
1 changed files with 8 additions and 6 deletions
--- 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<void> => {
-    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)
+      }
    }
  }