ffdedf7af3
Fixes https://github.com/twentyhq/core-team-issues/issues/950 This issue was due to the memoization inside `useIsMatchingLocation`, which was rerendered only if the pathname changed but not the search params. After discussion with @lucasbordeau, we decided to remove the hook `useIsMatchingLocation` and to create an equivalent util function which takes the location as an argument. --------- Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
35 lines
1.2 KiB
TypeScript
35 lines
1.2 KiB
TypeScript
import React from 'react';
|
|
import { useRecoilValue } from 'recoil';
|
|
|
|
import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadingState';
|
|
import { dateTimeFormatState } from '@/localization/states/dateTimeFormatState';
|
|
import { AppPath } from '@/types/AppPath';
|
|
import { UserContext } from '@/users/contexts/UserContext';
|
|
import { useLocation } from 'react-router-dom';
|
|
import { UserOrMetadataLoader } from '~/loading/components/UserOrMetadataLoader';
|
|
import { isMatchingLocation } from '~/utils/isMatchingLocation';
|
|
|
|
export const UserProvider = ({ children }: React.PropsWithChildren) => {
|
|
const isCurrentUserLoaded = useRecoilValue(isCurrentUserLoadedState);
|
|
const location = useLocation();
|
|
|
|
const dateTimeFormat = useRecoilValue(dateTimeFormatState);
|
|
|
|
return !isCurrentUserLoaded &&
|
|
!isMatchingLocation(location, AppPath.Verify) &&
|
|
!isMatchingLocation(location, AppPath.VerifyEmail) &&
|
|
!isMatchingLocation(location, AppPath.CreateWorkspace) ? (
|
|
<UserOrMetadataLoader />
|
|
) : (
|
|
<UserContext.Provider
|
|
value={{
|
|
dateFormat: dateTimeFormat.dateFormat,
|
|
timeFormat: dateTimeFormat.timeFormat,
|
|
timeZone: dateTimeFormat.timeZone,
|
|
}}
|
|
>
|
|
{children}
|
|
</UserContext.Provider>
|
|
);
|
|
};
|