Skip to content

Commit e7414ce

Browse files
committed
update returning user logic
1 parent 8d503ad commit e7414ce

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

src/ui/screens/info-pages/InfoPageRouter.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,20 @@ import { useEffect } from "react";
22
import { useNavigate } from "react-router-dom";
33
import userManager from "@/core/managers/userManager";
44
import { useUserExistsStatus, UserStatus } from "./hooks/useUserExistsStatus";
5-
import { useUserStore } from "@/ui/storage/zustand";
65

76
const InfoPageRouter = () => {
87
const userStatus = useUserExistsStatus(userManager);
9-
const updateUserId = useUserStore((state) => state.updateUserId);
108
const navigate = useNavigate();
119

1210
useEffect(() => {
1311
if (userStatus === UserStatus.USER_EXISTS) {
14-
updateUserId("ff:quick-check-user");
1512
navigate("/returning-user");
1613
}
1714

1815
if (userStatus === UserStatus.USER_DOES_NOT_EXIST) {
1916
navigate("/privacy-info");
2017
}
21-
}, [userStatus, navigate, updateUserId]);
18+
}, [userStatus, navigate]);
2219

2320
return null;
2421
};

src/ui/screens/info-pages/privacy/InfoScreenPrivacy.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ const InfoScreenPrivacy = ({t, isDesktop, privacyBox, initialiseNewUser}) => {
6262
<RegularButton
6363
variant={'blueContained'}
6464
text={'app.privacySite.button'}
65-
onClick={initialiseNewUser}
66-
link={'/onboarding-choice'}
65+
link={'/onboarding-user'}
6766
/>
6867
</VBox>
6968
{

src/ui/screens/profile-screen/hooks/useUserProfileData.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import {useMemo} from 'react';
2-
import {useMetadataStore} from "../../../storage/zustand";
3-
import userManager from "../../../../core/managers/userManager";
4-
import {convertUserValueRaw, expand} from "../../../../core/utilities/rdfParsing";
5-
import useTranslation from "../../../language/useTranslation";
6-
import { formatEuro } from '../../../utils/currencyUtils';
2+
import {useMetadataStore} from "@/ui/storage/zustand";
3+
import userManager from "@/core/managers/userManager";
4+
import {convertUserValueRaw, expand} from "@/core/utilities/rdfParsing";
5+
import useTranslation from "@/ui/language/useTranslation";
6+
import { formatEuro } from '@/ui/utils/currencyUtils';
7+
import { useUserStore } from '@/ui/storage/zustand';
78

89
const useUserProfileData = () => {
910
const { t } = useTranslation();
1011
const metadata = useMetadataStore((state) => state.metadata);
11-
const userProfile = userManager.retrieveUserData("ff:quick-check-user");
12+
const userId = useUserStore((state) => state.activeUserId);
13+
const userProfile = userManager.retrieveUserData(userId);
1214

1315
return useMemo(() => {
1416
return Object.entries(userProfile)

0 commit comments

Comments
 (0)