fix billingCheckoutSession query param + enable redirect on workspace… (#11509)
… during onboarding fixes : https://github.com/twentyhq/core-team-issues/issues/668
This commit is contained in:
@ -1,11 +1,9 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import {
|
||||
createSearchParams,
|
||||
matchPath,
|
||||
useLocation,
|
||||
useNavigate,
|
||||
useParams,
|
||||
useSearchParams,
|
||||
} from 'react-router-dom';
|
||||
import { useRecoilValue } from 'recoil';
|
||||
|
||||
@ -65,28 +63,11 @@ export const PageChangeEffect = () => {
|
||||
}
|
||||
}, [location, previousLocation, executeTasksOnAnyLocationChange]);
|
||||
|
||||
const [searchParams] = useSearchParams();
|
||||
|
||||
useEffect(() => {
|
||||
if (isDefined(pageChangeEffectNavigateLocation)) {
|
||||
const hasQueryParams = pageChangeEffectNavigateLocation.includes('?');
|
||||
|
||||
const navigationParams = createSearchParams({
|
||||
...(searchParams.get('animateModal')
|
||||
? { animateModal: searchParams.get('animateModal') ?? 'false' }
|
||||
: {}),
|
||||
});
|
||||
|
||||
if (hasQueryParams) {
|
||||
navigate(pageChangeEffectNavigateLocation);
|
||||
} else {
|
||||
navigate({
|
||||
pathname: pageChangeEffectNavigateLocation,
|
||||
search: navigationParams.toString(),
|
||||
});
|
||||
}
|
||||
navigate(pageChangeEffectNavigateLocation);
|
||||
}
|
||||
}, [navigate, pageChangeEffectNavigateLocation, searchParams]);
|
||||
}, [navigate, pageChangeEffectNavigateLocation]);
|
||||
|
||||
useEffect(() => {
|
||||
const isLeavingRecordIndexPage = !!matchPath(
|
||||
|
||||
Reference in New Issue
Block a user