Fix checkbox issues (#681)

* Fix checkbox issues

* Fix theme
This commit is contained in:
Charles Bochet
2023-07-15 14:16:02 -07:00
committed by GitHub
parent 2bbcf6980a
commit b982788100
11 changed files with 88 additions and 57 deletions

View File

@ -47,7 +47,7 @@ export function RequireOnboarded({
}
}, [onboardingStatus, navigate]);
if (onboardingStatus !== OnboardingStatus.Completed) {
if (onboardingStatus && onboardingStatus !== OnboardingStatus.Completed) {
return (
<EmptyContainer>
<FadeInStyle>

View File

@ -59,11 +59,10 @@ export function useAuth() {
setTokenPair(verifyResult.data?.verify.tokens);
setIsAuthenticating(false);
setCurrentUser(verifyResult.data?.verify.user);
return verifyResult.data?.verify;
},
[setCurrentUser, setIsAuthenticating, setTokenPair, verify],
[setIsAuthenticating, setTokenPair, verify],
);
const handleLogin = useCallback(
@ -77,7 +76,8 @@ export function useAuth() {
const handleLogout = useCallback(() => {
setTokenPair(null);
}, [setTokenPair]);
setCurrentUser(null);
}, [setTokenPair, setCurrentUser]);
const handleSignUp = useCallback(
async (email: string, password: string, workspaceInviteHash?: string) => {

View File

@ -8,9 +8,10 @@ import {
OnboardingStatus,
} from '../utils/getOnboardingStatus';
export function useOnboardingStatus(): OnboardingStatus {
export function useOnboardingStatus(): OnboardingStatus | undefined {
const [currentUser] = useRecoilState(currentUserState);
const isLoggedIn = useIsLogged();
const onboardingStatus = useMemo(
() => getOnboardingStatus(isLoggedIn, currentUser),
[currentUser, isLoggedIn],

View File

@ -11,9 +11,15 @@ export function getOnboardingStatus(
isLoggedIn: boolean,
currentUser: CurrentUser | null,
) {
if (!isLoggedIn || !currentUser) {
if (!isLoggedIn) {
return OnboardingStatus.OngoingUserCreation;
}
// if the user has not been fetched yet, we can't know the onboarding status
if (!currentUser) {
return undefined;
}
if (!currentUser.workspaceMember?.workspace.displayName) {
return OnboardingStatus.OngoingWorkspaceCreation;
}