diff --git a/src/modules/pointsVault/components/PointsVaultApprovedList.tsx b/src/modules/pointsVault/components/PointsVaultApprovedList.tsx index 43a4fac72b..5fbf2fe284 100644 --- a/src/modules/pointsVault/components/PointsVaultApprovedList.tsx +++ b/src/modules/pointsVault/components/PointsVaultApprovedList.tsx @@ -31,6 +31,7 @@ const PointsVaultApprovedList = ({ query }: PointsVaultApprovedListProps) => { pageSize: 20, twitter: query.twitter, wallet: query.wallet, + activityTypeId: 'follow_push_on_twitter', }); const hasMoreData = !isFetchingNextPage && hasNextPage; diff --git a/src/modules/pointsVault/components/PointsVaultPendingList.tsx b/src/modules/pointsVault/components/PointsVaultPendingList.tsx index 271d211292..132c0730e9 100644 --- a/src/modules/pointsVault/components/PointsVaultPendingList.tsx +++ b/src/modules/pointsVault/components/PointsVaultPendingList.tsx @@ -33,6 +33,7 @@ const PointsVaultPendingList = ({ query }: PointsVaultPendingListProps) => { pageSize: 20, twitter: query.twitter, wallet: query.wallet, + activityTypeId: 'follow_push_on_twitter', }); const hasMoreData = !isFetchingNextPage && hasNextPage; diff --git a/src/modules/pointsVault/components/PointsVaultRejectedList.tsx b/src/modules/pointsVault/components/PointsVaultRejectedList.tsx index d41a403edf..d578f13283 100644 --- a/src/modules/pointsVault/components/PointsVaultRejectedList.tsx +++ b/src/modules/pointsVault/components/PointsVaultRejectedList.tsx @@ -31,6 +31,7 @@ const PointsVaultRejectedList = ({ query }: PointsVaultRejectedListProps) => { pageSize: 20, twitter: query.twitter, wallet: query.wallet, + activityTypeId: 'follow_push_on_twitter', }); const hasMoreData = !isFetchingNextPage && hasNextPage; diff --git a/src/queries/hooks/pointsVault/useGetPointsVaultApprovedUsers.ts b/src/queries/hooks/pointsVault/useGetPointsVaultApprovedUsers.ts index e5d5062f97..136c0ed8e2 100644 --- a/src/queries/hooks/pointsVault/useGetPointsVaultApprovedUsers.ts +++ b/src/queries/hooks/pointsVault/useGetPointsVaultApprovedUsers.ts @@ -9,12 +9,13 @@ export const useGetPointsVaultApprovedUsers = ({ token, twitter, wallet, + activityTypeId, }: PointsVaultGetUsersPayload) => { return useInfiniteQuery({ queryKey: [pointsVaultApprovedUsers, `${twitter}-${wallet}`], initialPageParam: 1, queryFn: ({ pageParam }) => - getPointsVaultUsers({ status, page: pageParam as number, pageSize, token, twitter, wallet }), + getPointsVaultUsers({ status, page: pageParam as number, pageSize, token, twitter, wallet, activityTypeId }), getNextPageParam: ({ page, total }) => { if (page >= total) { return null; diff --git a/src/queries/hooks/pointsVault/useGetPointsVaultPendingUsers.ts b/src/queries/hooks/pointsVault/useGetPointsVaultPendingUsers.ts index 34a5c74b19..ce59c4e855 100644 --- a/src/queries/hooks/pointsVault/useGetPointsVaultPendingUsers.ts +++ b/src/queries/hooks/pointsVault/useGetPointsVaultPendingUsers.ts @@ -9,12 +9,13 @@ export const useGetPointsVaultPendingUsers = ({ token, twitter, wallet, + activityTypeId, }: PointsVaultGetUsersPayload) => { return useInfiniteQuery({ queryKey: [pointsVaultPendingUsers, `${twitter}-${wallet}`], initialPageParam: 1, queryFn: ({ pageParam }) => - getPointsVaultUsers({ status, page: pageParam as number, pageSize, token, twitter, wallet }), + getPointsVaultUsers({ status, page: pageParam as number, pageSize, token, twitter, wallet, activityTypeId }), getNextPageParam: ({ page, total }) => { if (page >= total) { return null; diff --git a/src/queries/hooks/pointsVault/useGetPointsVaultRejectedUsers.ts b/src/queries/hooks/pointsVault/useGetPointsVaultRejectedUsers.ts index e66f15f421..f69a9f95f7 100644 --- a/src/queries/hooks/pointsVault/useGetPointsVaultRejectedUsers.ts +++ b/src/queries/hooks/pointsVault/useGetPointsVaultRejectedUsers.ts @@ -9,12 +9,13 @@ export const useGetPointsVaultRejectedUsers = ({ token, twitter, wallet, + activityTypeId, }: PointsVaultGetUsersPayload) => { return useInfiniteQuery({ queryKey: [pointsVaultRejectedUsers, `${twitter}-${wallet}`], initialPageParam: 1, queryFn: ({ pageParam }) => - getPointsVaultUsers({ status, page: pageParam as number, pageSize, token, twitter, wallet }), + getPointsVaultUsers({ status, page: pageParam as number, pageSize, token, twitter, wallet, activityTypeId }), getNextPageParam: ({ page, total }) => { if (page >= total) { return null; diff --git a/src/queries/services/pointsVault/getPointsVaultUsers.ts b/src/queries/services/pointsVault/getPointsVaultUsers.ts index 5c3d599dec..9975a5ce2b 100644 --- a/src/queries/services/pointsVault/getPointsVaultUsers.ts +++ b/src/queries/services/pointsVault/getPointsVaultUsers.ts @@ -3,7 +3,15 @@ import { getRewardsBaseURL } from 'queries/baseURL'; import { getPVUsersModelCreator } from 'queries/models'; import { PointsVaultGetUsersPayload } from 'queries/types'; -export const getPointsVaultUsers = ({ page, status, pageSize, token, wallet, twitter }: PointsVaultGetUsersPayload) => +export const getPointsVaultUsers = ({ + page, + status, + pageSize, + token, + wallet, + twitter, + activityTypeId, +}: PointsVaultGetUsersPayload) => axios({ method: 'GET', url: `${getRewardsBaseURL()}/activities/list`, @@ -13,6 +21,7 @@ export const getPointsVaultUsers = ({ page, status, pageSize, token, wallet, twi pageSize, wallet, twitter, + activityTypeId, }, headers: { 'Content-Type': 'application/json', diff --git a/src/queries/types/pointsVault.ts b/src/queries/types/pointsVault.ts index f1eb2085b7..0a2fb9985e 100644 --- a/src/queries/types/pointsVault.ts +++ b/src/queries/types/pointsVault.ts @@ -1,3 +1,5 @@ +import { ActvityType } from './rewards'; + export type PointsVaultStatus = 'COMPLETED' | 'PENDING' | 'REJECTED'; export type PointsVaultGetUsersPayload = { @@ -7,6 +9,7 @@ export type PointsVaultGetUsersPayload = { token: string; twitter?: string; wallet?: string; + activityTypeId?: ActvityType; }; export type PointsVaultActivity = {