Skip to content
This repository has been archived by the owner on Dec 21, 2023. It is now read-only.

fix: sign in popup doesn't close #2541

Merged
merged 1 commit into from
Nov 20, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions packages/app/hooks/use-user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import { useContext, useEffect } from "react";
import { useRouter } from "@showtime-xyz/universal.router";

import { UserContext } from "app/context/user-context";
import { useNavigateToOnboarding } from "app/navigation/use-navigate-to";
import {
useNavigateToLogin,
useNavigateToOnboarding,
} from "app/navigation/use-navigate-to";

type UserParams = {
redirectTo?: string;
Expand All @@ -13,9 +16,14 @@ export function useUser(params?: UserParams) {
const context = useContext(UserContext);
const router = useRouter();
const navigateToOnboarding = useNavigateToOnboarding();
const navigateToLogin = useNavigateToLogin();
useEffect(() => {
if (!context?.isAuthenticated && params?.redirectTo && router) {
router.replace(params?.redirectTo);
if (params.redirectTo === "/login") {
navigateToLogin();
} else {
router.replace(params?.redirectTo);
}
}
if (
context?.isAuthenticated &&
Expand All @@ -28,6 +36,7 @@ export function useUser(params?: UserParams) {
}, [
context?.isAuthenticated,
context?.isIncompletedProfile,
navigateToLogin,
navigateToOnboarding,
params?.redirectIfProfileIncomplete,
params?.redirectTo,
Expand Down
Loading