Merge branch 'develop' into feature/dashboard/available-networks

Author: 0xVoronov

packages/apps/dashboard/ui-2024/package.json

@@ -17,9 +17,9 @@
     "@emotion/styled": "^11.11.5",
     "@mui/icons-material": "^6.1.1",
     "@mui/material": "^5.15.18",
-    "@mui/styled-engine-sc": "6.1.3",
+    "@mui/styled-engine-sc": "6.1.7",
     "@mui/x-date-pickers": "^7.5.0",
-    "@tanstack/react-query": "^5.48.0",
+    "@tanstack/react-query": "^5.60.5",
     "@types/react-router-dom": "^5.3.3",
     "@types/recharts": "^1.8.29",
     "axios": "^1.7.2",

packages/apps/fortune/exchange-oracle/client/package.json

@@ -29,7 +29,7 @@
     "@human-protocol/sdk": "*",
     "@mui/material": "^5.16.7",
     "@tanstack/query-sync-storage-persister": "^5.59.0",
-    "@tanstack/react-query": "^5.49.2",
+    "@tanstack/react-query": "^5.60.5",
     "@tanstack/react-query-persist-client": "^5.51.11",
     "axios": "^1.7.2",
     "ethers": "^6.13.1",

packages/apps/fortune/exchange-oracle/server/package.json

@@ -37,7 +37,7 @@
     "rxjs": "^7.2.0"
   },
   "devDependencies": {
-    "@golevelup/ts-jest": "^0.5.0",
+    "@golevelup/ts-jest": "^0.6.1",
     "@nestjs/cli": "^10.3.2",
     "@nestjs/schematics": "^10.1.3",
     "@nestjs/testing": "^10.4.6",

packages/apps/human-app/frontend/.eslintrc.cjs

@@ -34,6 +34,7 @@ module.exports = {
     // allow imports from material react table library
     camelcase: ['error', { allow: ['MRT_'] }],
     'react/jsx-pascal-case': ['error', { ignore: ['MRT_'] }],
+    'react/jsx-no-leaked-render': 'off',
     '@typescript-eslint/restrict-template-expressions': [
       'error',
       {

packages/apps/human-app/frontend/package.json

@@ -24,7 +24,7 @@
     "@mui/icons-material": "^6.1.1",
     "@mui/material": "^5.16.7",
     "@synaps-io/verify-sdk": "^4.0.45",
-    "@tanstack/react-query": "^5.18.1",
+    "@tanstack/react-query": "^5.60.5",
     "@walletconnect/ethereum-provider": "^2.16.1",
     "@walletconnect/modal": "^2.6.2",
     "@web3modal/ethers": "^5.1.5",

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

@@ -10,22 +10,40 @@ import { env } from '@/shared/env';
 const OracleSuccessSchema = z.object({
   address: z.string(),
   role: z.string(),
-  url: z.string().optional().nullable(),
+  url: z.string(),
   jobTypes: z.array(z.string()),
   registrationNeeded: z.boolean().optional().nullable(),
   registrationInstructions: z.string().optional().nullable(),
 });
 
 const OraclesSuccessSchema = z.array(OracleSuccessSchema);
 
-export type OracleSuccessResponse = z.infer<typeof OracleSuccessSchema>;
+export type OracleSuccessResponse = z.infer<typeof OracleSuccessSchema> & {
+  name: string;
+};
 export type OraclesSuccessResponse = OracleSuccessResponse[];
 
+const OracleNameToUrls = {
+  CVAT: [
+    'https://stg-exchange-oracle.humanprotocol.org',
+    'https://exchange-oracle.humanprotocol.org',
+  ],
+  Fortune: ['https://stg-fortune-exchange-oracle-server.humanprotocol.org'],
+} as const;
+
+const oracleUrlToNameMap = new Map<string, string>();
+for (const [oracleName, oracleUrls] of Object.entries(OracleNameToUrls)) {
+  for (const oracleUrl of oracleUrls) {
+    oracleUrlToNameMap.set(oracleUrl, oracleName);
+  }
+}
+
 const H_CAPTCHA_ORACLE: OracleSuccessResponse = {
   address: env.VITE_H_CAPTCHA_ORACLE_ADDRESS,
   jobTypes: env.VITE_H_CAPTCHA_ORACLE_TASK_TYPES,
   role: env.VITE_H_CAPTCHA_ORACLE_ROLE,
   url: env.VITE_H_CAPTCHA_ORACLE_ANNOTATION_TOOL,
+  name: 'hCaptcha',
   registrationNeeded: false,
 };
 
@@ -42,7 +60,7 @@ export async function getOracles({
       ? `?${stringifyUrlQueryObject({ selected_job_types })}`
       : '';
 
-    const result = await apiClient(
+    const fetchedOracles = await apiClient(
       `${apiPaths.worker.oracles.path}${queryParams}`,
       {
         successSchema: OraclesSuccessSchema,
@@ -51,7 +69,12 @@ export async function getOracles({
       signal
     );
 
-    oracles = oracles.concat(result);
+    oracles = oracles.concat(
+      fetchedOracles.map((oracle) => ({
+        ...oracle,
+        name: oracleUrlToNameMap.get(oracle.url) ?? '',
+      }))
+    );
   }
   return oracles;
 }

packages/apps/human-app/frontend/src/hooks/use-my-jobs-filter-store.tsx

@@ -16,7 +16,12 @@ type JobStatus = (typeof jobStatuses)[number];
 export interface MyJobsFilterStoreProps {
   filterParams: {
     sort?: 'asc' | 'desc';
-    sort_field?: 'chain_id' | 'job_type' | 'reward_amount' | 'expires_at';
+    sort_field?:
+      | 'chain_id'
+      | 'job_type'
+      | 'reward_amount'
+      | 'expires_at'
+      | 'created_at';
     job_type?: string;
     status?: JobStatus;
     escrow_address?: string;
@@ -36,11 +41,11 @@ export interface MyJobsFilterStoreProps {
 }
 
 const initialFiltersState = {
+  escrow_address: '',
   page: 0,
   page_size: 5,
-  filterParams: {
-    escrow_address: '',
-  },
+  sort_field: 'created_at',
+  sort: 'desc',
 } as const;
 
 export const useMyJobsFilterStore = create<MyJobsFilterStoreProps>((set) => ({

packages/apps/human-app/frontend/src/i18n/en.json

@@ -196,6 +196,7 @@
       "KYCInProgress": "KYC in progress",
       "confirmEmail": "Confirm email",
       "kycCompleted": "KYC Completed",
+      "kycDeclined": "KYC Declined",
       "walletAddressMessage": "This address is the wallet address where you will receive payments for completing tasks.",
       "connectWallet": "Connect Wallet",
       "walletConnected": "Wallet Connected ",

packages/apps/human-app/frontend/src/pages/worker/jobs-discovery/components/oracles-table/oracles-table-mobile.tsx

@@ -61,7 +61,7 @@ export function OraclesTableMobile({
               <EvmAddress address={d.address} />
             </ListItem>
             <ListItem label={t('worker.oraclesTable.annotationTool')}>
-              <Typography variant="body2">{d.url ?? ''}</Typography>
+              <Typography variant="body2">{d.name}</Typography>
             </ListItem>
             <ListItem label={t('worker.oraclesTable.jobTypes')}>
               <Chips

packages/apps/human-app/frontend/src/pages/worker/jobs-discovery/components/oracles-table/oracles-table.tsx

@@ -26,7 +26,7 @@ const getColumns = (
 ): MRT_ColumnDef<OracleSuccessResponse>[] => {
   return [
     {
-      accessorKey: 'url',
+      accessorKey: 'name',
       header: t('worker.oraclesTable.annotationTool'),
       size: 100,
       enableSorting: false,