From c12d752ad0dc5dd96c199340e759d7f52399460b Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Sat, 16 Dec 2023 19:44:25 +0300
Subject: [PATCH] session-context-fix

---
 src/context/session.tsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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<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)
+      }
     }
   }