antontranelis/utopia-ui
1
0
Fork 0
mirror of https://github.com/utopia-os/utopia-ui.git synced 2025-12-13 07:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove invalid inviteCodes from localStorage; don't get stuck when validating

Browse Source
This commit is contained in:
Maximilian Harz 2025-12-04 10:04:19 +01:00
parent 8c9d9aaa4c
commit 078f2c7e6c
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/Components/Map/hooks/useMyProfile.ts
View File

@ -14,10 +14,10 @@ export const useMyProfile = () => {
(item) => item.layer?.userProfileLayer && item.user_created?.id === user?.id,
)
const isAnyUserProfileLoaded = !!items.find((item) => item.layer?.userProfileLayer)
const isUserProfileLayerLoaded = !!items.find((item) => item.layer?.userProfileLayer)
// allItemsLoaded is not reliable
const isMyProfileLoaded = isAnyUserProfileLoaded && !!user
const isMyProfileLoaded = isUserProfileLayerLoaded && !!user
const createEmptyProfile = async () => {
if (!user) return
@ -45,5 +45,5 @@ export const useMyProfile = () => {
return result
}
return { myProfile, isMyProfileLoaded, createEmptyProfile }
return { myProfile, isMyProfileLoaded, isUserProfileLayerLoaded, createEmptyProfile }
}

14
lib/src/Components/Onboarding/InvitePage.tsx
View File

@ -25,7 +25,7 @@ export function InvitePage({ inviteApi, itemsApi }: Props) {
const navigate = useNavigate()
const updateItem = useUpdateItem()
const { myProfile, isMyProfileLoaded, createEmptyProfile } = useMyProfile()
const { myProfile, isUserProfileLayerLoaded, createEmptyProfile } = useMyProfile()
if (!id) throw new Error('Invite ID is required')
@ -50,7 +50,7 @@ export function InvitePage({ inviteApi, itemsApi }: Props) {
const confirmFollowAsync = async () => {
if (!isAuthenticated) return
if (!isMyProfileLoaded || isRedeemingDone) return
if (!isUserProfileLayerLoaded || isRedeemingDone) return
const myActualProfile = myProfile ?? (await createEmptyProfile())
@ -92,6 +92,7 @@ export function InvitePage({ inviteApi, itemsApi }: Props) {
if (!invitingProfileId) {
toast.error('Invalid invite code')
localStorage.removeItem('inviteCode')
navigate('/')
return
}
@ -100,6 +101,7 @@ export function InvitePage({ inviteApi, itemsApi }: Props) {
if (invitingProfileId === myProfile?.id) {
toast.error('You cannot invite yourself')
localStorage.removeItem('inviteCode')
// Navigate to own profile
navigate('/item/' + myProfile.id)
return
@ -111,12 +113,14 @@ export function InvitePage({ inviteApi, itemsApi }: Props) {
)
) {
toast.error('You are already following this profile')
localStorage.removeItem('inviteCode')
navigate('/item/' + invitingProfileId)
return
}
if (!invitingProfile) {
toast.error('Inviting profile not found')
localStorage.removeItem('inviteCode')
navigate('/')
return
}
@ -135,10 +139,10 @@ export function InvitePage({ inviteApi, itemsApi }: Props) {
localStorage.setItem('inviteCode', id)
}
if (!isMyProfileLoaded) return
if (!isUserProfileLayerLoaded) return
void validateInvite(id)
setValidationDone(true)
void validateInvite(id)
}, [
id,
isAuthenticated,
@ -146,11 +150,11 @@ export function InvitePage({ inviteApi, itemsApi }: Props) {
navigate,
isAuthenticationInitialized,
myProfile,
isMyProfileLoaded,
itemsApi,
isRedeemingDone,
isValidationDone,
createEmptyProfile,
isUserProfileLayerLoaded,
])
const goToSignup = () => {