- {isQuestsFeatureEnabled === true && questDashboard ? (
+ {questDashboard ? (
<>
{
- const router = useRouter();
+const GamificationSettingsPage = (): ReactElement => {
const {
optOutLevelSystem,
optOutQuestSystem,
toggleOptOutLevelSystem,
toggleOptOutQuestSystem,
} = useSettingsContext();
- const { value: isQuestsFeatureEnabled, isLoading: isQuestsFeatureLoading } =
- useConditionalFeature({
- feature: questsFeature,
- });
-
- useEffect(() => {
- if (isQuestsFeatureLoading || isQuestsFeatureEnabled === true) {
- return;
- }
-
- router.replace('/settings/customization/streaks');
- }, [isQuestsFeatureEnabled, isQuestsFeatureLoading, router]);
-
- if (isQuestsFeatureLoading || isQuestsFeatureEnabled !== true) {
- return null;
- }
return (
diff --git a/packages/webapp/pages/users.tsx b/packages/webapp/pages/users.tsx
index 0201d7e2079..a9b3a38d152 100644
--- a/packages/webapp/pages/users.tsx
+++ b/packages/webapp/pages/users.tsx
@@ -12,9 +12,7 @@ import { useRouter } from 'next/router';
import { BreadCrumbs } from '@dailydotdev/shared/src/components/header';
import { SquadIcon } from '@dailydotdev/shared/src/components/icons';
import { IconSize } from '@dailydotdev/shared/src/components/Icon';
-import { useConditionalFeature } from '@dailydotdev/shared/src/hooks';
import type { GraphQLError } from '@dailydotdev/shared/src/lib/errors';
-import { questsFeature } from '@dailydotdev/shared/src/lib/featureManagement';
import { PageWrapperLayout } from '@dailydotdev/shared/src/components/layout/PageWrapperLayout';
import type { UserLeaderboard } from '@dailydotdev/shared/src/components/cards/Leaderboard';
import { UserTopList } from '@dailydotdev/shared/src/components/cards/Leaderboard';
@@ -73,9 +71,6 @@ const LeaderboardPage = ({
popularHotTakes,
}: PageProps): ReactElement => {
const { isFallback: isLoading } = useRouter();
- const { value: isQuestsFeatureEnabled } = useConditionalFeature({
- feature: questsFeature,
- });
if (isLoading) {
return <>>;
@@ -89,7 +84,7 @@ const LeaderboardPage = ({
- {isQuestsFeatureEnabled === true && isHighestLevelSupported && (
+ {isHighestLevelSupported && (
{
- const router = useRouter();
- const { isFallback: isLoading } = router;
- const { value: isQuestsFeatureEnabled, isLoading: isQuestsFeatureLoading } =
- useConditionalFeature({
- feature: questsFeature,
- });
+ const { isFallback: isLoading } = useRouter();
const isCompany = isCompanyLeaderboard(leaderboardType);
const isLevelLeaderboard = leaderboardType === LeaderboardType.HighestLevel;
const concatScore = leaderboardType !== LeaderboardType.LongestStreak;
- useEffect(() => {
- if (
- !isLevelLeaderboard ||
- isQuestsFeatureLoading ||
- isQuestsFeatureEnabled === true
- ) {
- return;
- }
-
- router.replace('/users');
- }, [
- isLevelLeaderboard,
- isQuestsFeatureEnabled,
- isQuestsFeatureLoading,
- router,
- ]);
-
- if (
- isLoading ||
- !title ||
- (isLevelLeaderboard &&
- (isQuestsFeatureLoading || isQuestsFeatureEnabled !== true))
- ) {
+ if (isLoading || !title) {
return <>>;
}