Merge pull request #2754 from humanprotocol/develop

Release fix #2753

Author: portuu3

packages/apps/human-app/frontend/src/api/services/worker/oracles.ts

@@ -37,21 +37,22 @@ export async function getOracles({
   signal: AbortSignal;
 }) {
   let oracles = [H_CAPTCHA_ORACLE];
-  const queryParams = selected_job_types.length
-    ? `?${stringifyUrlQueryObject({ selected_job_types })}`
-    : '';
+  if (env.VITE_FEATURE_FLAG_JOBS_DISCOVERY) {
+    const queryParams = selected_job_types.length
+      ? `?${stringifyUrlQueryObject({ selected_job_types })}`
+      : '';
 
-  const result = await apiClient(
-    `${apiPaths.worker.oracles.path}${queryParams}`,
-    {
-      successSchema: OraclesSuccessSchema,
-      options: { method: 'GET' },
-    },
-    signal
-  );
-
-  oracles = oracles.concat(result);
+    const result = await apiClient(
+      `${apiPaths.worker.oracles.path}${queryParams}`,
+      {
+        successSchema: OraclesSuccessSchema,
+        options: { method: 'GET' },
+      },
+      signal
+    );
 
+    oracles = oracles.concat(result);
+  }
   return oracles;
 }
 

packages/apps/human-app/frontend/src/components/layout/drawer-menu-items/drawer-menu-items-worker.tsx

@@ -5,24 +5,21 @@ import type {
 } from '@/components/layout/protected/drawer-navigation';
 import { HelpIcon, UserOutlinedIcon, WorkIcon } from '@/components/ui/icons';
 import { routerPaths } from '@/router/router-paths';
-import { env } from '@/shared/env';
 import { DarkModeSwitch } from '@/components/ui/dark-mode-switch';
 import type { UserData } from '@/auth/auth-context';
 
 export const workerDrawerTopMenuItems = (
   user: UserData | null
 ): TopMenuItem[] => {
   return [
-    ...(env.VITE_FEATURE_FLAG_JOBS_DISCOVERY
-      ? [
-          {
-            label: t('components.DrawerNavigation.jobs'),
-            icon: <WorkIcon />,
-            link: routerPaths.worker.jobsDiscovery,
-            disabled: !user?.wallet_address || user.kyc_status !== 'approved',
-          },
-        ]
-      : []),
+    ...[
+      {
+        label: t('components.DrawerNavigation.jobs'),
+        icon: <WorkIcon />,
+        link: routerPaths.worker.jobsDiscovery,
+        disabled: !user?.wallet_address || user.kyc_status !== 'approved',
+      },
+    ],
   ];
 };
 

packages/apps/human-app/frontend/src/router/routes.tsx

@@ -90,18 +90,18 @@ export const protectedRoutes: {
       headerText: t('protectedPagesHeaders.profile'),
     },
   },
+  {
+    routerProps: {
+      path: routerPaths.worker.jobsDiscovery,
+      element: <JobsDiscoveryPage />,
+    },
+    pageHeaderProps: {
+      headerIcon: <HomepageWorkIcon />,
+      headerText: t('protectedPagesHeaders.jobsDiscovery'),
+    },
+  },
   ...(env.VITE_FEATURE_FLAG_JOBS_DISCOVERY
     ? [
-        {
-          routerProps: {
-            path: routerPaths.worker.jobsDiscovery,
-            element: <JobsDiscoveryPage />,
-          },
-          pageHeaderProps: {
-            headerIcon: <HomepageWorkIcon />,
-            headerText: t('protectedPagesHeaders.jobsDiscovery'),
-          },
-        },
         {
           routerProps: {
             path: `${routerPaths.worker.jobs}/:address`,