Skip to content

Commit b1bfd48

Browse files
authored
Merge pull request #3165 from humanprotocol/develop
Release 2025-03-xx
2 parents 6ff24f2 + 8b2b0ee commit b1bfd48

331 files changed

Lines changed: 7355 additions & 4870 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/cd-subgraph.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
max-parallel: 3
2828
steps:
2929
- uses: actions/checkout@v4
30-
- name: Set up Node.js
31-
uses: actions/setup-node@v4
30+
- uses: actions/setup-node@v4
31+
name: Set up Node.js
3232
with:
3333
node-version-file: .nvmrc
3434
- name: Filter Networks

.github/workflows/ci-test-subgraph.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-22.04
1818
steps:
1919
- uses: actions/checkout@v4
20-
uses: actions/setup-node@v4
20+
- uses: actions/setup-node@v4
2121
with:
2222
node-version-file: .nvmrc
2323
- run: npm install --global yarn && yarn

packages/apps/dashboard/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@mui/styled-engine-sc": "6.4.0",
2222
"@mui/x-data-grid": "^7.23.2",
2323
"@mui/x-date-pickers": "^7.23.6",
24-
"@tanstack/react-query": "^5.48.0",
24+
"@tanstack/react-query": "^5.67.2",
2525
"@types/react-router-dom": "^5.3.3",
2626
"@types/recharts": "^1.8.29",
2727
"axios": "^1.7.2",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"dependencies": {
2828
"@human-protocol/sdk": "*",
2929
"@mui/material": "^5.16.7",
30-
"@tanstack/query-sync-storage-persister": "^5.59.0",
31-
"@tanstack/react-query": "^5.60.5",
32-
"@tanstack/react-query-persist-client": "^5.66.9",
30+
"@tanstack/query-sync-storage-persister": "^5.68.0",
31+
"@tanstack/react-query": "^5.67.2",
32+
"@tanstack/react-query-persist-client": "^5.67.2",
3333
"axios": "^1.7.2",
3434
"ethers": "^6.13.5",
3535
"react": "^18.3.1",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@reown/appkit": "1.3.2",
2727
"@reown/appkit-adapter-wagmi": "1.3.2",
2828
"@synaps-io/verify-sdk": "^4.0.45",
29-
"@tanstack/react-query": "^5.61.0",
29+
"@tanstack/react-query": "^5.67.2",
3030
"date-fns": "^4.1.0",
3131
"ethers": "^6.13.5",
3232
"i18next": "^23.8.2",

packages/apps/human-app/frontend/src/api/fetch-refresh-token.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { apiPaths } from '@/api/api-paths';
22
import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
3-
import { signInSuccessResponseSchema } from '@/modules/worker/services/sign-in/schema';
3+
import { authTokensSuccessResponseSchema } from '@/shared/schemas';
44

55
export const fetchTokenRefresh = async (baseUrl: string) => {
66
const response = await fetch(
@@ -23,7 +23,7 @@ export const fetchTokenRefresh = async (baseUrl: string) => {
2323

2424
const data: unknown = await response.json();
2525

26-
const refetchAccessTokenSuccess = signInSuccessResponseSchema.parse(data);
26+
const refetchAccessTokenSuccess = authTokensSuccessResponseSchema.parse(data);
2727

2828
return refetchAccessTokenSuccess;
2929
};

packages/apps/human-app/frontend/src/api/fetcher.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { ZodError, type ZodType, type ZodTypeDef } from 'zod';
33
import type { ResponseError } from '@/shared/types/global.type';
44
import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
55
import { env } from '@/shared/env';
6-
import { type SignInSuccessResponse } from '@/modules/worker/services/sign-in/types';
76
import { normalizeBaseUrl } from '@/shared/helpers/url';
7+
import { type AuthTokensSuccessResponse } from '@/shared/schemas';
88
import { fetchTokenRefresh } from './fetch-refresh-token';
99

1010
const appendHeader = (
@@ -66,7 +66,7 @@ export type FetcherOptions<SuccessInput, SuccessOutput> =
6666

6767
export type FetcherUrl = string | URL;
6868

69-
let refreshPromise: Promise<SignInSuccessResponse | null> | null = null;
69+
let refreshPromise: Promise<AuthTokensSuccessResponse | null> | null = null;
7070

7171
export async function refreshToken(): Promise<{
7272
access_token: string;

packages/apps/human-app/frontend/src/modules/auth-web3/context/web3-auth-context.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import { useState, createContext, useEffect } from 'react';
33
import { jwtDecode } from 'jwt-decode';
44
import { z } from 'zod';
55
import { useQueryClient } from '@tanstack/react-query';
6-
import type { SignInSuccessResponse } from '@/modules/worker/services/sign-in/types';
76
import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
87
import {
98
ModalType,
109
useModalStore,
1110
} from '@/shared/components/ui/modal/modal.store';
11+
import { type AuthTokensSuccessResponse } from '@/shared/schemas';
1212

1313
const web3userDataSchema = z.object({
1414
userId: z.number(),
@@ -25,15 +25,15 @@ export interface Web3AuthenticatedUserContextType {
2525
user: Web3UserData;
2626
status: AuthStatus;
2727
signOut: (throwExpirationModal?: boolean) => void;
28-
signIn: (singIsSuccess: SignInSuccessResponse) => void;
28+
signIn: (singIsSuccess: AuthTokensSuccessResponse) => void;
2929
updateUserData: (updateUserDataPayload: Partial<Web3UserData>) => void;
3030
}
3131

3232
interface Web3UnauthenticatedUserContextType {
3333
user: null;
3434
status: AuthStatus;
3535
signOut: (throwExpirationModal?: boolean) => void;
36-
signIn: (singIsSuccess: SignInSuccessResponse) => void;
36+
signIn: (singIsSuccess: AuthTokensSuccessResponse) => void;
3737
}
3838

3939
export const Web3AuthContext = createContext<
@@ -97,7 +97,7 @@ export function Web3AuthProvider({ children }: { children: React.ReactNode }) {
9797
}
9898
};
9999

100-
const signIn = (singIsSuccess: SignInSuccessResponse) => {
100+
const signIn = (singIsSuccess: AuthTokensSuccessResponse) => {
101101
browserAuthProvider.signIn(singIsSuccess, 'web3');
102102
handleSignIn();
103103
};

packages/apps/human-app/frontend/src/modules/auth/context/auth-context.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import { useState, createContext, useEffect } from 'react';
33
import { jwtDecode } from 'jwt-decode';
44
import { z } from 'zod';
55
import { useQueryClient } from '@tanstack/react-query';
6-
import type { SignInSuccessResponse } from '@/modules/worker/services/sign-in/types';
76
import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
87
import {
98
ModalType,
109
useModalStore,
1110
} from '@/shared/components/ui/modal/modal.store';
11+
import { type AuthTokensSuccessResponse } from '@/shared/schemas';
1212

1313
const extendableUserDataSchema = z.object({
1414
site_key: z.string().optional().nullable(),
@@ -35,15 +35,15 @@ export interface AuthenticatedUserContextType {
3535
user: UserData;
3636
status: AuthStatus;
3737
signOut: (throwExpirationModal?: boolean) => void;
38-
signIn: (singIsSuccess: SignInSuccessResponse) => void;
38+
signIn: (singIsSuccess: AuthTokensSuccessResponse) => void;
3939
updateUserData: (updateUserDataPayload: UpdateUserDataPayload) => void;
4040
}
4141

4242
interface UnauthenticatedUserContextType {
4343
user: null;
4444
status: AuthStatus;
4545
signOut: (throwExpirationModal?: boolean) => void;
46-
signIn: (singIsSuccess: SignInSuccessResponse) => void;
46+
signIn: (singIsSuccess: AuthTokensSuccessResponse) => void;
4747
}
4848

4949
export const AuthContext = createContext<
@@ -112,7 +112,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
112112
}
113113
};
114114

115-
const signIn = (singIsSuccess: SignInSuccessResponse) => {
115+
const signIn = (singIsSuccess: AuthTokensSuccessResponse) => {
116116
browserAuthProvider.signIn(singIsSuccess, 'web2');
117117
handleSignIn();
118118
};
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
export * from './home-container';
2-
export * from './welcome';
3-
export * from './choose-sign-up-account-type';

0 commit comments

Comments
 (0)