Merge branch 'main' into update-favorite-chain-ui

KyberNetwork · Nov 10, 2023 · 1907f7c · 1907f7c
2 parents 516733f + 0bb30ea
commit 1907f7c
Show file tree

Hide file tree

Showing 35 changed files with 308 additions and 151 deletions.
diff --git a/index.html b/index.html
@@ -58,6 +58,65 @@
         s.parentNode.insertBefore(g, s)
       })()
   </script>
+
+  <script>
+    !(function () {
+      var analytics = (window.analytics = window.analytics || [])
+      if (!analytics.initialize)
+        if (analytics.invoked) window.console && console.error && console.error('Segment snippet included twice.')
+        else {
+          analytics.invoked = !0
+          analytics.methods = [
+            'trackSubmit',
+            'trackClick',
+            'trackLink',
+            'trackForm',
+            'pageview',
+            'identify',
+            'reset',
+            'group',
+            'track',
+            'ready',
+            'alias',
+            'debug',
+            'page',
+            'once',
+            'off',
+            'on',
+            'addSourceMiddleware',
+            'addIntegrationMiddleware',
+            'setAnonymousId',
+            'addDestinationMiddleware',
+          ]
+          analytics.factory = function (e) {
+            return function () {
+              if (window.analytics.initialized) return window.analytics[e].apply(window.analytics, arguments)
+              var i = Array.prototype.slice.call(arguments)
+              i.unshift(e)
+              analytics.push(i)
+              return analytics
+            }
+          }
+          for (var i = 0; i < analytics.methods.length; i++) {
+            var key = analytics.methods[i]
+            analytics[key] = analytics.factory(key)
+          }
+          analytics.load = function (key, i) {
+            var t = document.createElement('script')
+            t.type = 'text/javascript'
+            t.async = !0
+            t.src = '/libs/red2.js'
+            var n = document.getElementsByTagName('script')[0]
+            n.parentNode.insertBefore(t, n)
+            analytics._loadOptions = i
+          }
+          analytics._writeKey = 'DgnqvAHbWsKaPnkdvC19EMC8DbXh1G52'
+          analytics.SNIPPET_VERSION = '4.16.1'
+          analytics.load('DgnqvAHbWsKaPnkdvC19EMC8DbXh1G52')
+          analytics.page()
+        }
+    })()
+  </script>
 </head>
 
 <body>
@@ -220,64 +279,6 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-  <script>
-    !(function () {
-      var analytics = (window.analytics = window.analytics || [])
-      if (!analytics.initialize)
-        if (analytics.invoked) window.console && console.error && console.error('Segment snippet included twice.')
-        else {
-          analytics.invoked = !0
-          analytics.methods = [
-            'trackSubmit',
-            'trackClick',
-            'trackLink',
-            'trackForm',
-            'pageview',
-            'identify',
-            'reset',
-            'group',
-            'track',
-            'ready',
-            'alias',
-            'debug',
-            'page',
-            'once',
-            'off',
-            'on',
-            'addSourceMiddleware',
-            'addIntegrationMiddleware',
-            'setAnonymousId',
-            'addDestinationMiddleware',
-          ]
-          analytics.factory = function (e) {
-            return function () {
-              if (window.analytics.initialized) return window.analytics[e].apply(window.analytics, arguments)
-              var i = Array.prototype.slice.call(arguments)
-              i.unshift(e)
-              analytics.push(i)
-              return analytics
-            }
-          }
-          for (var i = 0; i < analytics.methods.length; i++) {
-            var key = analytics.methods[i]
-            analytics[key] = analytics.factory(key)
-          }
-          analytics.load = function (key, i) {
-            var t = document.createElement('script')
-            t.type = 'text/javascript'
-            t.async = !0
-            t.src = '/libs/red2.js'
-            var n = document.getElementsByTagName('script')[0]
-            n.parentNode.insertBefore(t, n)
-            analytics._loadOptions = i
-          }
-          analytics._writeKey = 'DgnqvAHbWsKaPnkdvC19EMC8DbXh1G52'
-          analytics.SNIPPET_VERSION = '4.16.1'
-          analytics.load('DgnqvAHbWsKaPnkdvC19EMC8DbXh1G52')
-          analytics.page()
-        }
-    })()
-  </script>
 </body>
 
 </html>
diff --git a/src/components/ElasticZap/QuickZap.tsx b/src/components/ElasticZap/QuickZap.tsx
@@ -1,8 +1,9 @@
 import { FeeAmount, Pool, Position } from '@kyberswap/ks-sdk-elastic'
 import { Trans } from '@lingui/macro'
 import { BigNumber } from 'ethers'
+import mixpanel from 'mixpanel-browser'
 import { rgba } from 'polished'
-import { ReactElement, useMemo, useState } from 'react'
+import { ReactElement, useEffect, useMemo, useState } from 'react'
 import { Flex, Text } from 'rebass'
 import styled from 'styled-components'
 
@@ -231,6 +232,20 @@ function QuickZapModal({ isOpen, onDismiss, poolAddress, tokenId, expectedChainI
   const debouncedValue = useDebounce(typedValue, 300)
 
   const amountIn = useParsedAmount(selectedCurrency, debouncedValue)
+
+  useEffect(() => {
+    if (amountIn?.toExact()) {
+      mixpanel.track('Zap - Input detailed', {
+        token0: selectedCurrency?.symbol,
+        token1: quoteCurrency?.symbol,
+        zap_token: selectedCurrency?.symbol,
+        token_amount: amountIn.toExact(),
+        source: tokenId ? 'my_pool_page' : 'pool_page',
+      })
+    }
+    // eslint-disable-next-line
+  }, [amountIn?.toExact(), selectedCurrency])
+
   const equivalentQuoteAmount =
     amountIn && pool && selectedCurrency && amountIn.multiply(pool.priceOf(selectedCurrency.wrapped))
 
@@ -376,6 +391,13 @@ function QuickZapModal({ isOpen, onDismiss, poolAddress, tokenId, expectedChainI
         })
 
         setAttempingTx(false)
+        mixpanel.track('Zap - Confirmed', {
+          token0: selectedCurrency?.symbol,
+          token1: quoteCurrency?.symbol,
+          zap_token: selectedCurrency?.symbol,
+          token_amount: amountIn.toExact(),
+          source: tokenId ? 'my_pool_page' : 'pool_page',
+        })
       } catch (e) {
         setAttempingTx(false)
         setError(e?.message || JSON.stringify(e))
@@ -545,13 +567,23 @@ function QuickZapModal({ isOpen, onDismiss, poolAddress, tokenId, expectedChainI
               </Overlay>
 
               <Flex sx={{ gap: '1rem' }} marginTop="1.25rem">
-                <ButtonOutlined onClick={onDismiss}>
+                <ButtonOutlined
+                  onClick={() => {
+                    mixpanel.track('Zap - Canceled', {
+                      source: tokenId ? 'my_pool_page' : 'pool_page',
+                      token0: pool?.token0.symbol,
+                      token1: pool?.token1.symbol,
+                      zap_token: selectedCurrency?.symbol,
+                    })
+                    onDismiss()
+                  }}
+                >
                   <Trans>Cancel</Trans>
                 </ButtonOutlined>
 
                 {!account ? (
                   <ButtonLight onClick={toggleWalletModal}>
-                    <Trans>Connect Wallet</Trans>
+                    <Trans>Connect</Trans>
                   </ButtonLight>
                 ) : expectedChainId && expectedChainId !== chainId ? (
                   <ButtonPrimary onClick={() => changeNetwork(expectedChainId)}>Switch Network</ButtonPrimary>

diff --git a/src/components/ElasticZap/ZapDetail.tsx b/src/components/ElasticZap/ZapDetail.tsx
@@ -123,6 +123,15 @@ export const useZapDetail = ({
     newPooledAmount1 = newPooledAmount1.add(position.amount1)
   }
 
+  const remainAmount0 =
+    pool?.token0 &&
+    result?.remainingAmount0 &&
+    CurrencyAmount.fromRawAmount(pool.token0, result.remainingAmount0.toString())
+  const remainAmount1 =
+    pool?.token1 &&
+    result?.remainingAmount1 &&
+    CurrencyAmount.fromRawAmount(pool.token1, result.remainingAmount1.toString())
+
   const prices = useTokenPrices(
     [WETH[chainId].address, currency0?.wrapped.address, currency1?.wrapped.address].filter(Boolean) as string[],
   )
@@ -137,16 +146,22 @@ export const useZapDetail = ({
 
   const amountInUsd = +(amountIn?.toExact() || '0') * (prices[amountIn?.currency?.wrapped.address || ''] || 0)
 
-  const amountUSDAfterSwap =
+  const remainAmountUsd =
     currency0 && currency1
+      ? +(remainAmount0?.toExact() || 0) * (prices[currency0.wrapped.address] || 0) +
+        +(remainAmount1?.toExact() || 0) * (prices[currency1.wrapped.address] || 0)
+      : 0
+
+  const amountUsdAfterSwap =
+    (currency0 && currency1
       ? +(newPooledAmount0?.toExact() || 0) * (prices[currency0.wrapped.address] || 0) +
         +(newPooledAmount1?.toExact() || 0) * (prices[currency1.wrapped.address] || 0)
-      : 0
+      : 0) + remainAmountUsd
 
   const priceImpact =
     !prices[currency0?.wrapped?.address || ''] || !prices[currency1?.wrapped?.address || '']
       ? NaN
-      : ((amountInUsd - amountUSDAfterSwap) * 100) / amountInUsd
+      : ((amountInUsd - amountUsdAfterSwap) * 100) / amountInUsd
   const priceImpactRes = checkPriceImpact(priceImpact)
 
   const [gas, setGas] = useState('') // GWei

diff --git a/src/components/SEO/index.tsx b/src/components/SEO/index.tsx
diff --git a/src/components/SwapForm/SwapModal/SwapDetails/index.tsx b/src/components/SwapForm/SwapModal/SwapDetails/index.tsx
@@ -109,6 +109,8 @@ export default function SwapDetails({
 
   const isPartnerSwap = window.location.pathname.includes(APP_PATHS.PARTNER_SWAP)
 
+  const feeAmount = routeSummary?.extraFee?.feeAmount
+
   return (
     <>
       <AutoColumn
@@ -247,7 +249,7 @@ export default function SwapDetails({
           </RowBetween>
         )}
 
-        {!!routeSummary?.extraFee?.feeAmount && (
+        {!!feeAmount && feeAmount !== '0' && (
           <RowBetween height="20px" style={{ gap: '16px' }}>
             <RowFixed>
               <TextDashed fontSize={12} fontWeight={400} color={theme.subText}>

diff --git a/src/components/SwapForm/hooks/useBuildRoute.tsx b/src/components/SwapForm/hooks/useBuildRoute.tsx
@@ -61,7 +61,7 @@ const useBuildRoute = (args: Args) => {
       slippageTolerance: slippage,
       sender: account,
       recipient: to || account,
-      source: clientId || 'kyberswap-ui',
+      source: clientId || 'kyberswap',
       skipSimulateTx: false,
       permit,
     }

diff --git a/src/components/SwapForm/index.tsx b/src/components/SwapForm/index.tsx
@@ -13,9 +13,9 @@ import AddressInputPanel from 'components/AddressInputPanel'
 import { Clock } from 'components/Icons'
 import { AutoRow } from 'components/Row'
 import SlippageWarningNote from 'components/SlippageWarningNote'
-import GasFeeAndPriceImpactNote from 'components/SwapForm/GasPriceNote'
 import InputCurrencyPanel from 'components/SwapForm/InputCurrencyPanel'
 import OutputCurrencyPanel from 'components/SwapForm/OutputCurrencyPanel'
+import PriceImpactNote from 'components/SwapForm/PriceImpactNote'
 import SlippageSettingGroup from 'components/SwapForm/SlippageSettingGroup'
 import { SwapFormContextProvider } from 'components/SwapForm/SwapFormContext'
 import useBuildRoute from 'components/SwapForm/hooks/useBuildRoute'
@@ -264,11 +264,7 @@ const SwapForm: React.FC<SwapFormProps> = props => {
 
           {!isWrapOrUnwrap && <SlippageWarningNote rawSlippage={slippage} isStablePairSwap={isStablePairSwap} />}
 
-          <GasFeeAndPriceImpactNote
-            gasUsd={routeSummary?.gasUsd}
-            priceImpact={routeSummary?.priceImpact}
-            isDegenMode={isDegenMode}
-          />
+          <PriceImpactNote priceImpact={routeSummary?.priceImpact} isDegenMode={isDegenMode} />
           <MultichainKNCNote currencyIn={currencyIn} currencyOut={currencyOut} />
 
           <SwapActionButton

diff --git a/src/components/YieldPools/ElasticFarmGroup/FarmCard.tsx b/src/components/YieldPools/ElasticFarmGroup/FarmCard.tsx
@@ -21,6 +21,7 @@ import { PartnerFarmTag } from 'components/YieldPools/PartnerFarmTag'
 import { APP_PATHS, ELASTIC_BASE_FEE_UNIT } from 'constants/index'
 import { TOBE_EXTENDED_FARMING_POOLS } from 'constants/v2'
 import { useActiveWeb3React } from 'hooks'
+import { useAllTokens } from 'hooks/Tokens'
 import useTheme from 'hooks/useTheme'
 import { useShareFarmAddress } from 'state/farms/classic/hooks'
 import { FarmingPool, NFTPosition } from 'state/farms/elastic/types'
@@ -73,6 +74,7 @@ const FarmCard = ({
   targetPercent,
   targetPercentByNFT,
 }: Props) => {
+  const allTokens = useAllTokens()
   const { chainId, networkInfo } = useActiveWeb3React()
   const [isRevertPrice, setIsRevertPrice] = useState(false)
   const theme = useTheme()
@@ -104,8 +106,16 @@ const FarmCard = ({
     pos => pos.pool.tickCurrent >= pos.tickLower && pos.pool.tickCurrent < pos.tickUpper,
   ).length
 
-  const token0Symbol = getTokenSymbolWithHardcode(chainId, pool?.token0?.wrapped?.address, pool.token0.symbol)
-  const token1Symbol = getTokenSymbolWithHardcode(chainId, pool?.token1?.wrapped?.address, pool.token1.symbol)
+  const token0Symbol = getTokenSymbolWithHardcode(
+    chainId,
+    pool?.token0?.wrapped?.address,
+    pool.token0.isNative ? pool.token0.symbol : allTokens[pool.token0.wrapped.address]?.symbol || pool.token0.symbol,
+  )
+  const token1Symbol = getTokenSymbolWithHardcode(
+    chainId,
+    pool?.token1?.wrapped?.address,
+    pool.token1.isNative ? pool.token1.symbol : allTokens[pool.token1.wrapped.address]?.symbol || pool.token1.symbol,
+  )
 
   return (
     <FlipCard flip={showPosition} joined={!!depositedPositions.length} data-testid={pool.id}>

diff --git a/src/components/YieldPools/ElasticFarmGroup/Row.tsx b/src/components/YieldPools/ElasticFarmGroup/Row.tsx
@@ -21,6 +21,7 @@ import { PartnerFarmTag } from 'components/YieldPools/PartnerFarmTag'
 import { APP_PATHS, ELASTIC_BASE_FEE_UNIT } from 'constants/index'
 import { TOBE_EXTENDED_FARMING_POOLS } from 'constants/v2'
 import { useActiveWeb3React } from 'hooks'
+import { useAllTokens } from 'hooks/Tokens'
 import { useProMMFarmReadingContract } from 'hooks/useContract'
 import { useProAmmPositions } from 'hooks/useProAmmPositions'
 import useTheme from 'hooks/useTheme'
@@ -66,6 +67,7 @@ const Row = ({
   onHarvest: () => void
   tokenPrices: { [key: string]: number }
 }) => {
+  const allTokens = useAllTokens()
   const { chainId, networkInfo, account } = useActiveWeb3React()
   const theme = useTheme()
   const currentTimestamp = Math.floor(Date.now() / 1000)
@@ -306,8 +308,20 @@ const Row = ({
     </Flex>
   )
 
-  const symbol0 = getTokenSymbolWithHardcode(chainId, farmingPool.token0.wrapped.address, farmingPool.token0.symbol)
-  const symbol1 = getTokenSymbolWithHardcode(chainId, farmingPool.token1.wrapped.address, farmingPool.token1.symbol)
+  const symbol0 = getTokenSymbolWithHardcode(
+    chainId,
+    farmingPool.token0.wrapped.address,
+    farmingPool.token0.isNative
+      ? farmingPool.token0.symbol
+      : allTokens[farmingPool.token0.wrapped.address]?.symbol || farmingPool.token0.symbol,
+  )
+  const symbol1 = getTokenSymbolWithHardcode(
+    chainId,
+    farmingPool.token1.wrapped.address,
+    farmingPool.token1.isNative
+      ? farmingPool.token1.symbol
+      : allTokens[farmingPool.token1.wrapped.address]?.symbol || farmingPool.token1.symbol,
+  )
 
   return (
     <RowWrapper isOpen={rowOpen && !!depositedPositions.length} data-testid={farmingPool.id}>