Fix infinite loop on studio (#4617)

Joystream · Aug 10, 2023 · 4f6aceb · 4f6aceb
1 parent d5a03e7
commit 4f6aceb
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/packages/atlas/src/providers/user/user.provider.tsx b/packages/atlas/src/providers/user/user.provider.tsx
@@ -30,6 +30,15 @@ export const UserProvider: FC<PropsWithChildren> = ({ children }) => {
       },
     },
     {
+      onCompleted: (data) => {
+        const activeMembership =
+          (currentUser?.membershipId &&
+            data.memberships?.find((membership) => membership.id === currentUser?.membershipId)) ||
+          null
+        if (activeMembership) {
+          setChannelId(activeMembership.channels[0].id)
+        }
+      },
       skip: !currentUser,
       onError: (error) =>
         SentryLogger.error('Failed to fetch user memberships', 'UserProvider', error, { user: currentUser ?? {} }),
@@ -69,10 +78,6 @@ export const UserProvider: FC<PropsWithChildren> = ({ children }) => {
       ? activeMembership?.channels.find((channel) => channel.id === channelId)
       : activeMembership?.channels[0]) || null
 
-  useEffect(() => {
-    if (!channelId) setChannelId(activeMembership?.channels[0]?.id ?? null)
-  }, [activeMembership?.channels, channelId])
-
   const contextValue: UserContextValue = useMemo(
     () => ({
       memberships: memberships || [],