Minor improvement and bugfix (#2276)

* feat: add x-client-id to aggregator * fix: classic zap crash * feat: hide disclaimer token for erc20 standard * switch to addresses query * fix: classic not working * Update pr.yaml
KyberNetwork · Oct 4, 2023 · 5f08d10 · 5f08d10
1 parent 69384a0
commit 5f08d10
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 20 deletions.
diff --git a/src/hooks/useContract.ts b/src/hooks/useContract.ts
@@ -45,16 +45,19 @@ export function useContract(
 ): Contract | null {
   const { account, isEVM } = useActiveWeb3React()
   const { library } = useWeb3React()
+  const { readProvider } = useKyberSwapConfig()
+
+  const lib = useMemo(() => (account ? library : readProvider), [account, library, readProvider])
 
   return useMemo(() => {
-    if (!isEVM || !address || !ABI || !library) return null
+    if (!isEVM || !address || !ABI || !lib) return null
     try {
-      return getContract(address, ABI, library, withSignerIfPossible && account ? account : undefined)
+      return getContract(address, ABI, lib as any, withSignerIfPossible && account ? account : undefined)
     } catch (error) {
       console.error('Failed to get contract', error)
       return null
     }
-  }, [address, ABI, library, withSignerIfPossible, account, isEVM])
+  }, [address, ABI, lib, withSignerIfPossible, account, isEVM])
 }
 
 export function useContractForReading(

diff --git a/src/hooks/useZap.ts b/src/hooks/useZap.ts
@@ -104,10 +104,11 @@ export const useZapInAmounts = (
         if (tokenIn && tokenOut && pool && userIn?.gt(0)) {
           const amounts = await calculateZapInAmounts(tokenIn, tokenOut, pool, userIn)
 
-          setResult({
-            amounts,
-            error: undefined,
-          })
+          if (amounts)
+            setResult({
+              amounts,
+              error: undefined,
+            })
         }
       } catch (err) {
         setResult({

diff --git a/src/pages/AddLiquidity/TokenPair.tsx b/src/pages/AddLiquidity/TokenPair.tsx
@@ -672,7 +672,11 @@ const TokenPair = ({
               </Warning>
             )}
 
-            <DisclaimerERC20 href="https://docs.kyberswap.com/liquidity-solutions/kyberswap-elastic/user-guides/add-liquidity-to-an-existing-elastic-pool#non-standard-tokens" />
+            <DisclaimerERC20
+              href="https://docs.kyberswap.com/liquidity-solutions/kyberswap-elastic/user-guides/add-liquidity-to-an-existing-elastic-pool#non-standard-tokens"
+              token0={currencyA?.wrapped.address || ''}
+              token1={currencyB?.wrapped.address || ''}
+            />
 
             <div style={{ marginBottom: '1.5rem' }} />
 

diff --git a/src/pages/AddLiquidityV2/components/DisclaimerERC20.tsx b/src/pages/AddLiquidityV2/components/DisclaimerERC20.tsx
@@ -1,13 +1,29 @@
 import { Trans } from '@lingui/macro'
 import { AlertTriangle } from 'react-feather'
 import { Flex, Text } from 'rebass'
+import { useGetTokenListQuery } from 'services/ksSetting'
 
 import { WarningCard } from 'components/Card'
+import { useActiveWeb3React } from 'hooks'
 import useTheme from 'hooks/useTheme'
 import { ExternalLink } from 'theme'
 
-export default function DisclaimerERC20({ href }: { href?: string }) {
+export default function DisclaimerERC20({ href, token0, token1 }: { href?: string; token0: string; token1: string }) {
   const theme = useTheme()
+  const { chainId } = useActiveWeb3React()
+  const { data } = useGetTokenListQuery(
+    {
+      chainId,
+      addresses: `${token0},${token1}`,
+    },
+    {
+      skip: !token0 || !token1,
+    },
+  )
+
+  const hide = data?.data?.tokens?.[0]?.isStandardERC20 && data?.data?.tokens?.[1]?.isStandardERC20
+  if (hide) return null
+
   return (
     <WarningCard padding="10px 16px">
       <Flex alignItems="center" sx={{ gap: '12px' }} lineHeight={1.5}>

diff --git a/src/pages/AddLiquidityV2/index.tsx b/src/pages/AddLiquidityV2/index.tsx
@@ -1629,9 +1629,11 @@ export default function AddLiquidity() {
                     <Flex>{warnings}</Flex>
                   </Row>
                 )}
-                <Flex maxWidth={chartRef?.current?.clientWidth} alignSelf="flex-end">
-                  <DisclaimerERC20 />
-                </Flex>
+                {tokenA && tokenB && (
+                  <Flex maxWidth={chartRef?.current?.clientWidth} alignSelf="flex-end">
+                    <DisclaimerERC20 token0={tokenA.address} token1={tokenB.address} />
+                  </Flex>
+                )}
 
                 <Row justify="flex-end">
                   <Buttons />

diff --git a/src/pages/CreatePool/index.tsx b/src/pages/CreatePool/index.tsx
@@ -736,7 +736,11 @@ export default function CreatePool() {
                   </Warning>
                 )}
 
-                <DisclaimerERC20 href="https://docs.kyberswap.com/liquidity-solutions/kyberswap-classic/user-guides/classic-pool-creation#non-standard-tokens" />
+                <DisclaimerERC20
+                  href="https://docs.kyberswap.com/liquidity-solutions/kyberswap-classic/user-guides/classic-pool-creation#non-standard-tokens"
+                  token0={currencyA?.wrapped.address || ''}
+                  token1={currencyB?.wrapped.address || ''}
+                />
 
                 {!account ? (
                   <ButtonLight onClick={toggleWalletModal}>

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/ksSetting.ts b/src/services/ksSetting.ts
@@ -98,7 +98,15 @@ const ksSettingApi = createApi({
 
     getTokenList: builder.query<
       TokenListResponse,
-      { chainId: number; page?: number; pageSize?: number; isWhitelisted?: boolean; isStable?: boolean }
+      {
+        chainId: number
+        page?: number
+        pageSize?: number
+        isWhitelisted?: boolean
+        isStable?: boolean
+        query?: string
+        addresses?: string
+      }
     >({
       query: ({ chainId, ...params }) => ({
         url: `/tokens`,

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
 

diff --git a/src/state/lists/wrappedTokenInfo.ts b/src/state/lists/wrappedTokenInfo.ts
@@ -13,6 +13,7 @@ export interface TokenInfo {
   readonly isWhitelisted?: boolean // from backend
   readonly multichainInfo?: MultiChainTokenInfo // from multichain api
   readonly domainSeparator?: string
+  readonly isStandardERC20?: boolean
 }
 
 export class WrappedTokenInfo extends Token {