feat: add x-client-id to aggregator

KyberNetwork · Oct 3, 2023 · 837d838 · 837d838
1 parent 69384a0
commit 837d838
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/src/pages/Farm/ElasticFarmCombination.tsx b/src/pages/Farm/ElasticFarmCombination.tsx
@@ -111,8 +111,8 @@ export const ElasticFarmCombination: FC = () => {
           <Trans>
             Note: Farms will run in{' '}
             <Text as="span" color={theme.warning}>
-              multiple phases
-            </Text>
+              multiple phases.
+            </Text>{' '}
             If you haven’t harvested your rewards for ended farms, you still can access them via the{' '}
             <StyledInternalLink to={`${APP_PATHS.FARMS}/${networkInfo.route}?type=${FARM_TAB.ENDED}`}>
               Ended

diff --git a/src/services/baseQueryOauth.ts b/src/services/baseQueryOauth.ts
@@ -1,4 +1,5 @@
 import { KyberOauth2Api } from '@kybernetwork/oauth2'
+import { FetchBaseQueryArgs } from '@reduxjs/toolkit/dist/query/fetchBaseQuery'
 import { BaseQueryFn, fetchBaseQuery } from '@reduxjs/toolkit/query'
 import axios from 'axios'
 
@@ -33,11 +34,11 @@ const baseQueryOauth =
 
 // same as baseQueryOauth, but has flag to revert if meet incident
 export const baseQueryOauthDynamic =
-  ({ baseUrl = '' }: { baseUrl?: string }): BaseQueryFn =>
+  ({ baseUrl = '', ...baseFetchOption }: FetchBaseQueryArgs): BaseQueryFn =>
   async (args, WebApi, extraOptions) => {
     if (!args.authentication) {
       // to quickly revert if meet incident
-      const rawBaseQuery = fetchBaseQuery({ baseUrl })
+      const rawBaseQuery = fetchBaseQuery({ baseUrl, ...baseFetchOption })
       return rawBaseQuery(args, WebApi, extraOptions)
     }
     return queryWithTokenAndTracking(args, baseUrl)

diff --git a/src/services/route/index.ts b/src/services/route/index.ts
@@ -6,7 +6,9 @@ import { GetRouteParams, GetRouteResponse } from './types/getRoute'
 
 const routeApi = createApi({
   reducerPath: 'routeApi',
-  baseQuery: baseQueryOauthDynamic({ baseUrl: '' }),
+  baseQuery: baseQueryOauthDynamic({
+    baseUrl: '',
+  }),
   endpoints: builder => ({
     getRoute: builder.query<
       GetRouteResponse,
@@ -20,6 +22,9 @@ const routeApi = createApi({
         url,
         params,
         authentication,
+        headers: {
+          'x-client-id': 'kyberswap',
+        },
       }),
     }),
     buildRoute: builder.mutation<
@@ -32,6 +37,9 @@ const routeApi = createApi({
         body: payload,
         signal,
         authentication,
+        headers: {
+          'x-client-id': 'kyberswap',
+        },
       }),
     }),
   }),

diff --git a/src/state/farms/elasticv2/hooks.ts b/src/state/farms/elasticv2/hooks.ts
@@ -70,7 +70,7 @@ export const useFilteredFarmsV2 = (farmAddress?: string) => {
   const updatedFarms = useMemo(() => {
     const newFarms = farms
       ?.filter(farm => {
-        if (farm?.endTime < Date.now() / 1000) return false
+        if (farm?.endTime < Date.now() / 1000 || farm?.isSettled) return false
         const isUserJoinThisFarm = userInfo?.find(item => item.fId === farm.fId)
         if (!isUserJoinThisFarm) return false