From ca1c8fdf46e7e209bddcd35493ef506af024ff7b Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Wed, 13 Sep 2023 16:18:35 +0700 Subject: [PATCH 01/13] improvement: subscript decimals (#2219) --- package.json | 3 +- .../EarningAreaChart/TooltipContent.tsx | 36 +--- src/components/EarningAreaChart/index.tsx | 49 +---- src/components/EarningAreaChart/utils.ts | 19 -- src/components/EarningPieChart/index.tsx | 39 +--- src/components/Header/web3/SelectNetwork.tsx | 10 +- .../ProAmm/ProAmmPriceRangeConfirm.tsx | 4 +- src/components/SwapForm/TradeSummary.tsx | 16 +- .../YieldPools/FarmingPoolAPRCell.tsx | 13 +- src/components/swapv2/TradePrice.tsx | 3 +- src/constants/index.ts | 9 +- .../AddLiquidityV2/components/NewPoolNote.tsx | 12 +- src/pages/AddLiquidityV2/index.tsx | 43 +++-- src/pages/Bridge/helpers.ts | 1 + .../LeaderBoardSection/index.tsx | 15 +- .../GrantProgram/SingleProgram/Stats.tsx | 17 +- .../ClassicPools/SinglePool/Position.tsx | 41 ++--- .../ClassicPools/SinglePool/index.tsx | 65 +++++-- .../MyEarnings/EarningsBreakdownPanel.tsx | 4 +- .../ElasticPools/SinglePool/index.tsx | 64 +++++-- .../SinglePosition/EarningView.tsx | 15 +- .../SinglePosition/PositionView.tsx | 12 +- src/pages/MyEarnings/HoverDropdown.tsx | 2 +- src/pages/MyEarnings/PoolEarningsSection.tsx | 7 +- src/pages/MyEarnings/ShareModal.tsx | 15 +- .../TotalEarningsAndChainSelect.tsx | 24 +-- src/utils/fee.ts | 8 +- src/utils/firebase.ts | 1 - src/utils/formatCurrencyAmount.tsx | 3 + src/utils/formatTickPrice.ts | 4 +- src/utils/index.ts | 3 + src/utils/numbers.ts | 171 +++++++++++++++++- yarn.lock | 78 +------- 33 files changed, 420 insertions(+), 386 deletions(-) delete mode 100644 src/components/EarningAreaChart/utils.ts diff --git a/package.json b/package.json index cf574679da..c26978d999 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,6 @@ "@types/big.js": "^6.0.0", "@types/crypto-js": "4.1.1", "@types/d3": "^7.1.0", - "@types/jest": "^25.2.1", "@types/mixpanel-browser": "^2.38.0", "@types/multicodec": "^1.0.0", "@types/node": "^13.13.52", @@ -206,4 +205,4 @@ "@lingui/core": "3.14.0", "@lingui/conf": "3.16.0" } -} +} \ No newline at end of file diff --git a/src/components/EarningAreaChart/TooltipContent.tsx b/src/components/EarningAreaChart/TooltipContent.tsx index 1f49820110..f3367de4f2 100644 --- a/src/components/EarningAreaChart/TooltipContent.tsx +++ b/src/components/EarningAreaChart/TooltipContent.tsx @@ -7,26 +7,7 @@ import styled from 'styled-components' import Logo, { NetworkLogo } from 'components/Logo' import useTheme from 'hooks/useTheme' import { EarningStatsTick } from 'types/myEarnings' -import { formattedNum } from 'utils' - -const formatUSDValue = (v: number) => { - if (v === 0) { - return '$0' - } - - if (v < 0.0001) { - return '< $0.0001' - } - - const formatter = Intl.NumberFormat('en-US', { - style: 'currency', - currency: 'USD', - notation: 'compact', - maximumSignificantDigits: 4, - }) - - return formatter.format(v) -} +import { formatDisplayNumber } from 'utils/numbers' const TokensWrapper = styled.div` display: flex; @@ -37,10 +18,6 @@ const TokensWrapper = styled.div` font-weight: 500; ` -const formatTokenAmount = (a: number | string) => { - return formattedNum(String(a), false) -} - type TokensProps = { tokens: EarningStatsTick['tokens'] } @@ -102,7 +79,7 @@ const Tokens: React.FC = ({ tokens }) => { lineHeight: '14px', }} > - {formatTokenAmount(token.amount)} + {formatDisplayNumber(token.amount, { significantDigits: 6 })} ) @@ -176,7 +153,8 @@ const TooltipContent: React.FC = ({ dataEntry, setHoverValue }) => { whiteSpace: 'nowrap', }} > - My Total Earnings: {formatUSDValue(dataEntry.totalValue)} + My Total Earnings:{' '} + {formatDisplayNumber(dataEntry.totalValue, { style: 'currency', significantDigits: 6 })} = ({ dataEntry, setHoverValue }) => { whiteSpace: 'nowrap', }} > - Pool Fees: {formatUSDValue(dataEntry.poolFeesValue)} + Pool Fees:{' '} + {formatDisplayNumber(dataEntry.poolFeesValue, { style: 'currency', significantDigits: 6 })} = ({ dataEntry, setHoverValue }) => { whiteSpace: 'nowrap', }} > - Farm Rewards: {formatUSDValue(dataEntry.farmRewardsValue)} + Farm Rewards:{' '} + {formatDisplayNumber(dataEntry.farmRewardsValue, { style: 'currency', significantDigits: 6 })} = { ['7D']: isMobile ? 2 : 1, @@ -36,53 +35,13 @@ const CustomizedLabel = (props: any) => { fill={theme.subText} textAnchor="middle" > - {formatUSDValue(value)} + {formatDisplayNumber(value, { style: 'currency', fractionDigits: 3 })} )} ) } -const subscriptMap: { [key: string]: string } = { - '0': '₀', - '1': '₁', - '2': '₂', - '3': '₃', - '4': '₄', - '5': '₅', - '6': '₆', - '7': '₇', - '8': '₈', - '9': '₉', -} - -const formatter = (value: string) => { - const num = parseFloat(value) - const numberOfZero = -Math.floor(Math.log10(num) + 1) - - if (num > 0 && num < 1 && numberOfZero > 2) { - const temp = Number(toFixed(num).split('.')[1]).toString() - - return `$0.0${numberOfZero - .toString() - .split('') - .map(item => subscriptMap[item]) - .join('')}${temp.substring(0, 2)}` - } - - const formatter = Intl.NumberFormat('en-US', { - notation: num >= 1000 ? 'compact' : 'standard', - style: 'currency', - currency: 'USD', - minimumFractionDigits: 0, - maximumFractionDigits: 2, - minimumSignificantDigits: 1, - maximumSignificantDigits: 2, - }) - - return formatter.format(num) -} - type Props = { period: TimePeriod setHoverValue?: React.Dispatch> @@ -123,7 +82,9 @@ const EarningAreaChart: React.FC = ({ data, setHoverValue = EMPTY_FUNCTIO axisLine={false} tickLine={false} stroke={theme.subText} - tickFormatter={(value: any, _index: number) => formatter(String(value))} + tickFormatter={(value: any, _index: number) => + formatDisplayNumber(value, { style: 'currency', fractionDigits: 2 }) + } width={54} /> diff --git a/src/components/EarningAreaChart/utils.ts b/src/components/EarningAreaChart/utils.ts deleted file mode 100644 index 2c7cc4c85d..0000000000 --- a/src/components/EarningAreaChart/utils.ts +++ /dev/null @@ -1,19 +0,0 @@ -export const formatUSDValue = (v: number, compact = true): string => { - if (v === 0) { - return '$0' - } - - if (v < 0.01) { - return '< $0.01' - } - - const formatter = Intl.NumberFormat('en-US', { - style: 'currency', - currency: 'USD', - notation: compact ? 'compact' : 'standard', - minimumFractionDigits: 0, - maximumFractionDigits: 2, - }) - - return formatter.format(v) -} diff --git a/src/components/EarningPieChart/index.tsx b/src/components/EarningPieChart/index.tsx index 604f3ab20b..26dca83f20 100644 --- a/src/components/EarningPieChart/index.tsx +++ b/src/components/EarningPieChart/index.tsx @@ -11,41 +11,7 @@ import Logo, { NetworkLogo } from 'components/Logo' import { EMPTY_ARRAY } from 'constants/index' import useTheme from 'hooks/useTheme' import { Loading } from 'pages/ProAmmPool/ContentLoader' - -const formatUSDValue = (v: string) => { - const num = Number(v) - - if (num === 0) { - return '$0' - } - - if (num < 0.01) { - return '< $0.01' - } - - const formatter = Intl.NumberFormat('en-US', { - notation: 'compact', - style: 'currency', - currency: 'USD', - minimumFractionDigits: 0, - maximumFractionDigits: num < 0.1 ? 2 : 1, - }) - - return formatter.format(num) -} - -const formatPercent = (num: number) => { - if (num < 0.01) { - return '< 0.01%' - } - - const formatter = Intl.NumberFormat('en-US', { - minimumFractionDigits: 0, - maximumFractionDigits: 2, - }) - - return formatter.format(num) + '%' -} +import { formatDisplayNumber } from 'utils/numbers' const LegendsWrapper = styled.div` display: flex; @@ -179,7 +145,8 @@ const Legend: React.FC = ({ whiteSpace: 'nowrap', }} > - {formatUSDValue(value)} ({formatPercent(percent)}) + {formatDisplayNumber(value, { style: 'currency', fractionDigits: 2 })} ( + {formatDisplayNumber(percent / 100, { style: 'percent', fractionDigits: 3 })}) diff --git a/src/components/Header/web3/SelectNetwork.tsx b/src/components/Header/web3/SelectNetwork.tsx index cee6ad5043..5cb6b18179 100644 --- a/src/components/Header/web3/SelectNetwork.tsx +++ b/src/components/Header/web3/SelectNetwork.tsx @@ -16,6 +16,7 @@ import { ApplicationModal } from 'state/application/actions' import { useModalOpen, useNetworkModalToggle } from 'state/application/hooks' import { useIsDarkMode } from 'state/user/hooks' import { useNativeBalance } from 'state/wallet/hooks' +import { formatDisplayNumber } from 'utils/numbers' const NetworkSwitchContainer = styled.div` display: flex; @@ -74,13 +75,8 @@ function SelectNetwork(): JSX.Element | null { const userEthBalance = useNativeBalance() const labelContent = useMemo(() => { if (!userEthBalance) return networkInfo.name - const balanceFixedStr = userEthBalance.lessThan(1000 * 10 ** NativeCurrencies[chainId].decimals) // less than 1000 - ? userEthBalance.lessThan(10 ** NativeCurrencies[chainId].decimals) // less than 1 - ? parseFloat(userEthBalance.toSignificant(6)).toFixed(6) - : parseFloat(userEthBalance.toExact()).toFixed(4) - : parseFloat(userEthBalance.toExact()).toFixed(2) - const balanceFixed = Number(balanceFixedStr) - return `${balanceFixed} ${NativeCurrencies[chainId].symbol}` + const balanceFixedStr = formatDisplayNumber(userEthBalance, { significantDigits: 6 }) + return `${balanceFixedStr} ${NativeCurrencies[chainId].symbol}` }, [userEthBalance, chainId, networkInfo]) const walletSupportsChain = useWalletSupportedChains() const disableSelectNetwork = walletSupportsChain.length <= 1 diff --git a/src/components/ProAmm/ProAmmPriceRangeConfirm.tsx b/src/components/ProAmm/ProAmmPriceRangeConfirm.tsx index 6c73ef8e2b..c1a48aadcb 100644 --- a/src/components/ProAmm/ProAmmPriceRangeConfirm.tsx +++ b/src/components/ProAmm/ProAmmPriceRangeConfirm.tsx @@ -15,8 +15,8 @@ import useTheme from 'hooks/useTheme' import { Bound } from 'state/mint/proamm/type' import { useUserSlippageTolerance } from 'state/user/hooks' import { ExternalLink, TYPE } from 'theme' -import { toSignificantOrMaxIntegerPart } from 'utils/formatCurrencyAmount' import { formatTickPrice } from 'utils/formatTickPrice' +import { formatDisplayNumber } from 'utils/numbers' import { checkWarningSlippage, formatSlippage } from 'utils/slippage' import { unwrappedToken } from 'utils/wrappedCurrency' @@ -80,7 +80,7 @@ export default function ProAmmPriceRangeConfirm({ - 1 {baseCurrency.symbol} = {toSignificantOrMaxIntegerPart(price, 6)} {quoteCurrency.symbol} + 1 {baseCurrency.symbol} = {formatDisplayNumber(price, { significantDigits: 6 })} {quoteCurrency.symbol} diff --git a/src/components/SwapForm/TradeSummary.tsx b/src/components/SwapForm/TradeSummary.tsx index 6018b935dd..6bbc3825e8 100644 --- a/src/components/SwapForm/TradeSummary.tsx +++ b/src/components/SwapForm/TradeSummary.tsx @@ -20,6 +20,7 @@ import { ExternalLink, TYPE } from 'theme' import { DetailedRouteSummary } from 'types/route' import { formattedNum } from 'utils' import { minimumAmountAfterSlippage } from 'utils/currencyAmount' +import { formatDisplayNumber } from 'utils/numbers' import { checkPriceImpact, formatPriceImpact } from 'utils/prices' const IconWrapper = styled.div<{ $flip: boolean }>` @@ -64,22 +65,15 @@ const Wrapper = styled.div.attrs(props => ({ } ` -const formatPercent = (v: number) => { - const formatter = Intl.NumberFormat('en-US', { - minimumFractionDigits: 0, - maximumFractionDigits: 2, - style: 'percent', - }) - - return formatter.format(v) -} - type TooltipTextOfSwapFeeProps = { feeBips: string | undefined feeAmountText: string } export const TooltipTextOfSwapFee: React.FC = ({ feeBips, feeAmountText }) => { - const feePercent = formatPercent(Number(feeBips) / Number(BIPS_BASE.toString())) + const feePercent = formatDisplayNumber(Number(feeBips) / Number(BIPS_BASE.toString()), { + style: 'percent', + fractionDigits: 2, + }) const hereLink = ( diff --git a/src/components/YieldPools/FarmingPoolAPRCell.tsx b/src/components/YieldPools/FarmingPoolAPRCell.tsx index bebfd9565f..83c1d376a6 100644 --- a/src/components/YieldPools/FarmingPoolAPRCell.tsx +++ b/src/components/YieldPools/FarmingPoolAPRCell.tsx @@ -15,6 +15,7 @@ import { useElasticFarms } from 'state/farms/elastic/hooks' import { useTokenPrices } from 'state/tokenPrices/hooks' import { MEDIA_WIDTHS } from 'theme' import { useFarmApr } from 'utils/dmm' +import { formatDisplayNumber } from 'utils/numbers' export const APRTooltipContent = ({ poolAPR, @@ -43,7 +44,7 @@ export const APRTooltipContent = ({ Total APR:{' '} - {(poolAPR + maxFarmAPR).toFixed(2)}% + {formatDisplayNumber((poolAPR + maxFarmAPR) / 100, { style: 'percent', fractionDigits: 2 })} Pool APR:{' '} - {poolAPR.toFixed(2)}% + {formatDisplayNumber(poolAPR / 100, { style: 'percent', fractionDigits: 2 })} Farm APR:{' '} - {farmAPR.toFixed(2)}% + {formatDisplayNumber(farmAPR / 100, { style: 'percent', fractionDigits: 2 })} Farm APR:{' '} - {farmV2APR.toFixed(2)}% + {formatDisplayNumber(farmV2APR / 100, { style: 'percent', fractionDigits: 2 })} = ({ text={} > - {(poolAPR + maxFarmAPR).toFixed(2)}% + {formatDisplayNumber((poolAPR + maxFarmAPR) / 100, { style: 'percent', fractionDigits: 2 })} @@ -217,7 +218,7 @@ export const ClassicFarmingPoolAPRCell = ({ poolAPR, farm }: { poolAPR: number; gap: '4px', }} > - {(poolAPR + farmAPR).toFixed(2)}% + {formatDisplayNumber((poolAPR + farmAPR) / 100, { style: 'percent', fractionDigits: 2 })} }> diff --git a/src/components/swapv2/TradePrice.tsx b/src/components/swapv2/TradePrice.tsx index 3bb77e043f..be8b493881 100644 --- a/src/components/swapv2/TradePrice.tsx +++ b/src/components/swapv2/TradePrice.tsx @@ -7,6 +7,7 @@ import { CSSProperties } from 'styled-components' import useTheme from 'hooks/useTheme' import { useCurrencyConvertedToNative } from 'utils/dmm' +import { formatDisplayNumber } from 'utils/numbers' import { Dots, StyledBalanceMaxMini } from './styleds' @@ -23,7 +24,7 @@ export default function TradePrice({ price, label, icon, style = {}, color }: Tr const [showInverted, setShowInverted] = useState(false) let formattedPrice try { - formattedPrice = showInverted ? price?.invert()?.toSignificant(6) : price?.toSignificant(6) + formattedPrice = formatDisplayNumber(showInverted ? price?.invert() : price, { significantDigits: 7 }) } catch (error) {} const show = Boolean(price?.baseCurrency && price?.quoteCurrency && formattedPrice) diff --git a/src/constants/index.ts b/src/constants/index.ts index d0a2696b93..c71fa4e63a 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -8,7 +8,6 @@ import { TransactionFlowState } from 'types/TransactionFlowState' import { CAMPAIGN_BASE_URL as CAMPAIGN_BASE_DOMAIN } from './env' import * as ENV from './env' import { EVM_NETWORK, NETWORKS_INFO, SUPPORTED_NETWORKS, isEVM } from './networks' -import { ENV_TYPE } from './type' export const EMPTY_OBJECT: any = {} export const EMPTY_ARRAY: any[] = [] @@ -126,6 +125,8 @@ export const DEFAULT_DEADLINE_FROM_NOW = 60 * 20 // denominated in seconds export const TIME_TO_REFRESH_SWAP_RATE = 10 +export const BIG_INT_ONE = JSBI.BigInt(1) +export const BIG_INT_MINUS_ONE = JSBI.BigInt(-1) export const BIG_INT_ZERO = JSBI.BigInt(0) // one basis point @@ -261,12 +262,6 @@ export const EIP712Domain = [ { name: 'verifyingContract', type: 'address' }, ] -if (ENV.ENV_LEVEL < ENV_TYPE.PROD) { - console.groupCollapsed('ENV') - console.log(JSON.stringify(ENV, null, 4)) - console.groupEnd() -} - export const INPUT_DEBOUNCE_TIME = 300 export const ENABLE_CLICK_TO_REFRESH_GET_ROUTE = false diff --git a/src/pages/AddLiquidityV2/components/NewPoolNote.tsx b/src/pages/AddLiquidityV2/components/NewPoolNote.tsx index c67ee68be3..bf1bc4bc85 100644 --- a/src/pages/AddLiquidityV2/components/NewPoolNote.tsx +++ b/src/pages/AddLiquidityV2/components/NewPoolNote.tsx @@ -8,7 +8,7 @@ import SwitchIcon from 'components/Icons/SwitchIcon' import { RowBetween } from 'components/Row' import useTheme from 'hooks/useTheme' import { TYPE } from 'theme' -import { formattedNum } from 'utils' +import { formatDisplayNumber } from 'utils/numbers' import { Spin } from '../styled' @@ -43,10 +43,12 @@ function NewPoolNote({ maxCharacters={24} text={ !invertMarketPrice - ? `1 ${baseCurrency?.symbol} = ${formattedNum(marketPrice.toString())} ${quoteCurrency?.symbol}` - : `1 ${quoteCurrency?.symbol} = ${formattedNum((1 / marketPrice).toString())} ${ - baseCurrency?.symbol - }` + ? `1 ${baseCurrency?.symbol} = ${formatDisplayNumber(marketPrice, { + significantDigits: 6, + })} ${quoteCurrency?.symbol}` + : `1 ${quoteCurrency?.symbol} = ${formatDisplayNumber(1 / marketPrice, { + significantDigits: 6, + })} ${baseCurrency?.symbol}` } /> diff --git a/src/pages/AddLiquidityV2/index.tsx b/src/pages/AddLiquidityV2/index.tsx index a2baac7ae7..6b6de01c6f 100644 --- a/src/pages/AddLiquidityV2/index.tsx +++ b/src/pages/AddLiquidityV2/index.tsx @@ -87,9 +87,8 @@ import { ExternalLink, MEDIA_WIDTHS, StyledInternalLink, TYPE } from 'theme' import { basisPointsToPercent, calculateGasMargin, formattedNum } from 'utils' import { currencyId } from 'utils/currencyId' import { friendlyError } from 'utils/errorMessage' -import { toSignificantOrMaxIntegerPart } from 'utils/formatCurrencyAmount' import { maxAmountSpend } from 'utils/maxAmountSpend' -import { formatNotDollarAmount } from 'utils/numbers' +import { formatDisplayNumber } from 'utils/numbers' import { SLIPPAGE_STATUS, checkRangeSlippage } from 'utils/slippage' import { unwrappedToken } from 'utils/wrappedCurrency' @@ -806,10 +805,13 @@ export default function AddLiquidity() { - Note: A very small amount of your liquidity about {formattedNum(amountUnlockUSD.toString(), true)}{' '} + Note: A very small amount of your liquidity about{' '} + {formatDisplayNumber(amountUnlockUSD, { style: 'currency', significantDigits: 6 })}{' '} - ({amountUnlocks[Field.CURRENCY_A].toSignificant(6)} {amountUnlocks[Field.CURRENCY_A].currency.symbol},{' '} - {amountUnlocks[Field.CURRENCY_B].toSignificant(6)} {amountUnlocks[Field.CURRENCY_B].currency.symbol}) + ({formatDisplayNumber(amountUnlocks[Field.CURRENCY_A], { significantDigits: 6 })}{' '} + {amountUnlocks[Field.CURRENCY_A].currency.symbol},{' '} + {formatDisplayNumber(amountUnlocks[Field.CURRENCY_B], { significantDigits: 6 })}{' '} + {amountUnlocks[Field.CURRENCY_B].currency.symbol}) {' '} will be used to first initialize the pool. Read more{' '} @@ -828,17 +830,21 @@ export default function AddLiquidity() { {noLiquidity ? ( The pool’s current price of 1 {baseCurrency.symbol} ={' '} - {(invertPrice ? price.invert() : price).toSignificant(4)} {quoteCurrency.symbol} deviates from the - market price (1 {baseCurrency.symbol} ={' '} - {formatNotDollarAmount(usdPrices[tokenA.wrapped.address] / usdPrices[tokenB.wrapped.address], 4)}{' '} + {formatDisplayNumber(invertPrice ? price.invert() : price, { significantDigits: 4 })}{' '} + {quoteCurrency.symbol} deviates from the market price (1 {baseCurrency.symbol} ={' '} + {formatDisplayNumber(usdPrices[tokenA.wrapped.address] / usdPrices[tokenB.wrapped.address], { + significantDigits: 4, + })}{' '} {quoteCurrency.symbol}). You might have high impermanent loss after the pool is created ) : ( The pool’s current price of 1 {baseCurrency.symbol} ={' '} - {(invertPrice ? price.invert() : price).toSignificant(4)} {quoteCurrency.symbol} deviates from the - market price (1 {baseCurrency.symbol} ={' '} - {formatNotDollarAmount(usdPrices[tokenA.wrapped.address] / usdPrices[tokenB.wrapped.address], 4)}{' '} + {formatDisplayNumber(invertPrice ? price.invert() : price, { significantDigits: 4 })}{' '} + {quoteCurrency.symbol} deviates from the market price (1 {baseCurrency.symbol} ={' '} + {formatDisplayNumber(usdPrices[tokenA.wrapped.address] / usdPrices[tokenB.wrapped.address], { + significantDigits: 4, + })}{' '} {quoteCurrency.symbol}). You might have high impermanent loss after you add liquidity to this pool )} @@ -1094,7 +1100,9 @@ export default function AddLiquidity() { @@ -1535,11 +1543,12 @@ export default function AddLiquidity() { diff --git a/src/pages/Bridge/helpers.ts b/src/pages/Bridge/helpers.ts index 701aa5652d..d25b756b84 100644 --- a/src/pages/Bridge/helpers.ts +++ b/src/pages/Bridge/helpers.ts @@ -166,6 +166,7 @@ export const formatPoolValue = (amount: PoolBridgeValue) => { 123456789012.123456 => 123.457B 1234567890123.123456 => 1.23457T */ +// todo: deprecated, use formatDisplayNumber instead export const formatAmountBridge = (rawAmount: string) => { const amount = parseFloat(String(rawAmount) ?? '0') if (amount > 100_000_000) { diff --git a/src/pages/GrantProgram/SingleProgram/LeaderBoardSection/index.tsx b/src/pages/GrantProgram/SingleProgram/LeaderBoardSection/index.tsx index 9e0d5124b1..a12f8ea50b 100644 --- a/src/pages/GrantProgram/SingleProgram/LeaderBoardSection/index.tsx +++ b/src/pages/GrantProgram/SingleProgram/LeaderBoardSection/index.tsx @@ -7,6 +7,7 @@ import Loader from 'components/Loader' import useGetLeaderboardGrantProgram, { RankByParam } from 'hooks/campaigns/useGetLeaderboardGrantProgram' import useTheme from 'hooks/useTheme' import { ProjectRanking } from 'types/grantProgram' +import { formatDisplayNumber } from 'utils/numbers' import { HeaderText } from '../../styleds' import LeaderBoard from './LeaderBoard' @@ -25,18 +26,6 @@ const EmptyRankings: any[] = [] export const ITEMS_PER_PAGE = 5 -const formatTradingVolume = (num: number) => { - const notation = num > 100_000_000 ? 'compact' : 'standard' - const formatter = new Intl.NumberFormat('en-US', { - notation, - style: 'currency', - currency: 'USD', - minimumFractionDigits: 0, - maximumFractionDigits: 0, - }) - return formatter.format(num) -} - export type RankByConfig = { extracter: (p: ProjectRanking) => string // used to extract the value param: RankByParam // used as param in GET request @@ -53,7 +42,7 @@ const rankByConfigs: RankByConfig[] = [ }, { extracter: (p: ProjectRanking) => { - return formatTradingVolume(Number(p.totalVolume)) + return formatDisplayNumber(p.totalVolume, { style: 'currency', significantDigits: 10, fractionDigits: 0 }) }, param: 'total_volume', title: t`Trading Volume`, diff --git a/src/pages/GrantProgram/SingleProgram/Stats.tsx b/src/pages/GrantProgram/SingleProgram/Stats.tsx index 49b2772ca4..5a1d28b5d6 100644 --- a/src/pages/GrantProgram/SingleProgram/Stats.tsx +++ b/src/pages/GrantProgram/SingleProgram/Stats.tsx @@ -6,6 +6,7 @@ import { ReactComponent as CampaignParticipants } from 'assets/svg/campaign_part import { ReactComponent as CampaignTrades } from 'assets/svg/campaign_trades.svg' import { ReactComponent as CampaignVolume } from 'assets/svg/campaign_volume.svg' import Loader from 'components/Loader' +import { formatDisplayNumber } from 'utils/numbers' const StatsCardWrapper = styled.div` display: flex; @@ -77,18 +78,6 @@ type Props = { trades?: number } -const formatTradingVolume = (v: string) => { - const formatter = Intl.NumberFormat('en-US', { - notation: 'compact', - style: 'currency', - currency: 'USD', - minimumFractionDigits: 0, - maximumFractionDigits: 1, - }) - - return formatter.format(Number(v)) -} - const formatNumber = (v: number) => { const formatter = Intl.NumberFormat('en-US', { notation: 'compact', @@ -134,7 +123,9 @@ const Stats: React.FC = ({ participants, trades, volume }) => { } - value={volume ? formatTradingVolume(volume) : volume} + value={ + volume ? formatDisplayNumber(volume, { style: 'currency', fractionDigits: 2, significantDigits: 6 }) : volume + } title="Total Trading Volume" /> = ({ poolEarning, chainId }) => { const myLiquidityBalance = poolEarning.liquidityTokenBalanceIncludingStake !== '0' && poolEarning.pool.totalSupply !== '0' - ? formatDollarAmount( + ? formatDisplayNumber( (+poolEarning.liquidityTokenBalanceIncludingStake * +poolEarning.pool.reserveUSD) / +poolEarning.pool.totalSupply, + { + style: 'currency', + significantDigits: 6, + }, ) : '--' @@ -96,10 +99,13 @@ const Position: React.FC = ({ poolEarning, chainId }) => { ) const liquidityStaked = +poolEarning.liquidityTokenBalanceIncludingStake - +poolEarning.liquidityTokenBalance - const myStakedBalance = - liquidityStaked !== 0 - ? formatDollarAmount((liquidityStaked * +poolEarning.pool.reserveUSD) / +poolEarning.pool.totalSupply) - : '--' + const myStakedBalance = formatDisplayNumber( + (liquidityStaked * +poolEarning.pool.reserveUSD) / +poolEarning.pool.totalSupply, + { + style: 'currency', + significantDigits: 6, + }, + ) const stakedShare = liquidityStaked / +poolEarning.pool.totalSupply @@ -155,13 +161,13 @@ const Position: React.FC = ({ poolEarning, chainId }) => { - {formattedNum(pooledToken0)} {unwrappedToken(token0).symbol} + {formatDisplayNumber(pooledToken0, { significantDigits: 6 })} {unwrappedToken(token0).symbol} - {formattedNum(pooledToken1)} {unwrappedToken(token1).symbol} + {formatDisplayNumber(pooledToken1, { significantDigits: 6 })} {unwrappedToken(token1).symbol} @@ -183,13 +189,13 @@ const Position: React.FC = ({ poolEarning, chainId }) => { - {formattedNum(stakedToken0)} {unwrappedToken(token0).symbol} + {formatDisplayNumber(stakedToken0, { significantDigits: 6 })} {unwrappedToken(token0).symbol} - {formattedNum(stakedToken1)} {unwrappedToken(token1).symbol} + {formatDisplayNumber(stakedToken1, { significantDigits: 6 })} {unwrappedToken(token1).symbol} @@ -201,22 +207,15 @@ const Position: React.FC = ({ poolEarning, chainId }) => { - + ) diff --git a/src/pages/MyEarnings/ClassicPools/SinglePool/index.tsx b/src/pages/MyEarnings/ClassicPools/SinglePool/index.tsx index 6de5550890..3047e1709f 100644 --- a/src/pages/MyEarnings/ClassicPools/SinglePool/index.tsx +++ b/src/pages/MyEarnings/ClassicPools/SinglePool/index.tsx @@ -31,7 +31,7 @@ import { TokenAddressMap } from 'state/lists/reducer' import { WrappedTokenInfo } from 'state/lists/wrappedTokenInfo' import { isAddress, shortenAddress } from 'utils' import { currencyId } from 'utils/currencyId' -import { formatDollarAmount } from 'utils/numbers' +import { formatDisplayNumber } from 'utils/numbers' import { getTokenSymbolWithHardcode } from 'utils/tokenInfo' import { unwrappedToken } from 'utils/wrappedCurrency' @@ -126,9 +126,13 @@ const SinglePool: React.FC = ({ poolEarning, chainId }) => { ) const myLiquidityBalance = poolEarning.liquidityTokenBalanceIncludingStake !== '0' && poolEarning.pool.totalSupply !== '0' - ? formatDollarAmount( + ? formatDisplayNumber( (+poolEarning.liquidityTokenBalanceIncludingStake * +poolEarning.pool.reserveUSD) / +poolEarning.pool.totalSupply, + { + style: 'currency', + significantDigits: 4, + }, ) : '--' @@ -262,7 +266,13 @@ const SinglePool: React.FC = ({ poolEarning, chainId }) => { - + = ({ poolEarning, chainId }) => { value={ - {(+poolEarning.pool.apr).toFixed(2)}% + {formatDisplayNumber((+poolEarning.pool.apr + +poolEarning.pool.farmApr) / 100, { + style: 'percent', + fractionDigits: 2, + })} = ({ poolEarning, chainId }) => { /> - + @@ -451,15 +474,23 @@ const SinglePool: React.FC = ({ poolEarning, chainId }) => {
- {formatDollarAmount(ampLiquidity)} + + {formatDisplayNumber(ampLiquidity, { + style: 'currency', + significantDigits: 7, + })} + - {formatDollarAmount(+poolEarning.pool.reserveUSD)} + {formatDisplayNumber(poolEarning.pool.reserveUSD, { style: 'currency', significantDigits: 7 })}
- {(+poolEarning.pool.apr + +poolEarning.pool.farmApr).toFixed(2)}% + {formatDisplayNumber((+poolEarning.pool.apr + +poolEarning.pool.farmApr) / 100, { + style: 'percent', + fractionDigits: 2, + })} = ({ poolEarning, chainId }) => { - {formatDollarAmount(Number(poolEarning.pool.volumeUsd) - Number(poolEarning.pool.volumeUsdOneDayAgo))} + {formatDisplayNumber(Number(poolEarning.pool.volumeUsd) - Number(poolEarning.pool.volumeUsdOneDayAgo), { + style: 'currency', + significantDigits: 4, + })} + + + {formatDisplayNumber(Number(poolEarning.pool.feeUSD) - Number(poolEarning.pool.feesUsdOneDayAgo), { + style: 'currency', + significantDigits: 4, + })} - {formatDollarAmount(Number(poolEarning.pool.feeUSD) - Number(poolEarning.pool.feesUsdOneDayAgo))} {myLiquidityBalance} - {formatDollarAmount(poolEarningToday)} + {formatDisplayNumber(poolEarningToday, { style: 'currency', significantDigits: 4 })} (({ $columns }) => ({ @@ -141,7 +141,7 @@ const EarningsBreakdownPanel: React.FC = ({ isLoading, data, className, h ? tokens[item.chainId]?.[item.address]?.symbol || '' : item.symbol, }))} - totalValue={formatUSDValue(data.totalValue, true)} + totalValue={formatDisplayNumber(data.totalValue, { style: 'currency', significantDigits: 3 })} /> )} diff --git a/src/pages/MyEarnings/ElasticPools/SinglePool/index.tsx b/src/pages/MyEarnings/ElasticPools/SinglePool/index.tsx index 4870eea577..c05561cdc3 100644 --- a/src/pages/MyEarnings/ElasticPools/SinglePool/index.tsx +++ b/src/pages/MyEarnings/ElasticPools/SinglePool/index.tsx @@ -29,7 +29,7 @@ import { Badge, DownIcon, MobileStat, MobileStatWrapper, Row, Wrapper } from 'pa import { ButtonIcon } from 'pages/Pools/styleds' import { useAppSelector } from 'state/hooks' import { isAddress, shortenAddress } from 'utils' -import { formatDollarAmount } from 'utils/numbers' +import { formatDisplayNumber } from 'utils/numbers' import { getTokenSymbolWithHardcode } from 'utils/tokenInfo' import { unwrappedToken } from 'utils/wrappedCurrency' @@ -271,7 +271,14 @@ const SinglePool: React.FC = ({ poolEarning, chainId, positionEarnings, p - + = ({ poolEarning, chainId, positionEarnings, p } > - {(poolAPR + farmAPR).toFixed(2)}% + {formatDisplayNumber((poolAPR + farmAPR) / 100, { style: 'percent', fractionDigits: 2 })} @@ -304,14 +311,29 @@ const SinglePool: React.FC = ({ poolEarning, chainId, positionEarnings, p /> + + - - @@ -409,7 +431,13 @@ const SinglePool: React.FC = ({ poolEarning, chainId, positionEarnings, p {share} - {formatDollarAmount(+poolEarning.totalValueLockedUsd)} + + {formatDisplayNumber(poolEarning.totalValueLockedUsd, { + style: 'currency', + significantDigits: 7, + fractionDigits: 4, + })} + = ({ poolEarning, chainId, positionEarnings, p } > - {(poolAPR + farmAPR).toFixed(2)}% + {formatDisplayNumber((poolAPR + farmAPR) / 100, { style: 'percent', fractionDigits: 2 })} - {formatDollarAmount(Number(poolEarning.volumeUsd) - Number(poolEarning.volumeUsdOneDayAgo))} - {formatDollarAmount(Number(poolEarning.feesUsd) - Number(poolEarning.feesUsdOneDayAgo))} - {formatDollarAmount(myLiquidityUsd)} - {formatDollarAmount(poolEarningToday)} + + {formatDisplayNumber(Number(poolEarning.volumeUsd) - Number(poolEarning.volumeUsdOneDayAgo), { + style: 'currency', + significantDigits: 4, + })} + + + {formatDisplayNumber(Number(poolEarning.feesUsd) - Number(poolEarning.feesUsdOneDayAgo), { + style: 'currency', + significantDigits: 4, + })} + + {formatDisplayNumber(myLiquidityUsd, { style: 'currency', significantDigits: 4 })} + {formatDisplayNumber(poolEarningToday, { style: 'currency', significantDigits: 4 })} = props => { {earningToday ? formatUSDValue(earningToday.totalValue, false) : '--'}} + anchor={ + {formatDisplayNumber(earningToday?.totalValue, { style: 'currency', significantDigits: 6 })} + } text={ <> {earningToday?.tokens.map((token, index) => ( @@ -74,8 +75,8 @@ const EarningView: React.FC = props => { }} > - - {formattedNum(token.amount, false)} {token.symbol} + + {formatDisplayNumber(token.amount, { significantDigits: 6 })} {token.symbol} ))} @@ -95,8 +96,8 @@ const EarningView: React.FC = props => { - {myPoolAPR ? myPoolAPR.toFixed(2) + '%' : '--'} - {myFarmAPR ? myFarmAPR.toFixed(2) + '%' : '--'} + {formatDisplayNumber(myPoolAPR / 100, { style: 'percent', fractionDigits: 2 })} + {formatDisplayNumber(myFarmAPR / 100, { style: 'percent', fractionDigits: 2 })} diff --git a/src/pages/MyEarnings/ElasticPools/SinglePosition/PositionView.tsx b/src/pages/MyEarnings/ElasticPools/SinglePosition/PositionView.tsx index 87d0b21586..b51b52c3e7 100644 --- a/src/pages/MyEarnings/ElasticPools/SinglePosition/PositionView.tsx +++ b/src/pages/MyEarnings/ElasticPools/SinglePosition/PositionView.tsx @@ -34,7 +34,7 @@ import { useTransactionAdder } from 'state/transactions/hooks' import { TRANSACTION_TYPE } from 'state/transactions/type' import { updateChainId } from 'state/user/actions' import { calculateGasMargin } from 'utils' -import { formatDollarAmount } from 'utils/numbers' +import { formatDisplayNumber } from 'utils/numbers' import ActionButtons from './ActionButtons' @@ -199,7 +199,7 @@ const PositionView: React.FC = props => { {formatDollarAmount(liquidityInUsd)}} + anchor={{formatDisplayNumber(liquidityInUsd, { style: 'currency', significantDigits: 6 })}} disabled={!liquidityInUsd || Number.isNaN(liquidityInUsd)} text={
@@ -221,7 +221,9 @@ const PositionView: React.FC = props => { {myStakedBalance ? ( {formatDollarAmount(myStakedBalance)}} + anchor={ + {formatDisplayNumber(myStakedBalance, { style: 'currency', significantDigits: 6 })} + } text={
@@ -273,7 +275,9 @@ const PositionView: React.FC = props => { - {+positionEarning.pendingRewardUSD ? formatDollarAmount(+positionEarning.pendingRewardUSD) : '--'} + {+positionEarning.pendingRewardUSD + ? formatDisplayNumber(positionEarning.pendingRewardUSD, { style: 'currency', significantDigits: 6 }) + : '--'} } disabled={!+positionEarning.pendingRewardUSD} diff --git a/src/pages/MyEarnings/HoverDropdown.tsx b/src/pages/MyEarnings/HoverDropdown.tsx index 86d6353014..ff5b003ae5 100644 --- a/src/pages/MyEarnings/HoverDropdown.tsx +++ b/src/pages/MyEarnings/HoverDropdown.tsx @@ -26,7 +26,7 @@ type Props = { } const HoverDropdown: React.FC = ({ anchor, text, disabled = false }) => { return ( - + {anchor} {!disabled && } diff --git a/src/pages/MyEarnings/PoolEarningsSection.tsx b/src/pages/MyEarnings/PoolEarningsSection.tsx index c508398d40..c2f1d3d60e 100644 --- a/src/pages/MyEarnings/PoolEarningsSection.tsx +++ b/src/pages/MyEarnings/PoolEarningsSection.tsx @@ -16,6 +16,7 @@ import { WrappedTokenInfo } from 'state/lists/wrappedTokenInfo' import { MEDIA_WIDTHS } from 'theme' import { EarningStatsTick, EarningsBreakdown } from 'types/myEarnings' import { isAddressString } from 'utils' +import { toFixed } from 'utils/numbers' import OriginalEarningsBreakdownPanel from './EarningsBreakdownPanel' import OriginalMyEarningsOverTimePanel from './MyEarningsOverTimePanel' @@ -150,19 +151,19 @@ const PoolEarningsSection: React.FC = ({ historicalEarning, chainId }) => ? latestData.map(data => ({ logoUrl: data.logoUrl, symbol: data.symbol, - value: String(data.amountUSD), + value: toFixed(data.amountUSD), percent: isAllZero ? (1 / visibleItems) * 100 : (data.amountUSD / totalValue) * 100, })) : [ ...latestData.slice(0, 9).map(data => ({ logoUrl: data.logoUrl, symbol: data.symbol, - value: String(data.amountUSD), + value: toFixed(data.amountUSD), percent: isAllZero ? 10 : (data.amountUSD / totalValue) * 100, })), { symbol: t`Others`, - value: String(totalValueOfOthers), + value: toFixed(totalValueOfOthers), percent: isAllZero ? 10 : (totalValueOfOthers / totalValue) * 100, }, ] diff --git a/src/pages/MyEarnings/ShareModal.tsx b/src/pages/MyEarnings/ShareModal.tsx index bbd2b02b1c..426565de64 100644 --- a/src/pages/MyEarnings/ShareModal.tsx +++ b/src/pages/MyEarnings/ShareModal.tsx @@ -27,18 +27,7 @@ import useShareImage from 'hooks/useShareImage' import useTheme from 'hooks/useTheme' import { ButtonText, MEDIA_WIDTHS } from 'theme' import { downloadImage } from 'utils' - -const formatValue = (num: number, isSharePc: boolean) => { - const notation = (num > 1_000_000 && !isSharePc) || (num > 100_000_000 && isSharePc) ? 'compact' : 'standard' - const formatter = new Intl.NumberFormat('en-US', { - notation, - style: 'currency', - currency: 'USD', - minimumFractionDigits: 0, - maximumFractionDigits: 2, - }) - return formatter.format(num) -} +import { formatDisplayNumber } from 'utils/numbers' const ButtonWrapper = styled.div` text-align: center; @@ -292,7 +281,7 @@ export default function ShareModal({ isOpen, setIsOpen, title, value, poolInfo } {renderPool()} - {formatValue(value, isSharePc)} + {formatDisplayNumber(value, { style: 'currency', fractionDigits: 2 })} diff --git a/src/pages/MyEarnings/TotalEarningsAndChainSelect.tsx b/src/pages/MyEarnings/TotalEarningsAndChainSelect.tsx index 5aeb85ed0b..764c1cee8d 100644 --- a/src/pages/MyEarnings/TotalEarningsAndChainSelect.tsx +++ b/src/pages/MyEarnings/TotalEarningsAndChainSelect.tsx @@ -11,7 +11,6 @@ import earningApi, { import styled, { keyframes } from 'styled-components' import { ReactComponent as RefreshIcon } from 'assets/svg/refresh.svg' -import { formatUSDValue } from 'components/EarningAreaChart/utils' import { MouseoverTooltip } from 'components/Tooltip' import { EMPTY_FUNCTION } from 'constants/index' import { @@ -23,18 +22,7 @@ import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel' import useTheme from 'hooks/useTheme' import ShareTotalEarningsButton from 'pages/MyEarnings/ShareTotalEarningsButton' import { useAppSelector } from 'state/hooks' - -// TODO: move to common -const formatPercent = (value: number) => { - const formatter = Intl.NumberFormat('en-US', { - notation: 'standard', - style: 'percent', - minimumFractionDigits: 0, - maximumFractionDigits: 2, - }) - - return formatter.format(value) -} +import { formatDisplayNumber } from 'utils/numbers' const Value = styled.span` max-width: 100%; @@ -148,11 +136,15 @@ const TotalEarningsAndChainSelect: React.FC = ({ totalEarningToday, total return -- } - const totalValue = formatUSDValue(totalEarningToday) - + const totalValue = formatDisplayNumber(totalEarningToday, { style: 'currency', significantDigits: 6 }) const diffPercent = totalEarningYesterday && !Number.isNaN(totalEarningYesterday) - ? formatPercent(totalEarningToday / totalEarningYesterday - 1) + ? formatDisplayNumber(totalEarningToday / totalEarningYesterday - 1, { + style: 'percent', + fractionDigits: 2, + significantDigits: 6, + allowNegative: true, + }) : '' return ( diff --git a/src/utils/fee.ts b/src/utils/fee.ts index 8a2d798a00..daba1d412a 100644 --- a/src/utils/fee.ts +++ b/src/utils/fee.ts @@ -5,7 +5,8 @@ import { BuildRouteData } from 'services/route/types/buildRoute' import { BIPS_BASE, RESERVE_USD_DECIMALS } from 'constants/index' import { ChargeFeeBy, DetailedRouteSummary } from 'types/route' -import { formattedNum } from 'utils/index' + +import { formatDisplayNumber } from './numbers' export const calculateFeeFromBuildData = ( routeSummary: DetailedRouteSummary | undefined, @@ -39,8 +40,9 @@ export const calculateFeeFromBuildData = ( const feeUsd = buildData.feeUsd return { - feeAmount: formattedNum(fee, false), - feeAmountUsd: feeUsd && feeUsd !== '0' ? formattedNum(feeUsd, true, 4) : '', + feeAmount: formatDisplayNumber(fee, { significantDigits: 10 }), + feeAmountUsd: + feeUsd && feeUsd !== '0' ? formatDisplayNumber(feeUsd, { style: 'currency', significantDigits: 10 }) : '', currency: currencyAmountToTakeFee.currency, } } diff --git a/src/utils/firebase.ts b/src/utils/firebase.ts index c2ccc42827..d9757bc92e 100644 --- a/src/utils/firebase.ts +++ b/src/utils/firebase.ts @@ -88,7 +88,6 @@ function subscribeListLimitOrder( result.orders.push({ ...e, id: Number(e.id) } as LimitOrder) } }) - console.log(result) callback(result) }, ) diff --git a/src/utils/formatCurrencyAmount.tsx b/src/utils/formatCurrencyAmount.tsx index 505dc7a5ef..352a304226 100644 --- a/src/utils/formatCurrencyAmount.tsx +++ b/src/utils/formatCurrencyAmount.tsx @@ -3,6 +3,7 @@ import JSBI from 'jsbi' import { MouseoverTooltip } from 'components/Tooltip' +// todo: deprecated, use formatDisplayNumber instead export function formatCurrencyAmount(amount: CurrencyAmount | undefined, sigFigs: number) { if (!amount) { return '-' @@ -19,6 +20,7 @@ export function formatCurrencyAmount(amount: CurrencyAmount | undefine return amount.toSignificant(sigFigs) } +// todo: deprecated, use formatDisplayNumber instead export function toSignificantOrMaxIntegerPart(price: Price | undefined, sigFigs: number): string { if (!price) return '' @@ -28,6 +30,7 @@ export function toSignificantOrMaxIntegerPart(price: Price | return price.toSignificant(sigFigs) } +// todo: deprecated, use formatDisplayNumber instead export function formatPrice(price: Price | undefined, sigFigs: number) { if (!price) { return '-' diff --git a/src/utils/formatTickPrice.ts b/src/utils/formatTickPrice.ts index 1f2ebe62d2..fcd6fa47c9 100644 --- a/src/utils/formatTickPrice.ts +++ b/src/utils/formatTickPrice.ts @@ -2,7 +2,7 @@ import { Currency, Price } from '@kyberswap/ks-sdk-core' import { Bound } from 'state/mint/proamm/type' -import { formatPrice } from './formatCurrencyAmount' +import { formatDisplayNumber } from './numbers' export function formatTickPrice( price: Price | undefined, @@ -17,5 +17,5 @@ export function formatTickPrice( if (!price && placeholder !== undefined) { return placeholder } - return formatPrice(price, 5) + return formatDisplayNumber(price, { significantDigits: 6 }) } diff --git a/src/utils/index.ts b/src/utils/index.ts index dc0a7a8e42..81a45127d0 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -153,6 +153,7 @@ const formatDollarSignificantAmount = (num: number, minDigits: number, maxDigits return formatter.format(num) } +// todo: deprecated, use formatDisplayNumber instead export function formatNumberWithPrecisionRange(number: number, minPrecision = 2, maxPrecision = 2) { const options = { minimumFractionDigits: minPrecision, @@ -175,6 +176,7 @@ const truncateFloatNumber = (num: number, maximumFractionDigits = 6) => { return `${wholePart}.${fractionalPart.slice(0, maximumFractionDigits)}` } +// todo: deprecated, use formatDisplayNumber instead export function formattedNum(number: string | number, usd = false, fractionDigits = 5): string { if (number === 0 || number === '' || number === undefined) { return usd ? '$0' : '0' @@ -216,6 +218,7 @@ export function formattedNum(number: string | number, usd = false, fractionDigit return truncateFloatNumber(num, fractionDigits) } +// todo: deprecated, use formatDisplayNumber instead export function formattedNumLong(num: number, usd = false) { if (num === 0) { if (usd) { diff --git a/src/utils/numbers.ts b/src/utils/numbers.ts index 4ee69ea07a..69323955e8 100644 --- a/src/utils/numbers.ts +++ b/src/utils/numbers.ts @@ -1,9 +1,9 @@ -import { Fraction } from '@kyberswap/ks-sdk-core' +import { CurrencyAmount, Fraction, Percent, Price } from '@kyberswap/ks-sdk-core' import JSBI from 'jsbi' -import { RESERVE_USD_DECIMALS } from 'constants/index' +import { BIG_INT_ONE, BIG_INT_ZERO, RESERVE_USD_DECIMALS } from 'constants/index' -// using a currency library here in case we want to add more in future +// todo: deprecated, use formatDisplayNumber instead export const formatDollarAmount = (num: number | undefined, digits = 2) => { if (num === 0) return '$0.00' if (!num) return '-' @@ -22,7 +22,7 @@ export const formatDollarAmount = (num: number | undefined, digits = 2) => { .toLowerCase() } -// do the same with above, without the $ sign +// todo: deprecated, use formatDisplayNumber instead export const formatNotDollarAmount = (num: number | undefined, digits = 2) => { if (num === 0) return '0.00' if (!num) return '-' @@ -39,13 +39,16 @@ export const formatNotDollarAmount = (num: number | undefined, digits = 2) => { .toLowerCase() } +// stringify number without scientific format +// e.g: (123456789123456789123456789).toString() => 1.2345678912345679e+26 +// toFixed(123456789123456789123456789) => 123456789123456800000000000 // https://stackoverflow.com/a/1685917/8153505 export function toFixed(x: number): string { if (Math.abs(x) < 1.0) { const e = parseInt(x.toString().split('e-')[1]) if (e) { x *= Math.pow(10, e - 1) - return '0.' + '0'.repeat(e - 1) + x.toString().substring(2) + return x.toString().split('.')[0] + '.' + '0'.repeat(e - 1) + x.toString().split('.')[1] } } else { let e = parseInt(x.toString().split('+')[1]) @@ -60,3 +63,161 @@ export function toFixed(x: number): string { export const uint256ToFraction = (value: string, decimals = RESERVE_USD_DECIMALS) => new Fraction(value, JSBI.exponentiate(JSBI.BigInt(10), JSBI.BigInt(decimals))) + +const subscriptMap: { [key: string]: string } = { + '0': '₀', + '1': '₁', + '2': '₂', + '3': '₃', + '4': '₄', + '5': '₅', + '6': '₆', + '7': '₇', + '8': '₈', + '9': '₉', +} + +const log10 = (n: Fraction): number => { + const parsedN = Number(n.toSignificant(30)) + return Math.log10(parsedN) +} + +const parseNum = (value: FormatValue): Fraction => { + try { + if ( + typeof value === 'string' || + typeof value === 'number' || + value instanceof CurrencyAmount || + value instanceof Percent || + value instanceof Price + ) { + const valueStr = (() => { + if (typeof value === 'string') return value + if (typeof value === 'number') return toFixed(value) + if (value instanceof CurrencyAmount) return value.toFixed(value.currency.decimals) + if (value instanceof Price) return value.toFixed(18) + if (value instanceof Percent) return value.divide(100).toFixed(18) + return '0' + })() + return new Fraction(valueStr.replace('.', ''), '1' + '0'.repeat(valueStr.split('.')[1]?.length || 0)) + } + if (value instanceof Fraction) return value + if (value instanceof JSBI) return new Fraction(value) + if (typeof value === 'bigint') return new Fraction(value.toString(10)) + return new Fraction(0, 1) + } catch (error) { + console.error('parseNum error', { value, 'typeof value': typeof value, error }) + return new Fraction(0, 1) + } +} + +type FormatValue = string | number | bigint | JSBI | Fraction | undefined | null +type FormatOptions = { + style?: 'decimal' | 'currency' | 'percent' + fractionDigits?: number // usually for percent & currency styles + significantDigits?: number // usually for decimal style + fallback?: string + allowNegative?: boolean +} +interface RequiredFraction extends FormatOptions { + fractionDigits: number // usually for percent & currency styles +} +interface RequiredSignificant extends FormatOptions { + significantDigits: number // usually for percent & currency styles +} + +// todo: deprecated others format functions and all .toSignificant() to only use this function +/** + * Format number to displaying to the UI + * @example + * // returns 0.2 + * formatDisplayNumber(0.2, { style: 'decimal', significantDigits: 6 }) + * @example + * // returns $0.2 + * formatDisplayNumber(0.2, { style: 'currency', significantDigits: 6 }) + * @example + * // returns 20% + * formatDisplayNumber(0.2, { style: 'percent', significantDigits: 6 }) + * @example + * @returns {string} Returns the formatted number in string + */ +export const formatDisplayNumber = ( + value: FormatValue, + { + style = 'decimal', + significantDigits, + fractionDigits, + fallback = '--', + allowNegative = false, + }: RequiredFraction | RequiredSignificant, +): string => { + const currency = style === 'currency' ? '$' : '' + const percent = style === 'percent' ? '%' : '' + const fallbackResult = `${currency}${fallback}${percent}` + + if (value === undefined || value === null || Number.isNaN(value)) return fallbackResult + const parsedFraction = parseNum(value) + if (!allowNegative && parsedFraction.lessThan(BIG_INT_ZERO)) return fallbackResult + + const shownFraction = style === 'percent' ? parsedFraction.multiply(100) : parsedFraction + const absShownFraction = shownFraction.lessThan(0) ? shownFraction.multiply(-1) : shownFraction + + if (absShownFraction.lessThan(BIG_INT_ONE) && !shownFraction.equalTo(BIG_INT_ZERO)) { + const decimal = shownFraction.toSignificant(Math.max(30, significantDigits || 0, fractionDigits || 0)).split('.')[1] + const negative = shownFraction.lessThan(BIG_INT_ZERO) ? '-' : '' + const numberOfLeadingZeros = -Math.floor(log10(absShownFraction) + 1) + const slicedDecimal = decimal + .replace(/^0+/, '') + .slice(0, fractionDigits) + .slice(0, significantDigits || 6) + .replace(/0+$/, '') + + if (numberOfLeadingZeros > 2) { + const subscripts = numberOfLeadingZeros + .toString() + .split('') + .map(item => subscriptMap[item]) + .join('') + return `${negative}${currency}0.0${subscripts}${slicedDecimal}${percent}` + } + + return `${negative}${currency}0${ + slicedDecimal.length ? '.' + '0'.repeat(numberOfLeadingZeros) + slicedDecimal : '' + }${percent}` + } + + const formatter = Intl.NumberFormat('en-US', { + notation: absShownFraction.greaterThan(10 ** (significantDigits || fractionDigits || 4)) ? 'compact' : 'standard', + style, + currency: 'USD', + minimumFractionDigits: fractionDigits ? 0 : undefined, + maximumFractionDigits: fractionDigits, + minimumSignificantDigits: significantDigits ? 1 : undefined, + maximumSignificantDigits: significantDigits, + }) + + const result = formatter.format( + Number(parsedFraction.toSignificant(Math.max(30, significantDigits || 0, fractionDigits || 0))), + ) + + // Intl.NumberFormat does not handle maximumFractionDigits well when used along with maximumSignificantDigits + // It might return number with longer fraction digits than maximumFractionDigits + // Hence, we have to do an additional step that manually slice those oversize fraction digits + if (fractionDigits !== undefined) { + const [negative, currency, integer, decimal, unit] = parseNumPart(result) + const trimedSlicedDecimal = decimal?.slice(0, fractionDigits).replace(/0+$/, '') + if (trimedSlicedDecimal) return negative + currency + integer + '.' + trimedSlicedDecimal + unit + return negative + currency + integer + unit + } + return result +} + +const regex = /^(-\s*)?(\$\s*)?([\d,]+)(\.\d+)?\s*?(\w?.*?)$/ +const parseNumPart = (str: string): string[] => { + const parsedResult = regex.exec(str) + if (parsedResult) { + const [, negative, currency, integer, decimal, unit] = parsedResult + return [negative?.trim() || '', currency?.trim() || '', integer, decimal?.slice(1) || '', unit?.trim() || ''] + } + return ['', '', '', '', ''] +} diff --git a/yarn.lock b/yarn.lock index 1248657aaf..4ed7afb166 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1965,16 +1965,6 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/types@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d" - integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^15.0.0" - chalk "^3.0.0" - "@jest/types@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" @@ -4661,14 +4651,6 @@ dependencies: "@types/istanbul-lib-coverage" "*" -"@types/istanbul-reports@^1.1.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2" - integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw== - dependencies: - "@types/istanbul-lib-coverage" "*" - "@types/istanbul-lib-report" "*" - "@types/istanbul-reports@^3.0.0": version "3.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" @@ -4676,14 +4658,6 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@^25.2.1": - version "25.2.3" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.3.tgz#33d27e4c4716caae4eced355097a47ad363fdcaf" - integrity sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw== - dependencies: - jest-diff "^25.2.1" - pretty-format "^25.2.1" - "@types/js-cookie@2.2.6": version "2.2.6" resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.6.tgz#f1a1cb35aff47bc5cfb05cb0c441ca91e914c26f" @@ -7184,14 +7158,6 @@ chalk@5.2.0, chalk@^5.0.0, chalk@^5.0.1, chalk@^5.2.0: resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3" integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA== -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chance@^1.1.4: version "1.1.11" resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.11.tgz#78e10e1f9220a5bbc60a83e3f28a5d8558d84d1b" @@ -8759,11 +8725,6 @@ detect-node@2.1.0, detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -diff-sequences@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" - integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== - diff@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" @@ -11928,21 +11889,6 @@ jayson@^4.1.0: uuid "^8.3.2" ws "^7.4.5" -jest-diff@^25.2.1: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9" - integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A== - dependencies: - chalk "^3.0.0" - diff-sequences "^25.2.6" - jest-get-type "^25.2.6" - pretty-format "^25.5.0" - -jest-get-type@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" - integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== - jest-get-type@^26.3.0: version "26.3.0" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" @@ -14224,16 +14170,6 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" -pretty-format@^25.2.1, pretty-format@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a" - integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ== - dependencies: - "@jest/types" "^25.5.0" - ansi-regex "^5.0.0" - ansi-styles "^4.0.0" - react-is "^16.12.0" - pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" @@ -14785,7 +14721,7 @@ react-is@16.10.2: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.10.2.tgz#984120fd4d16800e9a738208ab1fba422d23b5ab" integrity sha512-INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA== -react-is@^16.10.2, react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0: +react-is@^16.10.2, react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -16882,9 +16818,9 @@ ts-node@^10.8.1, ts-node@^10.9.1: yn "3.1.1" tsconfck@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-2.1.1.tgz#9b51603d2712d1f4740fa14748ca886a2e1893e5" - integrity sha512-ZPCkJBKASZBmBUNqGHmRhdhM8pJYDdOXp4nRgj/O0JwUwsMq50lCDRQP/M5GBNAA0elPrq4gAeu4dkaVCuKWww== + version "2.1.2" + resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-2.1.2.tgz#f667035874fa41d908c1fe4d765345fcb1df6e35" + integrity sha512-ghqN1b0puy3MhhviwO2kGF8SeMDNhEbnKxjK7h6+fvY9JAxqvXi8y5NAHSQv687OVboS2uZIByzGd45/YxrRHg== tslib@1.14.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" @@ -17414,9 +17350,9 @@ vite-plugin-svgr@^2.4.0: "@svgr/core" "^6.5.1" vite-tsconfig-paths@^4.0.8: - version "4.2.0" - resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.0.tgz#bd2647d3eadafb65a10fc98a2ca565211f2eaf63" - integrity sha512-jGpus0eUy5qbbMVGiTxCL1iB9ZGN6Bd37VGLJU39kTDD6ZfULTTb1bcc5IeTWqWJKiWV5YihCaibeASPiGi8kw== + version "4.2.1" + resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.1.tgz#e53b89096b91d31a6d1e26f75999ea8c336a89ed" + integrity sha512-GNUI6ZgPqT3oervkvzU+qtys83+75N/OuDaQl7HmOqFTb0pjZsuARrRipsyJhJ3enqV8beI1xhGbToR4o78nSQ== dependencies: debug "^4.1.1" globrex "^0.1.2" From a4e4dce9eaeb2ba6957c254f8da06340092edfa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Ho=C3=A0i=20Danh?= <33005392+nguyenhoaidanh@users.noreply.github.com> Date: Thu, 14 Sep 2023 09:38:37 +0700 Subject: [PATCH 02/13] feat: use chains from config (#2231) --- .../Header/web3/NetworkModal/Networks.tsx | 45 ++++++++++++++++--- src/constants/networks/type.ts | 2 + src/hooks/useChainsConfig.ts | 42 +++++++++++++++++ src/hooks/useKyberSwapConfig.ts | 3 ++ src/pages/About/AboutKyberSwap/index.tsx | 18 ++++---- .../MultipleChainSelect/PopoverBody.tsx | 6 ++- src/services/ksSetting.ts | 17 +++++++ src/state/lists/updater.ts | 3 +- 8 files changed, 120 insertions(+), 16 deletions(-) create mode 100644 src/hooks/useChainsConfig.ts diff --git a/src/components/Header/web3/NetworkModal/Networks.tsx b/src/components/Header/web3/NetworkModal/Networks.tsx index 1d549d3239..e7125ff432 100644 --- a/src/components/Header/web3/NetworkModal/Networks.tsx +++ b/src/components/Header/web3/NetworkModal/Networks.tsx @@ -1,4 +1,5 @@ import { ChainId, getChainType } from '@kyberswap/ks-sdk-core' +import { Trans, t } from '@lingui/macro' import { darken, rgba } from 'polished' import { stringify } from 'querystring' import React from 'react' @@ -8,15 +9,30 @@ import styled, { css } from 'styled-components' import { ButtonEmpty } from 'components/Button' import { MouseoverTooltip } from 'components/Tooltip' -import { MAINNET_NETWORKS, NETWORKS_INFO } from 'constants/networks' +import { NetworkInfo } from 'constants/networks/type' import { Z_INDEXS } from 'constants/styles' import { SUPPORTED_WALLETS } from 'constants/wallets' import { useActiveWeb3React } from 'hooks' +import useChainsConfig, { ChainState } from 'hooks/useChainsConfig' import useParsedQueryString from 'hooks/useParsedQueryString' import useTheme from 'hooks/useTheme' import { useChangeNetwork } from 'hooks/web3/useChangeNetwork' import { useIsDarkMode } from 'state/user/hooks' +const NewLabel = styled.span` + font-size: 12px; + color: ${({ theme }) => theme.red}; + margin-left: 2px; + margin-top: -10px; +` + +const MaintainLabel = styled.span` + font-size: 8px; + color: ${({ theme }) => theme.red}; + margin-left: 2px; + margin-top: -10px; +` + const ListItem = styled.div<{ selected?: boolean }>` width: 100%; display: flex; @@ -157,11 +173,14 @@ const Networks = ({ } } + const { supportedChains } = useChainsConfig() + return ( - {MAINNET_NETWORKS.map((itemChainId: ChainId, i: number) => { - const { iconDark, icon, name } = NETWORKS_INFO[itemChainId] - const disabled = !isAcceptedTerm || (activeChainIds ? !activeChainIds?.includes(itemChainId) : false) + {supportedChains.map(({ chainId: itemChainId, iconDark, icon, name, state }: NetworkInfo, i: number) => { + const isMaintenance = state === ChainState.MAINTENANCE + const disabled = + !isAcceptedTerm || (activeChainIds ? !activeChainIds?.includes(itemChainId) : false) || isMaintenance const selected = selectedId === itemChainId && !isWrongNetwork const imgSrc = (isDarkMode ? iconDark : icon) || icon @@ -175,7 +194,13 @@ const Networks = ({ + {state === ChainState.NEW && ( + + New + + )} + {isMaintenance && ( + + Maintainance + + )} {selected && !walletKey && } {walletKey && ( diff --git a/src/constants/networks/type.ts b/src/constants/networks/type.ts index 31dcc6a44a..7862039b90 100644 --- a/src/constants/networks/type.ts +++ b/src/constants/networks/type.ts @@ -2,6 +2,7 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import { PublicKey } from '@solana/web3.js' import { EnvKeys } from 'constants/env' +import { ChainState } from 'hooks/useChainsConfig' export interface NetworkInfo { readonly chainId: ChainId @@ -37,6 +38,7 @@ export interface NetworkInfo { // USDT: Token // } readonly geckoTermialId: string | null + readonly state?: ChainState } export interface EVMNetworkInfo extends NetworkInfo { diff --git a/src/hooks/useChainsConfig.ts b/src/hooks/useChainsConfig.ts new file mode 100644 index 0000000000..2cffb5e7bd --- /dev/null +++ b/src/hooks/useChainsConfig.ts @@ -0,0 +1,42 @@ +import { ChainId } from '@kyberswap/ks-sdk-core' +import { useMemo } from 'react' +import { useGetChainsConfigurationQuery } from 'services/ksSetting' + +import { MAINNET_NETWORKS, NETWORKS_INFO } from 'constants/networks' +import { NetworkInfo } from 'constants/networks/type' +import { useKyberswapGlobalConfig } from 'hooks/useKyberSwapConfig' + +export enum ChainState { + NEW = 'new', + ACTIVE = 'active', + INACTIVE = 'inactive', + MAINTENANCE = 'maintainain', +} + +export type ChainStateMap = { [chain in ChainId]: ChainState } + +const defaultData = MAINNET_NETWORKS.map(chainId => NETWORKS_INFO[chainId]) +export default function useChainsConfig() { + const { data } = useGetChainsConfigurationQuery() + const globalConfig = useKyberswapGlobalConfig() + + return useMemo(() => { + const hasConfig = !!data + const chains: NetworkInfo[] = (data || defaultData).map(chain => { + const chainId = +chain.chainId as ChainId + const chainState = hasConfig ? globalConfig?.chainStates?.[chainId] : ChainState.ACTIVE + return { + ...NETWORKS_INFO[chainId], + ...chain, // BE config + chainId, + state: chainState, + } + }) + return { + activeChains: chains.filter(e => [ChainState.ACTIVE, ChainState.NEW].includes(e.state)), + supportedChains: chains.filter(e => + [ChainState.ACTIVE, ChainState.NEW, ChainState.MAINTENANCE].includes(e.state), + ), + } + }, [data, globalConfig]) +} diff --git a/src/hooks/useKyberSwapConfig.ts b/src/hooks/useKyberSwapConfig.ts index e49c31df91..24501dfb8a 100644 --- a/src/hooks/useKyberSwapConfig.ts +++ b/src/hooks/useKyberSwapConfig.ts @@ -16,6 +16,7 @@ import { NETWORKS_INFO, SUPPORTED_NETWORKS, isEVM, isSolana } from 'constants/ne import ethereumInfo from 'constants/networks/ethereum' import solanaInfo from 'constants/networks/solana' import { AppJsonRpcProvider } from 'constants/providers' +import { ChainStateMap } from 'hooks/useChainsConfig' import { AppState } from 'state' import { createClient } from 'utils/client' @@ -58,6 +59,7 @@ type KyberswapGlobalConfig = { aggregatorDomain: string aggregatorAPI: string isEnableAuthenAggregator: boolean + chainStates: ChainStateMap } const parseGlobalResponse = ( @@ -68,6 +70,7 @@ const parseGlobalResponse = ( const aggregatorDomain = data?.aggregator ?? AGGREGATOR_API const isEnableAuthenAggregator = !!data?.isEnableAuthenAggregator return { + chainStates: data?.chainStates || ({} as ChainStateMap), aggregatorDomain, aggregatorAPI: `${aggregatorDomain}/${NETWORKS_INFO[chainId].aggregatorRoute}/route/encode`, isEnableAuthenAggregator, diff --git a/src/pages/About/AboutKyberSwap/index.tsx b/src/pages/About/AboutKyberSwap/index.tsx index 520339d1a4..bdaeac143c 100644 --- a/src/pages/About/AboutKyberSwap/index.tsx +++ b/src/pages/About/AboutKyberSwap/index.tsx @@ -49,9 +49,10 @@ import AntiSnippingAttack from 'components/Icons/AntiSnippingAttack' import ZkSyncFull from 'components/Icons/ZkSyncFull' import Loader from 'components/Loader' import { APP_PATHS } from 'constants/index' -import { MAINNET_NETWORKS, NETWORKS_INFO } from 'constants/networks' +import { NETWORKS_INFO } from 'constants/networks' import { VERSION } from 'constants/v2' import { useActiveWeb3React } from 'hooks' +import useChainsConfig from 'hooks/useChainsConfig' import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel' import useTheme from 'hooks/useTheme' import { useGlobalData } from 'state/about/hooks' @@ -121,6 +122,7 @@ const ForTraderInfoCell = styled.div` export const KSStatistic = () => { const theme = useTheme() const upToLarge = useMedia(`(max-width: ${MEDIA_WIDTHS.upToLarge}px)`) + const { supportedChains } = useChainsConfig() return ( @@ -153,7 +155,7 @@ export const KSStatistic = () => { - {MAINNET_NETWORKS.length}+ + {supportedChains.length}+ Chains @@ -475,6 +477,8 @@ function AboutKyberSwap() { ) } + const { supportedChains } = useChainsConfig() + return (
@@ -495,14 +499,10 @@ function AboutKyberSwap() { - {MAINNET_NETWORKS.map(chain => ( + {supportedChains.map(({ chainId: chain, iconDark, icon, name }) => ( {NETWORKS_INFO[chain].name} = ({ onClose }) => { const isLegacy = useAppSelector(state => state.myEarnings.activeTab === VERSION.ELASTIC_LEGACY) const isClassic = useAppSelector(state => state.myEarnings.activeTab === VERSION.CLASSIC) + const { activeChains } = useChainsConfig() const comingSoonList = isLegacy ? COMING_SOON_NETWORKS_FOR_MY_EARNINGS_LEGACY @@ -121,7 +123,9 @@ const PopoverBody: React.FC = ({ onClose }) => { const [localSelectedChains, setLocalSelectedChains] = useState(() => selectedChains) - const networkList = SUPPORTED_NETWORKS_FOR_MY_EARNINGS.filter(item => !comingSoonList.includes(item)) + const networkList = SUPPORTED_NETWORKS_FOR_MY_EARNINGS.filter( + item => !comingSoonList.includes(item) && activeChains.some(e => e.chainId === item), + ) const isAllSelected = localSelectedChains.length === networkList.length const handleChangeChains = (chains: ChainId[]) => { diff --git a/src/services/ksSetting.ts b/src/services/ksSetting.ts index 2b99fd8720..9a20c38b0d 100644 --- a/src/services/ksSetting.ts +++ b/src/services/ksSetting.ts @@ -5,6 +5,7 @@ import { Connection } from '@solana/web3.js' import { KS_SETTING_API } from 'constants/env' import { AppJsonRpcProvider } from 'constants/providers' +import { ChainStateMap } from 'hooks/useChainsConfig' import { TokenInfo } from 'state/lists/wrappedTokenInfo' import { TopToken } from 'state/topTokens/type' @@ -41,6 +42,7 @@ export type KyberswapGlobalConfigurationResponse = { config: { aggregator: string isEnableAuthenAggregator: boolean + chainStates: ChainStateMap } } } @@ -77,6 +79,20 @@ const ksSettingApi = createApi({ }, }), }), + getChainsConfiguration: builder.query<{ chainId: string; name: string; icon: string }[], void>({ + query: () => ({ + url: '/configurations/fetch', + params: { + serviceCode: `chains`, + }, + }), + transformResponse: (data: any) => + data?.data?.config?.map((e: any) => ({ + ...e, + name: e.displayName, + icon: e.logoUrl, + })), + }), getTokenList: builder.query< TokenListResponse, @@ -111,6 +127,7 @@ export const { useGetTokenListQuery, useImportTokenMutation, useLazyGetTopTokensQuery, + useGetChainsConfigurationQuery, } = ksSettingApi export default ksSettingApi diff --git a/src/state/lists/updater.ts b/src/state/lists/updater.ts index ec913e12c9..cae41c91d5 100644 --- a/src/state/lists/updater.ts +++ b/src/state/lists/updater.ts @@ -1,7 +1,7 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import { useEffect } from 'react' import { useDispatch } from 'react-redux' -import { useLazyGetTokenListQuery } from 'services/ksSetting' +import { useGetChainsConfigurationQuery, useLazyGetTokenListQuery } from 'services/ksSetting' import { MAINNET_NETWORKS } from 'constants/networks' import { TokenMap, formatAndCacheToken } from 'hooks/Tokens' @@ -29,6 +29,7 @@ export default function Updater(): null { const dispatch = useDispatch() const [fetchTokenList] = useLazyGetTokenListQuery() + useGetChainsConfigurationQuery() useEffect(() => { const getTokens = async () => { From 72e35a9eec7711c8c167a79034fcb0ee9377df2a Mon Sep 17 00:00:00 2001 From: Nguyen Van Viet Date: Thu, 14 Sep 2023 10:09:02 +0700 Subject: [PATCH 03/13] feat: add cookie3 (#2208) * feat: add cookie3 * download lib file to local --- index.html | 396 +++-- public/libs/cookie3.js | 3403 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3599 insertions(+), 200 deletions(-) create mode 100644 public/libs/cookie3.js diff --git a/index.html b/index.html index 8a0ee5abac..ed49b2f07f 100644 --- a/index.html +++ b/index.html @@ -1,211 +1,206 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - KyberSwap - Trading Smart - - - - - - - -
- - - -
-
- -
-
Swap
-
Earn
-
- - - - - - - KyberAI -
+
+ +
+
Swap
+
Earn
+
+ + + + + + + KyberAI +
- beta -
+ "> + beta
- -
Campaigns
-
Analytics
-
About
-
Blog
+ +
Campaigns
+
Analytics
+
About
+
Blog
-
- DmmLogo - DmmLogo -
- - - + + - - - + + diff --git a/public/libs/cookie3.js b/public/libs/cookie3.js new file mode 100644 index 0000000000..f4e73d6596 --- /dev/null +++ b/public/libs/cookie3.js @@ -0,0 +1,3403 @@ +/*!! + * Matomo - free/libre analytics platform + * + * JavaScript tracking client + * + * @link https://piwik.org + * @source https://github.com/matomo-org/matomo/blob/master/js/piwik.js + * @license https://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt) + * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause + */ 'object' != typeof _paq && (_paq = []), + 'object' != typeof window.Matomo && + (window.Matomo = window.Piwik = + (function () { + var _ = Math.round + function $(e) { + try { + return t(e) + } catch (t) { + return unescape(e) + } + } + function p(e) { + var t = typeof e + return 'undefined' != t + } + function M(e) { + return 'function' == typeof e + } + function C(e) { + return 'object' == typeof e + } + function Z(e) { + return 'string' == typeof e || e instanceof String + } + function x(e) { + return 'number' == typeof e || e instanceof Number + } + function ee(e) { + return p(e) && (x(e) || (Z(e) && e.length)) + } + function te(e) { + if (!e) return !0 + var t + for (t in e) if (Object.prototype.hasOwnProperty.call(e, t)) return !1 + return !0 + } + function D(e) { + var t = typeof console + 'undefined' != t && console && console.error && console.error(e) + } + function ne() { + var e, t, n, i, o + for (e = 0; e < arguments.length; e += 1) { + ;(o = null), + arguments[e] && arguments[e].slice && (o = arguments[e].slice()), + (i = arguments[e]), + (n = i.shift()) + var a, + r, + s = Z(n) && 0 < n.indexOf('::') + if (s) + (a = n.split('::')), + (r = a[0]), + (n = a[1]), + 'object' == typeof fe[r] && 'function' == typeof fe[r][n] ? fe[r][n].apply(fe[r], i) : o && L.push(o) + else + for (t = 0; t < k.length; t++) + if (Z(n)) { + r = k[t] + var d = 0 < n.indexOf('.') + if (d) + if (((a = n.split('.')), r && 'object' == typeof r[a[0]])) (r = r[a[0]]), (n = a[1]) + else if (o) { + L.push(o) + break + } + if (r[n]) r[n].apply(r, i) + else { + var l = + "The method '" + + n + + '\' was not found in "_paq" variable. Please have a look at the Matomo tracker documentation: https://developer.matomo.org/api-reference/tracking-javascript' + if ((D(l), !d)) throw new TypeError(l) + } + if ('addTracker' === n) break + if ('setTrackerUrl' === n || 'setSiteId' === n) break + } else n.apply(k[t], i) + } + } + function ie(e, t, n, i) { + return e.addEventListener + ? (e.addEventListener(t, n, i), !0) + : e.attachEvent + ? e.attachEvent('on' + t, n) + : void (e['on' + t] = n) + } + function oe(e) { + 'complete' === z.readyState + ? e() + : Te.addEventListener + ? Te.addEventListener('load', e, !1) + : Te.attachEvent && Te.attachEvent('onload', e) + } + function n(e) { + var t = !1 + if (((t = z.attachEvent ? 'complete' === z.readyState : 'loading' !== z.readyState), t)) return void e() + var n + z.addEventListener + ? ie(z, 'DOMContentLoaded', function n() { + z.removeEventListener('DOMContentLoaded', n, !1), t || ((t = !0), e()) + }) + : z.attachEvent && + (z.attachEvent('onreadystatechange', function n() { + 'complete' === z.readyState && (z.detachEvent('onreadystatechange', n), !t && ((t = !0), e())) + }), + z.documentElement.doScroll && + Te === Te.top && + (function n() { + if (!t) { + try { + z.documentElement.doScroll('left') + } catch (e) { + return void setTimeout(n, 0) + } + ;(t = !0), e() + } + })()), + ie( + Te, + 'load', + function () { + t || ((t = !0), e()) + }, + !1, + ) + } + function q(e, t, n) { + if (!e) return '' + var i, + o, + a, + r, + s = '' + for (i in Ce) + Object.prototype.hasOwnProperty.call(Ce, i) && + ((r = Ce[i] && 'function' == typeof Ce[i][e]), r && ((o = Ce[i][e]), (a = o(t || {}, n)), a && (s += a))) + return s + } + function re(e) { + var t + ;(ve = !0), q('unload'), (t = new Date()) + var n = t.getTimeAlias() + if ((3e3 < he - n && (he = n + 3e3), he)) + do t = new Date() + while (t.getTimeAlias() < he) + } + function se(e, t) { + var n = z.createElement('script') + ;(n.type = 'text/javascript'), + (n.src = e), + n.readyState + ? (n.onreadystatechange = function () { + var e = this.readyState + ;('loaded' === e || 'complete' === e) && ((n.onreadystatechange = null), t()) + }) + : (n.onload = t), + z.getElementsByTagName('head')[0].appendChild(n) + } + function o() { + var e = '' + try { + e = Te.top.document.referrer + } catch (t) { + if (Te.parent) + try { + e = Te.parent.document.referrer + } catch (t) { + e = '' + } + } + return '' === e && (e = z.referrer), e + } + function N(e) { + var t = /^([a-z]+):/, + n = t.exec(e) + return n ? n[1] : null + } + function s(e) { + var t = /^(?:(?:https?|ftp):)\/*(?:[^@]+@)?([^:/#]+)/, + n = t.exec(e) + return n ? n[1] : e + } + function d(e) { + return /^[0-9][0-9]*(\.[0-9]+)?$/.test(e) + } + function G(e, t) { + var n, + i = {} + for (n in e) e.hasOwnProperty(n) && t(e[n]) && (i[n] = e[n]) + return i + } + function Q(e) { + var t, + n = {} + for (t in e) + if (e.hasOwnProperty(t)) + if (d(e[t])) n[t] = _(e[t]) + else + throw new Error( + 'Parameter "' + t + '" provided value "' + e[t] + '" is not valid. Please provide a numeric value.', + ) + return n + } + function B(e) { + var t, + n = '' + for (t in e) e.hasOwnProperty(t) && (n += '&' + h(t) + '=' + h(e[t])) + return n + } + function l(e, t) { + return (e += ''), 0 === e.lastIndexOf(t, 0) + } + function de(e, t) { + return (e += ''), -1 !== e.indexOf(t, e.length - t.length) + } + function U(e, t) { + return (e += ''), -1 !== e.indexOf(t) + } + function A(e, t) { + return (e += ''), e.substr(0, e.length - t) + } + function le(e, t, n) { + ;(e += ''), n || (n = '') + var i = e.indexOf('#'), + o = e.length + ;-1 === i && (i = o) + var a = e.substr(0, i), + r = e.substr(i, o - i) + return -1 === a.indexOf('?') ? (a += '?') : !de(a, '?') && (a += '&'), a + h(t) + '=' + h(n) + r + } + function I(e, t) { + if (((e += ''), -1 === e.indexOf('?' + t + '=') && -1 === e.indexOf('&' + t + '='))) return e + var n = e.indexOf('?') + if (-1 === n) return e + var i = e.substr(n + 1), + o = e.substr(0, n) + if (i) { + var a = '', + r = i.indexOf('#') + ;-1 !== r && ((a = i.substr(r + 1)), (i = i.substr(0, r))) + var s, + d = i.split('&'), + l = d.length - 1 + for (l; 0 <= l; l--) (s = d[l].split('=')[0]), s === t && d.splice(l, 1) + var c = d.join('&') + c && (o = o + '?' + c), a && (o += '#' + a) + } + return o + } + function j(e, t) { + var n = '[\\?&#]' + t + '=([^&#]*)', + i = new RegExp(n), + o = i.exec(e) + return o ? $(o[1]) : '' + } + function e(e) { + return e && e + '' === e ? e.replace(/^\s+|\s+$/g, '') : e + } + function a(e) { + return unescape(h(e)) + } + function F(e) { + var t, + n, + i, + o, + r, + s, + d, + l, + c, + u, + m = function (e, t) { + return (e << t) | (e >>> (32 - t)) + }, + g = function (e) { + var t, + n, + i = '' + for (t = 7; 0 <= t; t--) (n = 15 & (e >>> (4 * t))), (i += n.toString(16)) + return i + }, + h = [], + p = 1732584193, + C = 4023233417, + T = 2562383102, + N = 271733878, + k = 3285377520, + b = [] + for (e = a(e), u = e.length, n = 0; n < u - 3; n += 4) + (i = + (e.charCodeAt(n) << 24) | (e.charCodeAt(n + 1) << 16) | (e.charCodeAt(n + 2) << 8) | e.charCodeAt(n + 3)), + b.push(i) + switch (3 & u) { + case 0: + n = 2147483648 + break + case 1: + n = 8388608 | (e.charCodeAt(u - 1) << 24) + break + case 2: + n = 32768 | ((e.charCodeAt(u - 2) << 24) | (e.charCodeAt(u - 1) << 16)) + break + case 3: + n = 128 | ((e.charCodeAt(u - 3) << 24) | (e.charCodeAt(u - 2) << 16) | (e.charCodeAt(u - 1) << 8)) + } + for (b.push(n); 14 != (15 & b.length); ) b.push(0) + for (b.push(u >>> 29), b.push(4294967295 & (u << 3)), t = 0; t < b.length; t += 16) { + for (n = 0; 16 > n; n++) h[n] = b[t + n] + for (n = 16; 79 >= n; n++) h[n] = m(h[n - 3] ^ h[n - 8] ^ h[n - 14] ^ h[n - 16], 1) + for (o = p, r = C, s = T, d = N, l = k, n = 0; 19 >= n; n++) + (c = 4294967295 & (m(o, 5) + ((r & s) | (~r & d)) + l + h[n] + 1518500249)), + (l = d), + (d = s), + (s = m(r, 30)), + (r = o), + (o = c) + for (n = 20; 39 >= n; n++) + (c = 4294967295 & (m(o, 5) + (r ^ s ^ d) + l + h[n] + 1859775393)), + (l = d), + (d = s), + (s = m(r, 30)), + (r = o), + (o = c) + for (n = 40; 59 >= n; n++) + (c = 4294967295 & (m(o, 5) + ((r & s) | (r & d) | (s & d)) + l + h[n] + 2400959708)), + (l = d), + (d = s), + (s = m(r, 30)), + (r = o), + (o = c) + for (n = 60; 79 >= n; n++) + (c = 4294967295 & (m(o, 5) + (r ^ s ^ d) + l + h[n] + 3395469782)), + (l = d), + (d = s), + (s = m(r, 30)), + (r = o), + (o = c) + ;(p = 4294967295 & (p + o)), + (C = 4294967295 & (C + r)), + (T = 4294967295 & (T + s)), + (N = 4294967295 & (N + d)), + (k = 4294967295 & (k + l)) + } + return (c = g(p) + g(C) + g(T) + g(N) + g(k)), c.toLowerCase() + } + function ue(e, t, n) { + return ( + e || (e = ''), + t || (t = ''), + 'translate.googleusercontent.com' === e + ? ('' === n && (n = t), (t = j(t, 'u')), (e = s(t))) + : ('cc.bingj.com' === e || 'webcache.googleusercontent.com' === e || '74.6.' === e.slice(0, 5)) && + ((t = z.links[0].href), (e = s(t))), + [e, t, n] + ) + } + function ae(e) { + var t = e.length + return ( + '.' === e.charAt(--t) && (e = e.slice(0, t)), + '*.' === e.slice(0, 2) && (e = e.slice(1)), + -1 !== e.indexOf('/') && (e = e.substr(0, e.indexOf('/'))), + e + ) + } + function O(e) { + if (((e = e && e.text ? e.text : e), !Z(e))) { + var t = z.getElementsByTagName('title') + t && p(t[0]) && (e = t[0].text) + } + return e + } + function ce(e) { + return e ? (!p(e.children) && p(e.childNodes) ? e.children : p(e.children) ? e.children : []) : [] + } + function S(e, t) { + return ( + !!(e && t) && + (e.contains + ? e.contains(t) + : e === t || (!!e.compareDocumentPosition && !!(16 & e.compareDocumentPosition(t)))) + ) + } + function Y(e, t) { + if (e && e.indexOf) return e.indexOf(t) + if (!p(e) || null === e) return -1 + if (!e.length) return -1 + var n = e.length + if (0 === n) return -1 + for (var i = 0; i < n; ) { + if (e[i] === t) return i + i++ + } + return -1 + } + function P(e) { + function t(e, t) { + return Te.getComputedStyle + ? z.defaultView.getComputedStyle(e, null)[t] + : e.currentStyle + ? e.currentStyle[t] + : void 0 + } + function n(e) { + for (e = e.parentNode; e; ) { + if (e === z) return !0 + e = e.parentNode + } + return !1 + } + function i(o, a, r, s, d, l, c) { + var u = o.parentNode, + m = 1 + return ( + !!n(o) && + (9 === u.nodeType || + ('0' !== t(o, 'opacity') && + 'none' !== t(o, 'display') && + 'hidden' !== t(o, 'visibility') && + ((p(a) && p(r) && p(s) && p(d) && p(l) && p(c)) || + ((a = o.offsetTop), + (d = o.offsetLeft), + (s = a + o.offsetHeight), + (r = d + o.offsetWidth), + (l = o.offsetWidth), + (c = o.offsetHeight)), + (e !== o || (0 !== c && 0 !== l) || 'hidden' !== t(o, 'overflow')) && + (!u || + (!( + ('hidden' === t(u, 'overflow') || 'scroll' === t(u, 'overflow')) && + (d + 1 > u.offsetWidth + u.scrollLeft || + d + l - 1 < u.scrollLeft || + a + 1 > u.offsetHeight + u.scrollTop || + a + c - 1 < u.scrollTop) + ) && + (o.offsetParent === u && ((d += u.offsetLeft), (a += u.offsetTop)), i(u, a, r, s, d, l, c))))))) + ) + } + return !!e && i(e) + } + function i(e, t) { + if (t) return t + if (((e = Ae.toAbsoluteUrl(e)), U(e, '?'))) { + var n = e.indexOf('?') + e = e.slice(0, n) + } + if (de(e, 'matomo.php')) e = A(e, 10) + else if (de(e, 'piwik.php')) e = A(e, 9) + else if (de(e, '.php')) { + var i = e.lastIndexOf('/'), + o = 1 + e = e.slice(0, i + o) + } + return de(e, '/js/') && (e = A(e, 3)), e + } + function me(e) { + var t = 'Matomo_Overlay', + n = + /index\.php\?module=Overlay&action=startOverlaySession&idSite=([0-9]+)&period=([^&]+)&date=([^&]+)(&segment=[^&]*)?/, + i = n.exec(z.referrer) + if (i) { + var o = i[1] + if (o !== e + '') return !1 + var a = i[2], + r = i[3], + s = i[4] + s ? 0 === s.indexOf('&segment=') && (s = s.substr(9)) : (s = ''), + (Te.name = 'Matomo_Overlay###' + a + '###' + r + '###' + s) + } + var d = Te.name.split('###') + return 4 === d.length && 'Matomo_Overlay' === d[0] + } + function R(e, t, n) { + var o = Te.name.split('###'), + a = o[1], + r = o[2], + s = o[3], + d = i(e, t) + se(d + 'plugins/Overlay/client/client.js?v=1', function () { + Matomo_Overlay_Client.initialize(d, n, a, r, s) + }) + } + function ge() { + var e + try { + e = Te.frameElement + } catch (e) { + return !0 + } + if (p(e)) return !!(e && 'iframe' === (e.nodeName + '').toLowerCase()) + try { + return Te.self !== Te.top + } catch (e) { + return !0 + } + } + function v(a, r) { + var d = Math.floor + function c(e) { + if (Zn && 'mtm_consent_removed' !== e) return 0 + var n = new RegExp('(^|;)[ ]*' + e + '=([^;]*)'), + i = n.exec(z.cookie) + return i ? t(i[2]) : 0 + } + function u(e, t, n, i, o, a, r) { + if (!(Zn && 'mtm_consent_removed' !== e)) { + var s + if ( + (n && ((s = new Date()), s.setTime(s.getTime() + n)), + r || (r = 'Lax'), + (z.cookie = + e + + '=' + + h(t) + + (n ? ';expires=' + s.toGMTString() : '') + + ';path=' + + (i || '/') + + (o ? ';domain=' + o : '') + + (a ? ';secure' : '') + + ';SameSite=' + + r), + (!n || 0 <= n) && c(e) !== t + '') + ) { + var d = 'There was an error setting cookie `' + e + '`. Please check domain and path.' + D(d) + } + } + } + function m(e) { + var t, n + for (e = I(e, 'pk_vid'), e = I(e, 'ignore_referrer'), e = I(e, 'ignore_referer'), n = 0; n < Mn.length; n++) + e = I(e, Mn[n]) + return en ? ((t = /#.*/), e.replace(t, '')) : e + } + function T(e, t) { + var n, + i = N(t) + return i + ? t + : '/' === t.slice(0, 1) + ? N(e) + '://' + s(e) + t + : ((e = m(e)), + (n = e.indexOf('?')), + 0 <= n && (e = e.slice(0, n)), + (n = e.lastIndexOf('/')), + n !== e.length - 1 && (e = e.slice(0, n + 1)), + e + t) + } + function b(e, t) { + var n + if (((e = (e + '').toLowerCase()), (t = (t + '').toLowerCase()), e === t)) return !0 + if ('.' === t.slice(0, 1)) { + if (e === t.slice(1)) return !0 + if (((n = e.length - t.length), 0 < n && e.slice(n) === t)) return !0 + } + return !1 + } + function A(e) { + var t = document.createElement('a') + return ( + 0 !== e.indexOf('//') && + 0 !== e.indexOf('http') && + (0 === e.indexOf('*') && (e = e.substr(1)), + 0 === e.indexOf('.') && (e = e.substr(1)), + (e = 'http://' + e)), + (t.href = Ae.toAbsoluteUrl(e)), + t.pathname ? t.pathname : '' + ) + } + function E(e, t) { + l(t, '/') || (t = '/' + t), l(e, '/') || (e = '/' + e) + var n = '/' === t || '/*' === t + return ( + !!n || + e === t || + (((t = (t + '').toLowerCase()), (e = (e + '').toLowerCase()), de(t, '*')) + ? ((t = t.slice(0, -1)), (n = !t || '/' === t), !!n || e === t || 0 === e.indexOf(t)) + : (de(e, '/') || (e += '/'), de(t, '/') || (t += '/'), 0 === e.indexOf(t))) + ) + } + function y(e, t) { + var n, i, o, a, r + for (n = 0; n < Vn.length; n++) if (((a = ae(Vn[n])), (r = A(Vn[n])), b(e, a) && E(t, r))) return !0 + return !1 + } + function w(e) { + var t, n, i + for (t = 0; t < Vn.length; t++) { + if (((n = ae(Vn[t].toLowerCase())), e === n)) return !0 + if ('.' === n.slice(0, 1)) { + if (e === n.slice(1)) return !0 + if (((i = e.length - n.length), 0 < i && e.slice(i) === n)) return !0 + } + } + return !1 + } + function L(e) { + var t, n, i, o, a + if (!e.length || !Un.length) return !1 + for (n = s(e), i = A(e), 0 === n.indexOf('www.') && (n = n.substr(4)), t = 0; t < Un.length; t++) + if (((o = ae(Un[t])), (a = A(Un[t])), 0 === o.indexOf('www.') && (o = o.substr(4)), b(n, o) && E(i, a))) + return !0 + return !1 + } + function x(e, t) { + e = e.replace('send_image=0', 'send_image=1') + var n = new Image(1, 1) + ;(n.onload = function () { + ;(pe = 0), 'function' == typeof t && t({ request: e, trackerUrl: wn, success: !0 }) + }), + (n.onerror = function () { + 'function' == typeof t && t({ request: e, trackerUrl: wn, success: !1 }) + }), + (n.src = wn + (0 > wn.indexOf('?') ? '?' : '&') + e) + } + function P(e) { + return 'POST' === An || (e && (2e3 < e.length || 0 === e.indexOf('{"requests"'))) + } + function V() { + return 'object' == typeof J && 'function' == typeof J.sendBeacon && 'function' == typeof Blob + } + function U(e, t, n) { + var i = V() + if (!i) return !1 + var o = { type: 'application/x-www-form-urlencoded; charset=UTF-8' }, + a = !1, + r = wn + try { + var s = new Blob([e], o) + n && !P(e) && ((s = new Blob([], o)), (r = r + (0 > r.indexOf('?') ? '?' : '&') + e)), + (a = J.sendBeacon(r, s)) + } catch (e) { + return !1 + } + return a && 'function' == typeof t && t({ request: e, trackerUrl: wn, success: !0, isSendBeacon: !0 }), a + } + function H(e, t, n) { + ;(p(n) && null !== n) || (n = !0), + (ve && U(e, t, n)) || + setTimeout(function () { + if (!(ve && U(e, t, n))) { + var i + try { + var o = Te.XMLHttpRequest + ? new Te.XMLHttpRequest() + : Te.ActiveXObject + ? new ActiveXObject('Microsoft.XMLHTTP') + : null + o.open('POST', wn, !0), + (o.onreadystatechange = function () { + if (4 === this.readyState && !(200 <= this.status && 300 > this.status)) { + var i = ve && U(e, t, n) + !i && n + ? x(e, t) + : 'function' == typeof t && t({ request: e, trackerUrl: wn, success: !1, xhr: this }) + } else + 4 === this.readyState && + 'function' == typeof t && + t({ request: e, trackerUrl: wn, success: !0, xhr: this }) + }), + o.setRequestHeader('Content-Type', yn), + (o.withCredentials = !0), + o.send(e) + } catch (o) { + ;(i = ve && U(e, t, n)), + !i && n ? x(e, t) : 'function' == typeof t && t({ request: e, trackerUrl: wn, success: !1 }) + } + } + }, 50) + } + function X(e) { + var t = new Date(), + n = t.getTime() + e + ;(!he || n > he) && (he = n) + } + function K() { + ;(Ai = !0), (Ei = new Date().getTime()) + } + function ne() { + var e = new Date().getTime() + return !Ei || e - Ei > Kt + } + function re() { + ne() && $t() + } + function se() { + 'hidden' === z.visibilityState && ne() + ? $t() + : 'visible' === z.visibilityState && (Ei = new Date().getTime()) + } + function Ee() { + _i || + !Kt || + ((_i = !0), + ie(Te, 'focus', K), + ie(Te, 'blur', re), + ie(Te, 'visibilitychange', se), + ke++, + fe.addPlugin('HeartBeat' + ke, { + unload: function () { + _i && ne() && $t() + }, + })) + } + function ye(e) { + var t = new Date(), + n = t.getTime() + if (((yi = n), Ni && n < Ni)) { + var i = Ni - n + return setTimeout(e, i), X(i + 50), void (Ni += 50) + } + if (!1 === Ni) { + var o = 800 + Ni = n + 800 + } + e() + } + function we() { + c('mtm_consent_removed') ? (Ii = !1) : c('mtm_consent') && (Ii = !0) + } + function Se(e) { + if (!hi) return e + var t, + n = '&uadata=' + h(Te.JSON.stringify(hi)) + if (e instanceof Array) for (t = 0; t < e.length; t++) e[t] += n + else e += n + return e + } + function Oe(e) { + return qi && p(J.userAgentData) && M(J.userAgentData.getHighEntropyValues) + ? void ((hi = { brands: J.userAgentData.brands, platform: J.userAgentData.platform }), + J.userAgentData + .getHighEntropyValues([ + 'brands', + 'model', + 'platform', + 'platformVersion', + 'uaFullVersion', + 'fullVersionList', + ]) + .then( + function (t) { + var n + t.fullVersionList && (delete t.brands, delete t.uaFullVersion), (hi = t), e() + }, + function (t) { + e() + }, + )) + : void e() + } + function Le(e, t, n) { + return fi + ? (we(), + Ii + ? void ((Vi = !0), + !an && + e && + (xi && Ii && (e += '&consent=1'), + (e = Se(e)), + ye(function () { + return jn && U(e, n, !0) ? void X(100) : void (P(e) ? H(e, n) : x(e, n), X(t)) + })), + !_i && Ee()) + : void Pi.push(e)) + : void pi.push(e) + } + function xe(e) { + return !an && e && e.length + } + function Ie(e, t) { + if (!t || t >= e.length) return [e] + var n = 0, + i = e.length, + o = [] + for (n; n < i; n += t) o.push(e.slice(n, n + t)) + return o + } + function Pe(e, t) { + return xe(e) + ? fi + ? Ii + ? void ((Vi = !0), + ye(function () { + var n, + i = Ie(e, 50), + o = 0 + for (o; o < i.length; o++) + (n = '{"requests":["?' + Se(i[o]).join('","?') + '"],"send_image":0}'), + jn && U(n, null, !1) ? X(100) : H(n, null, !1) + X(t) + })) + : void Pi.push(e) + : void pi.push(e) + : void 0 + } + function Re(e) { + return zn + e + '.' + xn + '.' + mn + } + function De(e, t, n) { + u(e, '', -1296e5, t, n) + } + function Ve() { + if (Zn) return '0' + if (!p(Te.showModalDialog) && p(J.cookieEnabled)) return J.cookieEnabled ? '1' : '0' + var e = zn + 'testcookie' + u(e, '1', void 0, on, nn, Xn, Qn) + var t = '1' === c(e) ? '1' : '0' + return De(e), t + } + function ce() { + mn = wi((nn || Nn) + (on || '/')).slice(0, 4) + } + function qe() { + if ( + (Oe(function () { + var e, t + for (fi = !0, e = 0; e < pi.length; e++) + (t = typeof pi[e]), 'string' === t ? Le(pi[e], Gn) : 'object' == t && Pe(pi[e], Gn) + pi = [] + }), + !qi) + ) + return {} + if (p(gi.res)) return gi + var e, + t, + n = { + pdf: 'application/pdf', + qt: 'video/quicktime', + realp: 'audio/x-pn-realaudio-plugin', + wma: 'application/x-mplayer2', + fla: 'application/x-shockwave-flash', + java: 'application/x-java-vm', + ag: 'application/x-silverlight', + } + if (!/MSIE/.test(J.userAgent)) { + if (J.mimeTypes && J.mimeTypes.length) + for (e in n) + Object.prototype.hasOwnProperty.call(n, e) && + ((t = J.mimeTypes[n[e]]), (gi[e] = t && t.enabledPlugin ? '1' : '0')) + !/Edge[ /](\d+[\.\d]+)/.test(J.userAgent) && + 'unknown' != typeof navigator.javaEnabled && + p(J.javaEnabled) && + J.javaEnabled() && + (gi.java = '1'), + (gi.cookie = !p(Te.showModalDialog) && p(J.cookieEnabled) ? (J.cookieEnabled ? '1' : '0') : Ve()) + } + var i = parseInt(g.width, 10), + o = parseInt(g.height, 10) + return (gi.res = parseInt(i, 10) + 'x' + parseInt(o, 10)), gi + } + function Ue() { + var e = Re('cvar'), + t = c(e) + return t && t.length && ((t = Te.JSON.parse(t)), C(t)) ? t : {} + } + function Me() { + !1 === ai && (ai = Ue()) + } + function We() { + var e = qe() + return wi( + (J.userAgent || '') + (J.platform || '') + Te.JSON.stringify(e) + new Date().getTime() + Math.random(), + ).slice(0, 16) + } + function Fe() { + var e = qe() + return wi((J.userAgent || '') + (J.platform || '') + Te.JSON.stringify(e)).slice(0, 6) + } + function Ge() { + return d(new Date().getTime() / 1e3) + } + function je() { + var e = Ge(), + t = Fe(), + n = e + '' + t + return n + } + function He(e) { + e += '' + var t = Fe(), + n = t.length, + i = e.substr(-1 * n, n), + o = parseInt(e.substr(0, e.length - n), 10) + if (o && i && i === t) { + var a = Ge() + if (0 >= Yn) return !0 + if (a >= o && a <= o + Yn) return !0 + } + return !1 + } + function Be(e) { + if (!vi) return '' + var t = j(e, 'pk_vid') + if (!t) return '' + t += '' + var n = /^[a-zA-Z0-9]+$/ + if (32 === t.length && n.test(t)) { + var i = t.substr(16, 32) + if (He(i)) { + var o = t.substr(0, 16) + return o + } + } + return '' + } + function ze() { + Pn || (Pn = Be(kn)) + var e, + t, + n = new Date(), + i = _(n.getTime() / 1e3), + o = Re('id'), + a = c(o) + return a + ? ((e = a.split('.')), e.unshift('0'), Pn.length && (e[1] = Pn), e) + : ((t = Pn.length ? Pn : '0' === Ve() ? '' : We()), (e = ['1', t, i]), e) + } + function Je() { + var e = ze(), + t = e[0], + n = e[1], + i = e[2] + return { newVisitor: t, uuid: n, createTs: i } + } + function Ye() { + var e = new Date(), + t = e.getTime(), + n = Je().createTs, + i = parseInt(n, 10), + o = 1e3 * i + Kn - t + return o + } + function Xe(e) { + if (xn) { + var t = new Date(), + n = _(t.getTime() / 1e3) + p(e) || (e = Je()) + var i = e.uuid + '.' + e.createTs + '.' + u(Re('id'), i, Ye(), on, nn, Xn, Qn) + } + } + function Qe() { + var e = c(Re('ref')) + if (e.length) + try { + if (((e = Te.JSON.parse(e)), C(e))) return e + } catch (e) {} + return ['', '', 0, ''] + } + function Ze(e) { + var t = zn + 'testcookie_domain', + n = 'testvalue' + return u(t, n, 1e4, null, e, Xn, Qn), c(t) === n && (De(t, null, e), !0) + } + function Ke() { + var e = Zn + Zn = !1 + var t, n + for (t = 0; t < Li.length; t++) + (n = Re(Li[t])), 'mtm_consent_removed' !== n && 'mtm_consent' !== n && 0 !== c(n) && De(n, on, nn) + Zn = e + } + function $e(e) { + xn = e + } + function et(e) { + if (e && C(e)) { + var t, + n = [] + for (t in e) Object.prototype.hasOwnProperty.call(e, t) && n.push(t) + var i = {} + n.sort() + var o, + a = n.length + for (o = 0; o < a; o++) i[n[o]] = e[n[o]] + return i + } + } + function tt() { + u(Re('ses'), '1', $n, on, nn, Xn, Qn) + } + function nt() { + var e, + t = '', + n = 'abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ', + i = n.length + for (e = 0; 6 > e; e++) t += n.charAt(d(Math.random() * i)) + return t + } + function it(e) { + if ('' !== Ln) return (e += Ln), (ii = !0), e + if (!W) return e + var t = 'object' == typeof W.timing && W.timing ? W.timing : void 0 + if ( + (t || + (t = + 'function' == typeof W.getEntriesByType && W.getEntriesByType('navigation') + ? W.getEntriesByType('navigation')[0] + : void 0), + !t) + ) + return e + var n = '' + if (t.connectEnd && t.fetchStart) { + if (t.connectEnd < t.fetchStart) return e + n += '&pf_net=' + _(t.connectEnd - t.fetchStart) + } + if (t.responseStart && t.requestStart) { + if (t.responseStart < t.requestStart) return e + n += '&pf_srv=' + _(t.responseStart - t.requestStart) + } + if (t.responseStart && t.responseEnd) { + if (t.responseEnd < t.responseStart) return e + n += '&pf_tfr=' + _(t.responseEnd - t.responseStart) + } + if (p(t.domLoading)) { + if (t.domInteractive && t.domLoading) { + if (t.domInteractive < t.domLoading) return e + n += '&pf_dm1=' + _(t.domInteractive - t.domLoading) + } + } else if (t.domInteractive && t.responseEnd) { + if (t.domInteractive < t.responseEnd) return e + n += '&pf_dm1=' + _(t.domInteractive - t.responseEnd) + } + if (t.domComplete && t.domInteractive) { + if (t.domComplete < t.domInteractive) return e + n += '&pf_dm2=' + _(t.domComplete - t.domInteractive) + } + if (t.loadEventEnd && t.loadEventStart) { + if (t.loadEventEnd < t.loadEventStart) return e + n += '&pf_onl=' + _(t.loadEventEnd - t.loadEventStart) + } + return e + n + } + function ot(e) { + return '1' === j(e, 'ignore_referrer') || '1' === j(e, 'ignore_referer') + } + function rt() { + var e, + t, + n, + i, + o, + a, + r, + d = new Date(), + l = _(d.getTime() / 1e3), + g = 1024, + p = Re('ses'), + C = Re('ref'), + T = c(p), + N = Qe(), + k = Qt || kn, + b = {} + if (((a = N[0]), (r = N[1]), (t = N[2]), (n = N[3]), !ot(k) && !T)) { + if (!sn || !a.length) { + for (e in Hn) if (Object.prototype.hasOwnProperty.call(Hn, e) && ((a = j(k, Hn[e])), a.length)) break + for (e in Bn) if (Object.prototype.hasOwnProperty.call(Bn, e) && ((r = j(k, Bn[e])), r.length)) break + } + ;(i = s(bn)), + (o = n.length ? s(n) : ''), + !i.length || w(i) || L(bn) || (sn && o.length && !w(o) && !L(n)) || (n = bn), + (n.length || a.length) && + ((t = l), (N = [a, r, t, m(n.slice(0, 1024))]), u(C, Te.JSON.stringify(N), ei, on, nn, Xn, Qn)) + } + return ( + a.length && (b._rcn = h(a)), + r.length && (b._rck = h(r)), + (b._refts = t), + (n + '').length && (b._ref = h(m(n.slice(0, 1024)))), + b + ) + } + function st(e, t, n) { + function i(e, t) { + var n = Te.JSON.stringify(e) + return 2 < n.length ? '&' + t + '=' + h(n) : '' + } + var o, + a = new Date(), + r = ai, + s = Re('cvar'), + d = Qt || kn, + l = ot(d) + if ((Zn && Ke(), an)) return '' + var c = Je(), + g = z.characterSet || z.charset + ;(g && 'utf-8' !== g.toLowerCase()) || (g = null), + (e += + '&idsite=' + + xn + + '&rec=1&r=' + + (Math.random() + '').slice(2, 8) + + '&h=' + + a.getHours() + + '&m=' + + a.getMinutes() + + '&s=' + + a.getSeconds() + + '&url=' + + h(m(d)) + + (!bn.length || L(bn) || l ? '' : '&urlref=' + h(m(bn))) + + (ee(In) ? '&uid=' + h(In) : '') + + '&_id=' + + c.uuid + + '&_idn=' + + c.newVisitor + + (g ? '&cs=' + h(g) : '') + + '&send_image=0') + var p = rt() + for (o in p) Object.prototype.hasOwnProperty.call(p, o) && (e += '&' + o + '=' + p[o]) + var C = qe() + for (o in C) Object.prototype.hasOwnProperty.call(C, o) && (e += '&' + o + '=' + C[o]) + var T = [] + if (t) + for (o in t) + if (Object.prototype.hasOwnProperty.call(t, o) && /^dimension\d+$/.test(o)) { + var N = o.replace('dimension', '') + T.push(parseInt(N, 10)), T.push(N + ''), (e += '&' + o + '=' + h(t[o])), delete t[o] + } + for (o in (t && te(t) && (t = null), ui)) + Object.prototype.hasOwnProperty.call(ui, o) && (e += '&' + o + '=' + h(ui[o])) + for (o in li) + if (Object.prototype.hasOwnProperty.call(li, o)) { + var k = -1 === Y(T, o) + k && (e += '&dimension' + o + '=' + h(li[o])) + } + t ? (e += '&data=' + h(Te.JSON.stringify(t))) : tn && (e += '&data=' + h(Te.JSON.stringify(tn))) + var b = et(ri), + v = et(si) + if (((e += i(b, 'cvar')), (e += i(v, 'e_cvar')), ai)) { + for (o in ((e += i(ai, '_cvar')), r)) + Object.prototype.hasOwnProperty.call(r, o) && ('' === ai[o][0] || '' === ai[o][1]) && delete ai[o] + oi && u(s, Te.JSON.stringify(ai), $n, on, nn, Xn, Qn) + } + return ( + ti && ni && !ii && ((e = it(e)), (ii = !0)), + gn && (e += '&pv_id=' + gn), + Xe(c), + tt(), + (e += q(n, { tracker: hn, request: e })), + On.length && (e += '&' + On), + M(ln) && (e = ln(e)), + e + ) + } + function lt(e, t, n, i, o, a) { + var r, + s = 'idgoal=0', + d = new Date(), + l = [], + c = (e + '').length + if ( + (c && (s += '&ec_id=' + h(e)), + (s += '&revenue=' + t), + (n + '').length && (s += '&ec_st=' + n), + (i + '').length && (s += '&ec_tx=' + i), + (o + '').length && (s += '&ec_sh=' + o), + (a + '').length && (s += '&ec_dt=' + a), + mi) + ) { + for (r in mi) + Object.prototype.hasOwnProperty.call(mi, r) && + (p(mi[r][1]) || (mi[r][1] = ''), + p(mi[r][2]) || (mi[r][2] = ''), + (p(mi[r][3]) && 0 !== (mi[r][3] + '').length) || (mi[r][3] = 0), + (p(mi[r][4]) && 0 !== (mi[r][4] + '').length) || (mi[r][4] = 1), + l.push(mi[r])) + s += '&ec_items=' + h(Te.JSON.stringify(l)) + } + ;(s = st(s, tn, 'ecommerce')), Le(s, Gn), c && (mi = {}) + } + function ut(e, t, n, i, o, a) { + ;(e + '').length && p(t) && lt(e, t, n, i, o, a) + } + function mt(e) { + p(e) && lt('', e, '', '', '', '') + } + function gt(e, t, n) { + Si || (gn = nt()) + var i = st('action_name=' + h(O(e || Rn)), t, 'log') + ti && !ii && (i = it(i)), Le(i, Gn, n) + } + function ht(e, t) { + var n, + i = '(^| )(piwik[_-]' + t + '|matomo[_-]' + t + if (e) for (n = 0; n < e.length; n++) i += '|' + e[n] + return (i += ')( |$)'), new RegExp(i) + } + function pt(e) { + return wn && e && 0 === (e + '').indexOf(wn) + } + function ft(e, t, n, i) { + if (pt(t)) return 0 + var o = ht(Wn, 'download'), + a = ht(Fn, 'link'), + r = new RegExp('\\.(' + Dn.join('|') + ')([?&#]|$)', 'i') + return a.test(e) ? 'link' : i || o.test(e) || r.test(t) ? 'download' : n ? 0 : 'link' + } + function Ct(e) { + var t + for (t = e.parentNode; null !== t && p(t) && !_e.isLinkElement(e); ) (e = t), (t = e.parentNode) + return e + } + function Tt(e) { + if (((e = Ct(e)), !!_e.hasNodeAttribute(e, 'href')) && p(e.href)) { + var t = _e.getAttributeValueFromNode(e, 'href'), + n = e.pathname || A(e.href), + i = e.hostname || s(e.href), + o = i.toLowerCase(), + a = e.href.replace(i, o), + r = /^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto|tel):/i + if (!r.test(a)) { + var d = ft(e.className, a, y(o, n), _e.hasNodeAttribute(e, 'download')) + if (d) return { type: d, href: a } + } + } + } + function Nt(e, t, n, i) { + var o = Ae.buildInteractionRequestParams(e, t, n, i) + return o ? st(o, null, 'contentInteraction') : void 0 + } + function kt(e, t) { + if (!e || !t) return !1 + var n = Ae.findTargetNode(e) + return !Ae.shouldIgnoreInteraction(n) && ((n = Ae.findTargetNodeNoDefault(e)), !n || S(n, t)) + } + function vt(e, t, n) { + if (e) { + var i = Ae.findParentContentNode(e) + if (i && kt(i, e)) { + var o = Ae.buildContentBlock(i) + if (o) + return ( + !o.target && n && (o.target = n), Ae.buildInteractionRequestParams(t, o.name, o.piece, o.target) + ) + } + } + } + function _t(e) { + if (!Ci || !Ci.length) return !1 + var t, n + for (t = 0; t < Ci.length; t++) + if (((n = Ci[t]), n && n.name === e.name && n.piece === e.piece && n.target === e.target)) return !0 + return !1 + } + function At(e) { + return function (t) { + if (e) { + var n, + i = Ae.findParentContentNode(e) + if ((t && (n = t.target || t.srcElement), n || (n = e), !!kt(i, n))) { + if (!i) return !1 + var o = Ae.findTargetNode(i) + if (!o || Ae.shouldIgnoreInteraction(o)) return !1 + var a = Tt(o) + return bi && a && a.type ? a.type : hn.trackContentInteractionNode(n, 'click') + } + } + } + } + function Et(e) { + if (e && e.length) { + var t, n + for (t = 0; t < e.length; t++) + (n = Ae.findTargetNode(e[t])), + n && + !n.contentInteractionTrackingSetupDone && + ((n.contentInteractionTrackingSetupDone = !0), ie(n, 'click', At(n))) + } + } + function yt(e, t) { + if (!e || !e.length) return [] + var n, i + for (n = 0; n < e.length; n++) _t(e[n]) ? (e.splice(n, 1), n--) : Ci.push(e[n]) + if (!e || !e.length) return [] + Et(t) + var o = [] + for (n = 0; n < e.length; n++) + (i = st( + Ae.buildImpressionRequestParams(e[n].name, e[n].piece, e[n].target), + void 0, + 'contentImpressions', + )), + i && o.push(i) + return o + } + function wt(e) { + var t = Ae.collectContent(e) + return yt(t, e) + } + function St(e) { + if (!e || !e.length) return [] + var t + for (t = 0; t < e.length; t++) Ae.isNodeVisible(e[t]) || (e.splice(t, 1), t--) + return e && e.length ? wt(e) : [] + } + function Ot(e, t, n) { + var i = Ae.buildImpressionRequestParams(e, t, n) + return st(i, null, 'contentImpression') + } + function Lt(e, t) { + if (e) { + var n = Ae.findParentContentNode(e), + i = Ae.buildContentBlock(n) + if (i) return t || (t = 'Unknown'), Nt(t, i.name, i.piece, i.target) + } + } + function xt(e, t, n, i) { + return ( + 'e_c=' + h(e) + '&e_a=' + h(t) + (p(n) ? '&e_n=' + h(n) : '') + (p(i) ? '&e_v=' + h(i) : '') + '&ca=1' + ) + } + function It(e, t, n, i, o, a) { + if (!ee(e) || !ee(t)) + return ( + D( + 'Error while logging event: Parameters `category` and `action` must not be empty or filled with whitespaces', + ), + !1 + ) + var r = st(xt(e, t, n, i), o, 'event') + Le(r, Gn, a) + } + function Pt(e, t, n, i) { + var o = st( + 'search=' + h(e) + (t ? '&search_cat=' + h(t) : '') + (p(n) ? '&search_count=' + n : ''), + i, + 'sitesearch', + ) + Le(o, Gn) + } + function Rt(e, t, n, i) { + var o = st('idgoal=' + e + (t ? '&revenue=' + t : ''), n, 'goal') + Le(o, Gn, i) + } + function Dt(e, t, n, i, o) { + var a = t + '=' + h(m(e)), + r = vt(o, 'click', e) + r && (a += '&' + r) + var s = st(a, n, 'link') + Le(s, Gn, i) + } + function Vt(e, t) { + return '' === e ? t : e + t.charAt(0).toUpperCase() + t.slice(1) + } + function qt(e) { + var t, + n, + i, + o = ['', 'webkit', 'ms', 'moz'] + if (!rn) + for (n = 0; n < o.length; n++) + if (((i = o[n]), Object.prototype.hasOwnProperty.call(z, Vt(i, 'hidden')))) { + 'prerender' === z[Vt(i, 'visibilityState')] && (t = !0) + break + } + return t + ? void ie(z, i + 'visibilitychange', function t() { + z.removeEventListener(i + 'visibilitychange', t, !1), e() + }) + : void e() + } + function Ut() { + var e = hn.getVisitorId(), + t = je() + return e + t + } + function Mt(e) { + if (e && _e.hasNodeAttribute(e, 'href')) { + var t = _e.getAttributeValueFromNode(e, 'href') + if (t && !pt(t) && hn.getVisitorId()) { + t = I(t, 'pk_vid') + var n = Ut() + ;(t = le(t, 'pk_vid', n)), _e.setAnyAttribute(e, 'href', t) + } + } + } + function Wt(e) { + var t = _e.getAttributeValueFromNode(e, 'href') + if (!t) return !1 + t += '' + var n = 0 === t.indexOf('//') || 0 === t.indexOf('http://') || 0 === t.indexOf('https://') + if (!n) return !1 + var i = e.pathname || A(e.href), + o = (e.hostname || s(e.href)).toLowerCase() + return !!y(o, i) && !b(Nn, ae(o)) + } + function Ft(e) { + var t = Tt(e) + return t && t.type + ? ((t.href = $(t.href)), void Dt(t.href, t.type, void 0, null, e)) + : void (vi && ((e = Ct(e)), Wt(e) && Mt(e))) + } + function Gt() { + return z.all && !z.addEventListener + } + function jt(e) { + var t = e.which, + n = typeof e.button + return ( + t || + 'undefined' === n || + (Gt() + ? 1 & e.button + ? (t = 1) + : 2 & e.button + ? (t = 3) + : 4 & e.button && (t = 2) + : 0 === e.button || '0' === e.button + ? (t = 1) + : 1 & e.button + ? (t = 2) + : 2 & e.button && (t = 3)), + t + ) + } + function Ht(e) { + switch (jt(e)) { + case 1: + return 'left' + case 2: + return 'middle' + case 3: + return 'right' + } + } + function Bt(e) { + return e.target || e.srcElement + } + function zt(e) { + return 'A' === e || 'AREA' === e + } + function Jt(e) { + function t(e) { + for (var t = Bt(e), n = t.nodeName, i = ht(qn, 'ignore'); !zt(n) && t && t.parentNode; ) + (t = t.parentNode), (n = t.nodeName) + if (t && zt(n) && !i.test(t.className)) return t + } + return function (n) { + n = n || Te.event + var i = t(n) + if (i) { + var o = Ht(n) + if ('click' === n.type) { + var a = !1 + e && 'middle' === o && (a = !0), i && !a && Ft(i) + } else + 'mousedown' === n.type + ? 'middle' === o && i + ? ((cn = o), (un = i)) + : (cn = un = null) + : 'mouseup' === n.type + ? (o === cn && i === un && Ft(i), (cn = un = null)) + : 'contextmenu' === n.type && Ft(i) + } + } + } + function Yt(e, t, n) { + var i = typeof t + 'undefined' == i && (t = !0), + ie(e, 'click', Jt(t), n), + t && (ie(e, 'mouseup', Jt(t), n), ie(e, 'mousedown', Jt(t), n), ie(e, 'contextmenu', Jt(t), n)) + } + function Xt(e, t, n) { + function i() { + r = !0 + } + if (Ti) return !0 + Ti = !0 + var o, + a, + r = !1 + oe(function () { + function s(e) { + setTimeout(function () { + Ti && ((r = !1), n.trackVisibleContentImpressions(), s(e)) + }, e) + } + function d(e) { + setTimeout(function () { + Ti && (r && ((r = !1), n.trackVisibleContentImpressions()), d(e)) + }, e) + } + if (e) { + for (o = ['scroll', 'resize'], a = 0; a < o.length; a++) + z.addEventListener ? z.addEventListener(o[a], i, !1) : Te.attachEvent('on' + o[a], i) + d(100) + } + t && 0 < t && ((t = parseInt(t, 10)), s(t)) + }) + } + var Qt, + Zt, + Kt, + $t, + en, + tn, + nn, + on, + an, + rn, + sn, + ln, + cn, + un, + mn, + gn, + hn = this, + pn = 'mtm_consent', + fn = 'mtm_cookie_consent', + Cn = 'mtm_consent_removed', + Tn = ue(z.domain, Te.location.href, o()), + Nn = ae(Tn[0]), + kn = $(Tn[1]), + bn = $(Tn[2]), + vn = !1, + _n = 'GET', + An = 'GET', + En = 'application/x-www-form-urlencoded; charset=UTF-8', + yn = 'application/x-www-form-urlencoded; charset=UTF-8', + wn = a || '', + Sn = '', + On = '', + Ln = '', + xn = r || '', + In = '', + Pn = '', + Rn = '', + Dn = [ + '7z', + 'aac', + 'apk', + 'arc', + 'arj', + 'asf', + 'asx', + 'avi', + 'azw3', + 'bin', + 'csv', + 'deb', + 'dmg', + 'doc', + 'docx', + 'epub', + 'exe', + 'flv', + 'gif', + 'gz', + 'gzip', + 'hqx', + 'ibooks', + 'jar', + 'jpg', + 'jpeg', + 'js', + 'mobi', + 'mp2', + 'mp3', + 'mp4', + 'mpg', + 'mpeg', + 'mov', + 'movie', + 'msi', + 'msp', + 'odb', + 'odf', + 'odg', + 'ods', + 'odt', + 'ogg', + 'ogv', + 'pdf', + 'phps', + 'png', + 'ppt', + 'pptx', + 'qt', + 'qtm', + 'ra', + 'ram', + 'rar', + 'rpm', + 'rtf', + 'sea', + 'sit', + 'tar', + 'tbz', + 'tbz2', + 'bz', + 'bz2', + 'tgz', + 'torrent', + 'txt', + 'wav', + 'wma', + 'wmv', + 'wpd', + 'xls', + 'xlsx', + 'xml', + 'z', + 'zip', + ], + Vn = [Nn], + qn = [], + Un = ['.paypal.com'], + Mn = [], + Wn = [], + Fn = [], + Gn = 500, + jn = !0, + Hn = [ + 'pk_campaign', + 'mtm_campaign', + 'piwik_campaign', + 'matomo_campaign', + 'utm_campaign', + 'utm_source', + 'utm_medium', + ], + Bn = ['pk_kwd', 'mtm_kwd', 'piwik_kwd', 'matomo_kwd', 'utm_term'], + zn = '_pk_', + Jn = 'pk_vid', + Yn = 180, + Xn = !1, + Qn = 'Lax', + Zn = !1, + Kn = 339552e5, + $n = 18e5, + ei = 15768e6, + ti = !0, + ni = !1, + ii = !1, + oi = !1, + ai = !1, + ri = {}, + si = {}, + li = {}, + ci = 200, + ui = {}, + mi = {}, + gi = {}, + hi = {}, + pi = [], + fi = !1, + Ci = [], + Ti = !1, + Ni = !1, + ki = !1, + bi = !1, + vi = !1, + _i = !1, + Ai = ge(), + Ei = null, + yi = null, + wi = F, + Si = !1, + Oi = 0, + Li = ['id', 'ses', 'cvar', 'ref'], + xi = !1, + Ii = null, + Pi = [], + Ri = [], + Di = be++, + Vi = !1, + qi = !0 + try { + Rn = z.title + } catch (e) { + Rn = '' + } + ;(Ii = !c('mtm_consent_removed')), + ($t = function e() { + var t = new Date() + return (t = t.getTime()), !!yi && !!(yi + Kt <= t) && (hn.ping(), !0) + }) + var Ui = { + enabled: !0, + requests: [], + timeout: null, + interval: 2500, + sendRequests: function () { + var e = this.requests + ;(this.requests = []), 1 === e.length ? Le(e[0], Gn) : Pe(e, Gn) + }, + canQueue: function () { + return !ve && this.enabled + }, + pushMultiple: function (e) { + if (!this.canQueue()) return void Pe(e, Gn) + var t + for (t = 0; t < e.length; t++) this.push(e[t]) + }, + push: function (e) { + if (e) { + if (!this.canQueue()) return void Le(e, Gn) + Ui.requests.push(e), + this.timeout && (clearTimeout(this.timeout), (this.timeout = null)), + (this.timeout = setTimeout(function () { + ;(Ui.timeout = null), Ui.sendRequests() + }, Ui.interval)) + var t = 'RequestQueue' + Di + Object.prototype.hasOwnProperty.call(Ce, t) || + (Ce[t] = { + unload: function () { + Ui.timeout && clearTimeout(Ui.timeout), Ui.sendRequests() + }, + }) + } + }, + } + ce(), + (this.hasConsent = function () { + return Ii + }), + (this.getVisitorInfo = function () { + return c(Re('id')) || Xe(), ze() + }), + (this.getVisitorId = function () { + return this.getVisitorInfo()[1] + }), + (this.getAttributionInfo = function () { + return Qe() + }), + (this.getAttributionCampaignName = function () { + return Qe()[0] + }), + (this.getAttributionCampaignKeyword = function () { + return Qe()[1] + }), + (this.getAttributionReferrerTimestamp = function () { + return Qe()[2] + }), + (this.getAttributionReferrerUrl = function () { + return Qe()[3] + }), + (this.setTrackerUrl = function (e) { + wn = e + }), + (this.getTrackerUrl = function () { + return wn + }), + (this.getMatomoUrl = function () { + return i(this.getTrackerUrl(), Sn) + }), + (this.getPiwikUrl = function () { + return this.getMatomoUrl() + }), + (this.addTracker = function (e, t) { + ;(p(e) && null !== e) || (e = this.getTrackerUrl()) + var n = new v(e, t) + return k.push(n), fe.trigger('TrackerAdded', [this]), n + }), + (this.getSiteId = function () { + return xn + }), + (this.setSiteId = function (e) { + $e(e) + }), + (this.resetUserId = function () { + In = '' + }), + (this.setUserId = function (e) { + ee(e) && (In = e) + }), + (this.setVisitorId = function (e) { + var t = /[0-9A-Fa-f]{16}/g + Z(e) && t.test(e) ? (Pn = e) : D('Invalid visitorId set' + e) + }), + (this.getUserId = function () { + return In + }), + (this.setCustomData = function (e, t) { + C(e) ? (tn = e) : (!tn && (tn = {}), (tn[e] = t)) + }), + (this.getCustomData = function () { + return tn + }), + (this.setCustomRequestProcessing = function (e) { + ln = e + }), + (this.appendToTrackingUrl = function (e) { + On = e + }), + (this.getRequest = function (e) { + return st(e) + }), + (this.addPlugin = function (e, t) { + Ce[e] = t + }), + (this.setCustomDimension = function (e, t) { + ;(e = parseInt(e, 10)), 0 < e && (!p(t) && (t = ''), !Z(t) && (t += ''), (li[e] = t)) + }), + (this.getCustomDimension = function (e) { + if (((e = parseInt(e, 10)), 0 < e && Object.prototype.hasOwnProperty.call(li, e))) return li[e] + }), + (this.deleteCustomDimension = function (e) { + ;(e = parseInt(e, 10)), 0 < e && delete li[e] + }), + (this.setCustomVariable = function (e, t, n, i) { + var o + p(i) || (i = 'visit'), + p(t) && + (!p(n) && (n = ''), + 0 < e && + ((t = Z(t) ? t : t + ''), + (n = Z(n) ? n : n + ''), + (o = [t.slice(0, 200), n.slice(0, 200)]), + 'visit' === i || 2 === i + ? (Me(), (ai[e] = o)) + : 'page' === i || 3 === i + ? (ri[e] = o) + : 'event' === i && (si[e] = o))) + }), + (this.getCustomVariable = function (e, t) { + var n + return ( + p(t) || (t = 'visit'), + 'page' === t || 3 === t + ? (n = ri[e]) + : 'event' === t + ? (n = si[e]) + : ('visit' == t || 2 === t) && (Me(), (n = ai[e])), + p(n) && (!n || '' !== n[0]) && n + ) + }), + (this.deleteCustomVariable = function (e, t) { + this.getCustomVariable(e, t) && this.setCustomVariable(e, '', '', t) + }), + (this.deleteCustomVariables = function (e) { + 'page' === e || 3 === e ? (ri = {}) : 'event' === e ? (si = {}) : ('visit' == e || 2 === e) && (ai = {}) + }), + (this.storeCustomVariablesInCookie = function () { + oi = !0 + }), + (this.setLinkTrackingTimer = function (e) { + Gn = e + }), + (this.getLinkTrackingTimer = function () { + return Gn + }), + (this.setDownloadExtensions = function (e) { + Z(e) && (e = e.split('|')), (Dn = e) + }), + (this.addDownloadExtensions = function (e) { + var t + for (Z(e) && (e = e.split('|')), t = 0; t < e.length; t++) Dn.push(e[t]) + }), + (this.removeDownloadExtensions = function (e) { + var t, + n = [] + for (Z(e) && (e = e.split('|')), t = 0; t < Dn.length; t++) -1 === Y(e, Dn[t]) && n.push(Dn[t]) + Dn = n + }), + (this.setDomains = function (e) { + Vn = Z(e) ? [e] : e + var t, + n = !1, + i = 0 + for (i; i < Vn.length; i++) { + if (((t = Vn[i] + ''), b(Nn, ae(t)))) { + n = !0 + break + } + var o = A(t) + if (o && '/' !== o && '/*' !== o) { + n = !0 + break + } + } + n || Vn.push(Nn) + }), + (this.setExcludedReferrers = function (e) { + Un = Z(e) ? [e] : e + }), + (this.enableCrossDomainLinking = function () { + vi = !0 + }), + (this.disableCrossDomainLinking = function () { + vi = !1 + }), + (this.isCrossDomainLinkingEnabled = function () { + return vi + }), + (this.setCrossDomainLinkingTimeout = function (e) { + Yn = e + }), + (this.getCrossDomainLinkingUrlParameter = function () { + return h('pk_vid') + '=' + h(Ut()) + }), + (this.setIgnoreClasses = function (e) { + qn = Z(e) ? [e] : e + }), + (this.setRequestMethod = function (e) { + ;(An = e ? (e + '').toUpperCase() : 'GET'), 'GET' === An && this.disableAlwaysUseSendBeacon() + }), + (this.setRequestContentType = function (e) { + yn = e || 'application/x-www-form-urlencoded; charset=UTF-8' + }), + (this.setGenerationTimeMs = function (e) { + D( + 'setGenerationTimeMs is no longer supported since Matomo 4. The call will be ignored. The replacement is setPagePerformanceTiming.', + ) + }), + (this.setPagePerformanceTiming = function (e, t, n, i, o, a) { + var r = { pf_net: e, pf_srv: t, pf_tfr: n, pf_dm1: i, pf_dm2: o, pf_onl: a } + try { + if (((r = G(r, p)), (r = Q(r)), (Ln = B(r)), '' === Ln)) + return void D( + 'setPagePerformanceTiming() called without parameters. This function needs to be called with at least one performance parameter.', + ) + ;(ii = !1), (ni = !0) + } catch (e) { + D('setPagePerformanceTiming: ' + e.toString()) + } + }), + (this.setReferrerUrl = function (e) { + bn = e + }), + (this.setCustomUrl = function (e) { + Qt = T(kn, e) + }), + (this.getCurrentUrl = function () { + return Qt || kn + }), + (this.setDocumentTitle = function (e) { + Rn = e + }), + (this.setPageViewId = function (e) { + ;(gn = e), (Si = !0) + }), + (this.setAPIUrl = function (e) { + Sn = e + }), + (this.setDownloadClasses = function (e) { + Wn = Z(e) ? [e] : e + }), + (this.setLinkClasses = function (e) { + Fn = Z(e) ? [e] : e + }), + (this.setCampaignNameKey = function (e) { + Hn = Z(e) ? [e] : e + }), + (this.setCampaignKeywordKey = function (e) { + Bn = Z(e) ? [e] : e + }), + (this.discardHashTag = function (e) { + en = e + }), + (this.setCookieNamePrefix = function (e) { + ;(zn = e), ai && (ai = Ue()) + }), + (this.setCookieDomain = function (e) { + var t = ae(e) + Zn || Ze(t) ? ((nn = t), ce()) : D("Can't write cookie on domain " + e) + }), + (this.setExcludedQueryParams = function (e) { + Mn = Z(e) ? [e] : e + }), + (this.getCookieDomain = function () { + return nn + }), + (this.hasCookies = function () { + return '1' === Ve() + }), + (this.setSessionCookie = function (e, t, n) { + if (!e) throw new Error('Missing cookie name') + p(n) || (n = $n), Li.push(e), u(Re(e), t, n, on, nn, Xn, Qn) + }), + (this.getCookie = function (e) { + var t = c(Re(e)) + return 0 === t ? null : t + }), + (this.setCookiePath = function (e) { + ;(on = e), ce() + }), + (this.getCookiePath = function (e) { + return on + }), + (this.setVisitorCookieTimeout = function (e) { + Kn = 1e3 * e + }), + (this.setSessionCookieTimeout = function (e) { + $n = 1e3 * e + }), + (this.getSessionCookieTimeout = function () { + return $n + }), + (this.setReferralCookieTimeout = function (e) { + ei = 1e3 * e + }), + (this.setConversionAttributionFirstReferrer = function (e) { + sn = e + }), + (this.setSecureCookie = function (e) { + return e && 'https:' !== location.protocol + ? void D('Error in setSecureCookie: You cannot use `Secure` on http.') + : void (Xn = e) + }), + (this.setCookieSameSite = function (e) { + return ( + (e += ''), + (e = e.charAt(0).toUpperCase() + e.toLowerCase().slice(1)), + 'None' !== e && 'Lax' !== e && 'Strict' !== e + ? void D('Ignored value for sameSite. Please use either Lax, None, or Strict.') + : void ('None' === e && + ('https:' === location.protocol + ? this.setSecureCookie(!0) + : (D('sameSite=None cannot be used on http, reverted to sameSite=Lax.'), (e = 'Lax'))), + (Qn = e)) + ) + }), + (this.disableCookies = function () { + ;(Zn = !0), xn && Ke() + }), + (this.areCookiesEnabled = function () { + return !Zn + }), + (this.setCookieConsentGiven = function () { + if (Zn && !an && ((Zn = !1), (qi = !0), xn && Vi)) { + Xe() + var e = st('ping=1', null, 'ping') + Le(e, Gn) + } + }), + (this.requireCookieConsent = function () { + return !this.getRememberedCookieConsent() && (this.disableCookies(), !0) + }), + (this.getRememberedCookieConsent = function () { + return c('mtm_cookie_consent') + }), + (this.forgetCookieConsentGiven = function () { + De('mtm_cookie_consent', on, nn), this.disableCookies() + }), + (this.rememberCookieConsentGiven = function (e) { + ;(e = e ? 1e3 * (60 * (60 * e)) : 946080000000), this.setCookieConsentGiven() + var t = new Date().getTime() + u('mtm_cookie_consent', t, e, on, nn, Xn, Qn) + }), + (this.deleteCookies = function () { + Ke() + }), + (this.setDoNotTrack = function (e) { + var t = J.doNotTrack || J.msDoNotTrack + ;(an = e && ('yes' === t || '1' === t)), an && this.disableCookies() + }), + (this.alwaysUseSendBeacon = function () { + jn = !0 + }), + (this.disableAlwaysUseSendBeacon = function () { + jn = !1 + }), + (this.addListener = function (e, t) { + Yt(e, t, !1) + }), + (this.enableLinkTracking = function (e) { + if (!bi) { + bi = !0 + var t = this + n(function () { + ki = !0 + var t = z.body + Yt(t, e, !0) + }) + } + }), + (this.enableJSErrorTracking = function () { + if (!vn) { + vn = !0 + var e = Te.onerror + Te.onerror = function (t, n, i, o, a) { + return ( + qt(function () { + var e = 'JavaScript Errors', + a = n + ':' + i + o && (a += ':' + o), + -1 === Y(Ri, 'JavaScript Errors' + a + t) && + (Ri.push('JavaScript Errors' + a + t), It('JavaScript Errors', a, t)) + }), + !!e && e(t, n, i, o, a) + ) + } + } + }), + (this.disablePerformanceTracking = function () { + ti = !1 + }), + (this.enableHeartBeatTimer = function (e) { + var t = Math.max + ;(e = t(e || 15, 5)), (Kt = 1e3 * e), null !== yi && Ee() + }), + (this.disableHeartBeatTimer = function () { + ;(Kt || _i) && + (Te.removeEventListener + ? (Te.removeEventListener('focus', K), + Te.removeEventListener('blur', re), + Te.removeEventListener('visibilitychange', se)) + : Te.detachEvent && + (Te.detachEvent('onfocus', K), + Te.detachEvent('onblur', re), + Te.detachEvent('visibilitychange', se))), + (Kt = null), + (_i = !1) + }), + (this.killFrame = function () { + Te.location !== Te.top.location && (Te.top.location = Te.location) + }), + (this.redirectFile = function (e) { + 'file:' === Te.location.protocol && (Te.location = e) + }), + (this.setCountPreRendered = function (e) { + rn = e + }), + (this.trackGoal = function (e, t, n, i) { + qt(function () { + Rt(e, t, n, i) + }) + }), + (this.trackLink = function (e, t, n, i) { + qt(function () { + Dt(e, t, n, i) + }) + }), + (this.getNumTrackedPageViews = function () { + return Oi + }), + (this.trackPageView = function (e, t, n) { + ;(Ci = []), + (Pi = []), + (Ri = []), + me(xn) + ? qt(function () { + R(wn, Sn, xn) + }) + : qt(function () { + Oi++, gt(e, t, n) + }) + }), + (this.disableBrowserFeatureDetection = function () { + qi = !1 + }), + (this.enableBrowserFeatureDetection = function () { + qi = !0 + }), + (this.trackAllContentImpressions = function () { + me(xn) || + qt(function () { + n(function () { + var e = Ae.findContentNodes(), + t = wt(e) + Ui.pushMultiple(t) + }) + }) + }), + (this.trackVisibleContentImpressions = function (e, t) { + me(xn) || + (!p(e) && (e = !0), + !p(t) && (t = 750), + Xt(e, t, this), + qt(function () { + oe(function () { + var e = Ae.findContentNodes(), + t = St(e) + Ui.pushMultiple(t) + }) + })) + }), + (this.trackContentImpression = function (t, n, i) { + me(xn) || + ((t = e(t)), + (n = e(n)), + (i = e(i)), + t && + ((n = n || 'Unknown'), + qt(function () { + var e = Ot(t, n, i) + Ui.push(e) + }))) + }), + (this.trackContentImpressionsWithinNode = function (e) { + me(xn) || + !e || + qt(function () { + Ti + ? oe(function () { + var t = Ae.findContentNodesWithinNode(e), + n = St(t) + Ui.pushMultiple(n) + }) + : n(function () { + var t = Ae.findContentNodesWithinNode(e), + n = wt(t) + Ui.pushMultiple(n) + }) + }) + }), + (this.trackContentInteraction = function (t, n, i, o) { + me(xn) || + ((t = e(t)), + (n = e(n)), + (i = e(i)), + (o = e(o)), + t && + n && + ((i = i || 'Unknown'), + qt(function () { + var e = Nt(t, n, i, o) + e && Ui.push(e) + }))) + }), + (this.trackContentInteractionNode = function (e, t) { + if (!me(xn) && e) { + var n = null + return ( + qt(function () { + ;(n = Lt(e, t)), n && Ui.push(n) + }), + n + ) + } + }), + (this.logAllContentBlocksOnPage = function () { + var e = Ae.findContentNodes(), + t = Ae.collectContent(e), + n = typeof console + 'undefined' !== n && console && console.log && console.log(t) + }), + (this.trackEvent = function (e, t, n, i, o, a) { + qt(function () { + It(e, t, n, i, o, a) + }) + }), + (this.trackSiteSearch = function (e, t, n, i) { + ;(Ci = []), + qt(function () { + Pt(e, t, n, i) + }) + }), + (this.setEcommerceView = function (e, t, n, i) { + ;(ui = {}), + ee(n) && (n += ''), + p(n) && null !== n && !1 !== n && n.length ? n instanceof Array && (n = Te.JSON.stringify(n)) : (n = '') + var o = '_pkc' + ;(ui[o] = n), + p(i) && null !== i && !1 !== i && (i + '').length && ((o = '_pkp'), (ui[o] = i)), + (ee(e) || ee(t)) && + (ee(e) && ((o = '_pks'), (ui[o] = e)), !ee(t) && (t = ''), (o = '_pkn'), (ui[o] = t)) + }), + (this.getEcommerceItems = function () { + return JSON.parse(JSON.stringify(mi)) + }), + (this.addEcommerceItem = function (e, t, n, i, o) { + ee(e) && (mi[e] = [e + '', t, n, i, o]) + }), + (this.removeEcommerceItem = function (e) { + ee(e) && ((e += ''), delete mi[e]) + }), + (this.clearEcommerceCart = function () { + mi = {} + }), + (this.trackEcommerceOrder = function (e, t, n, i, o, a) { + ut(e, t, n, i, o, a) + }), + (this.trackEcommerceCartUpdate = function (e) { + mt(e) + }), + (this.trackRequest = function (e, t, n, i) { + qt(function () { + var o = st(e, t, i) + Le(o, Gn, n) + }) + }), + (this.ping = function () { + this.trackRequest('ping=1', null, null, 'ping') + }), + (this.disableQueueRequest = function () { + Ui.enabled = !1 + }), + (this.setRequestQueueInterval = function (e) { + if (1e3 > e) throw new Error('Request queue interval needs to be at least 1000ms') + Ui.interval = e + }), + (this.queueRequest = function (e) { + qt(function () { + var t = st(e) + Ui.push(t) + }) + }), + (this.isConsentRequired = function () { + return xi + }), + (this.getRememberedConsent = function () { + var e = c('mtm_consent') + return c('mtm_consent_removed') ? (e && De('mtm_consent', on, nn), null) : e && 0 !== e ? e : null + }), + (this.hasRememberedConsent = function () { + return !!this.getRememberedConsent() + }), + (this.requireConsent = function () { + ;(xi = !0), + (Ii = this.hasRememberedConsent()), + Ii || (Zn = !0), + Ne++, + (Ce['CoreConsent' + Ne] = { + unload: function () { + Ii || Ke() + }, + }) + }), + (this.setConsentGiven = function (e) { + ;(Ii = !0), (qi = !0), De('mtm_consent_removed', on, nn) + var t, n + for (t = 0; t < Pi.length; t++) + (n = typeof Pi[t]), 'string' === n ? Le(Pi[t], Gn) : 'object' == n && Pe(Pi[t], Gn) + ;(Pi = []), (!p(e) || e) && this.setCookieConsentGiven() + }), + (this.rememberConsentGiven = function (e) { + e = e ? 1e3 * (60 * (60 * e)) : 946080000000 + var t = !0 + this.setConsentGiven(!0) + var n = new Date().getTime() + u('mtm_consent', n, e, on, nn, Xn, Qn) + }), + (this.forgetConsentGiven = function (e) { + ;(e = e ? 1e3 * (60 * (60 * e)) : 946080000000), + De('mtm_consent', on, nn), + u('mtm_consent_removed', new Date().getTime(), e, on, nn, Xn, Qn), + this.forgetCookieConsentGiven(), + this.requireConsent() + }), + (this.isUserOptedOut = function () { + return !Ii + }), + (this.optUserOut = this.forgetConsentGiven), + (this.forgetUserOptOut = function () { + this.setConsentGiven(!1) + }), + oe(function () { + setTimeout(function () { + ni = !0 + }, 0) + }), + fe.trigger('TrackerSetup', [this]), + fe.addPlugin('TrackerVisitorIdCookie' + Di, { + unload: function () { + Vi || (Xe(), rt()) + }, + }) + } + function T() { + return { push: ne } + } + function K(e, t) { + var n, + i, + o = {} + for (n = 0; n < t.length; n++) { + var a = t[n] + for (o[a] = 1, i = 0; i < e.length; i++) + if (e[i] && e[i][0]) { + var r = e[i][0] + a === r && + (ne(e[i]), + delete e[i], + 1 < o[r] && + 'addTracker' !== r && + 'enableLinkTracking' !== r && + D( + 'The method ' + + r + + ' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Matomo trackers documentation: https://developer.matomo.org/guides/tracking-javascript-guide#multiple-piwik-trackers', + ), + o[r]++) + } + } + return e + } + function c(e, t) { + var n = new v(e, t) + for (k.push(n), _paq = K(_paq, w), pe = 0; pe < _paq.length; pe++) _paq[pe] && ne(_paq[pe]) + return (_paq = new T()), fe.trigger('TrackerAdded', [n]), n + } + var he, + pe, + fe, + Ce = {}, + b = {}, + z = document, + J = navigator, + g = screen, + Te = window, + W = Te.performance || Te.mozPerformance || Te.msPerformance || Te.webkitPerformance, + h = Te.encodeURIComponent, + t = Te.decodeURIComponent, + V = unescape, + k = [], + L = [], + Ne = 0, + ke = 0, + be = 0, + ve = !1, + _e = { + htmlCollectionToArray: function (e) { + var t, + n = [] + if (!e || !e.length) return n + for (t = 0; t < e.length; t++) n.push(e[t]) + return n + }, + find: function (e) { + if (!document.querySelectorAll || !e) return [] + var t = document.querySelectorAll(e) + return this.htmlCollectionToArray(t) + }, + findMultiple: function (e) { + if (!e || !e.length) return [] + var t, + n, + i = [] + for (t = 0; t < e.length; t++) (n = this.find(e[t])), (i = i.concat(n)) + return (i = this.makeNodesUnique(i)), i + }, + findNodesByTagName: function (e, t) { + if (!e || !t || !e.getElementsByTagName) return [] + var n = e.getElementsByTagName(t) + return this.htmlCollectionToArray(n) + }, + makeNodesUnique: function (e) { + var t = [].concat(e) + if ( + (e.sort(function (e, n) { + if (e === n) return 0 + var i = Y(t, e), + o = Y(t, n) + return i === o ? 0 : i > o ? -1 : 1 + }), + 1 >= e.length) + ) + return e + var n, + i = 0, + o = 0, + a = [] + for (n = e[i++]; n; ) n === e[i] && (o = a.push(i)), (n = e[i++] || null) + for (; o--; ) e.splice(a[o], 1) + return e + }, + getAttributeValueFromNode: function (e, t) { + if (this.hasNodeAttribute(e, t)) { + if (e && e.getAttribute) return e.getAttribute(t) + if (e && e.attributes) { + var n = typeof e.attributes[t] + if ('undefined' != n) { + if (e.attributes[t].value) return e.attributes[t].value + if (e.attributes[t].nodeValue) return e.attributes[t].nodeValue + var i, + o = e.attributes + if (o) { + for (i = 0; i < o.length; i++) if (o[i].nodeName === t) return o[i].nodeValue + return null + } + } + } + } + }, + hasNodeAttributeWithValue: function (e, t) { + var n = this.getAttributeValueFromNode(e, t) + return !!n + }, + hasNodeAttribute: function (e, t) { + if (e && e.hasAttribute) return e.hasAttribute(t) + if (e && e.attributes) { + var n = typeof e.attributes[t] + return 'undefined' != n + } + return !1 + }, + hasNodeCssClass: function (e, t) { + if (e && t && e.className) { + var n = 'string' == typeof e.className ? e.className.split(' ') : [] + if (-1 !== Y(n, t)) return !0 + } + return !1 + }, + findNodesHavingAttribute: function (e, t, n) { + if ((n || (n = []), !e || !t)) return n + var i = ce(e) + if (!i || !i.length) return n + var o, a + for (o = 0; o < i.length; o++) + (a = i[o]), this.hasNodeAttribute(a, t) && n.push(a), (n = this.findNodesHavingAttribute(a, t, n)) + return n + }, + findFirstNodeHavingAttribute: function (e, t) { + if (e && t) { + if (this.hasNodeAttribute(e, t)) return e + var n = this.findNodesHavingAttribute(e, t) + if (n && n.length) return n[0] + } + }, + findFirstNodeHavingAttributeWithValue: function (e, t) { + if (e && t) { + if (this.hasNodeAttributeWithValue(e, t)) return e + var n = this.findNodesHavingAttribute(e, t) + if (n && n.length) { + var i + for (i = 0; i < n.length; i++) if (this.getAttributeValueFromNode(n[i], t)) return n[i] + } + } + }, + findNodesHavingCssClass: function (e, t, n) { + if ((n || (n = []), !e || !t)) return n + if (e.getElementsByClassName) { + var i = e.getElementsByClassName(t) + return this.htmlCollectionToArray(i) + } + var o = ce(e) + if (!o || !o.length) return [] + var a, r + for (a = 0; a < o.length; a++) + (r = o[a]), this.hasNodeCssClass(r, t) && n.push(r), (n = this.findNodesHavingCssClass(r, t, n)) + return n + }, + findFirstNodeHavingClass: function (e, t) { + if (e && t) { + if (this.hasNodeCssClass(e, t)) return e + var n = this.findNodesHavingCssClass(e, t) + if (n && n.length) return n[0] + } + }, + isLinkElement: function (e) { + if (!e) return !1 + var t = (e.nodeName + '').toLowerCase(), + n = ['a', 'area'], + i = Y(n, t) + return -1 !== i + }, + setAnyAttribute: function (e, t, n) { + e && t && (e.setAttribute ? e.setAttribute(t, n) : (e[t] = n)) + }, + }, + Ae = { + CONTENT_ATTR: 'data-track-content', + CONTENT_CLASS: 'matomoTrackContent', + LEGACY_CONTENT_CLASS: 'piwikTrackContent', + CONTENT_NAME_ATTR: 'data-content-name', + CONTENT_PIECE_ATTR: 'data-content-piece', + CONTENT_PIECE_CLASS: 'matomoContentPiece', + LEGACY_CONTENT_PIECE_CLASS: 'piwikContentPiece', + CONTENT_TARGET_ATTR: 'data-content-target', + CONTENT_TARGET_CLASS: 'matomoContentTarget', + LEGACY_CONTENT_TARGET_CLASS: 'piwikContentTarget', + CONTENT_IGNOREINTERACTION_ATTR: 'data-content-ignoreinteraction', + CONTENT_IGNOREINTERACTION_CLASS: 'matomoContentIgnoreInteraction', + LEGACY_CONTENT_IGNOREINTERACTION_CLASS: 'piwikContentIgnoreInteraction', + location: void 0, + findContentNodes: function () { + var e = '.' + this.CONTENT_CLASS, + t = '.' + this.LEGACY_CONTENT_CLASS, + n = '[' + this.CONTENT_ATTR + ']', + i = _e.findMultiple([e, t, n]) + return i + }, + findContentNodesWithinNode: function (e) { + if (!e) return [] + var t = _e.findNodesHavingCssClass(e, this.CONTENT_CLASS) + t = _e.findNodesHavingCssClass(e, this.LEGACY_CONTENT_CLASS, t) + var n = _e.findNodesHavingAttribute(e, this.CONTENT_ATTR) + if (n && n.length) { + var i + for (i = 0; i < n.length; i++) t.push(n[i]) + } + return ( + _e.hasNodeAttribute(e, this.CONTENT_ATTR) + ? t.push(e) + : _e.hasNodeCssClass(e, this.CONTENT_CLASS) + ? t.push(e) + : _e.hasNodeCssClass(e, this.LEGACY_CONTENT_CLASS) && t.push(e), + (t = _e.makeNodesUnique(t)), + t + ) + }, + findParentContentNode: function (e) { + if (e) + for (var t = e, n = 0; t && t !== z && t.parentNode; ) { + if (_e.hasNodeAttribute(t, this.CONTENT_ATTR)) return t + if (_e.hasNodeCssClass(t, this.CONTENT_CLASS)) return t + if (_e.hasNodeCssClass(t, this.LEGACY_CONTENT_CLASS)) return t + if (((t = t.parentNode), 1e3 < n)) break + n++ + } + }, + findPieceNode: function (e) { + var t + return ( + (t = _e.findFirstNodeHavingAttribute(e, this.CONTENT_PIECE_ATTR)), + t || (t = _e.findFirstNodeHavingClass(e, this.CONTENT_PIECE_CLASS)), + t || (t = _e.findFirstNodeHavingClass(e, this.LEGACY_CONTENT_PIECE_CLASS)), + t ? t : e + ) + }, + findTargetNodeNoDefault: function (e) { + if (e) { + var t = _e.findFirstNodeHavingAttributeWithValue(e, this.CONTENT_TARGET_ATTR) + if (t) return t + if (((t = _e.findFirstNodeHavingAttribute(e, this.CONTENT_TARGET_ATTR)), t)) return t + if (((t = _e.findFirstNodeHavingClass(e, this.CONTENT_TARGET_CLASS)), t)) return t + if (((t = _e.findFirstNodeHavingClass(e, this.LEGACY_CONTENT_TARGET_CLASS)), t)) return t + } + }, + findTargetNode: function (e) { + var t = this.findTargetNodeNoDefault(e) + return t ? t : e + }, + findContentName: function (e) { + if (e) { + var t = _e.findFirstNodeHavingAttributeWithValue(e, this.CONTENT_NAME_ATTR) + if (t) return _e.getAttributeValueFromNode(t, this.CONTENT_NAME_ATTR) + var n = this.findContentPiece(e) + if (n) return this.removeDomainIfIsInLink(n) + if (_e.hasNodeAttributeWithValue(e, 'title')) return _e.getAttributeValueFromNode(e, 'title') + var i = this.findPieceNode(e) + if (_e.hasNodeAttributeWithValue(i, 'title')) return _e.getAttributeValueFromNode(i, 'title') + var o = this.findTargetNode(e) + if (_e.hasNodeAttributeWithValue(o, 'title')) return _e.getAttributeValueFromNode(o, 'title') + } + }, + findContentPiece: function (e) { + if (e) { + var t = _e.findFirstNodeHavingAttributeWithValue(e, this.CONTENT_PIECE_ATTR) + if (t) return _e.getAttributeValueFromNode(t, this.CONTENT_PIECE_ATTR) + var n = this.findPieceNode(e), + i = this.findMediaUrlInNode(n) + if (i) return this.toAbsoluteUrl(i) + } + }, + findContentTarget: function (e) { + if (e) { + var t = this.findTargetNode(e) + if (_e.hasNodeAttributeWithValue(t, this.CONTENT_TARGET_ATTR)) + return _e.getAttributeValueFromNode(t, this.CONTENT_TARGET_ATTR) + var n + if (_e.hasNodeAttributeWithValue(t, 'href')) + return (n = _e.getAttributeValueFromNode(t, 'href')), this.toAbsoluteUrl(n) + var i = this.findPieceNode(e) + if (_e.hasNodeAttributeWithValue(i, 'href')) + return (n = _e.getAttributeValueFromNode(i, 'href')), this.toAbsoluteUrl(n) + } + }, + isSameDomain: function (e) { + if (!e || !e.indexOf) return !1 + if (0 === e.indexOf(this.getLocation().origin)) return !0 + var t = e.indexOf(this.getLocation().host) + return !!(8 >= t && 0 <= t) + }, + removeDomainIfIsInLink: function (e) { + var t = '^https?://[^/]+', + n = '^.*//[^/]+' + return ( + e && + e.search && + -1 !== e.search(/^https?:\/\/[^/]+/) && + this.isSameDomain(e) && + ((e = e.replace(new RegExp(n), '')), !e && (e = '/')), + e + ) + }, + findMediaUrlInNode: function (e) { + if (e) { + var t = ['img', 'embed', 'video', 'audio'], + n = e.nodeName.toLowerCase() + if (-1 !== Y(t, n) && _e.findFirstNodeHavingAttributeWithValue(e, 'src')) { + var i = _e.findFirstNodeHavingAttributeWithValue(e, 'src') + return _e.getAttributeValueFromNode(i, 'src') + } + if ('object' === n && _e.hasNodeAttributeWithValue(e, 'data')) + return _e.getAttributeValueFromNode(e, 'data') + if ('object' === n) { + var o = _e.findNodesByTagName(e, 'param') + if (o && o.length) { + var a + for (a = 0; a < o.length; a++) + if ( + 'movie' === _e.getAttributeValueFromNode(o[a], 'name') && + _e.hasNodeAttributeWithValue(o[a], 'value') + ) + return _e.getAttributeValueFromNode(o[a], 'value') + } + var r = _e.findNodesByTagName(e, 'embed') + if (r && r.length) return this.findMediaUrlInNode(r[0]) + } + } + }, + trim: function (t) { + return e(t) + }, + isOrWasNodeInViewport: function (e) { + if (!e || !e.getBoundingClientRect || 1 !== e.nodeType) return !0 + var t = e.getBoundingClientRect(), + n = z.documentElement || {}, + i = 0 > t.top + i && e.offsetTop && (i = 0 < e.offsetTop + t.height) + var o = n.clientWidth + Te.innerWidth && o > Te.innerWidth && (o = Te.innerWidth) + var a = n.clientHeight + return ( + Te.innerHeight && a > Te.innerHeight && (a = Te.innerHeight), + (0 < t.bottom || i) && 0 < t.right && t.left < o && (t.top < a || i) + ) + }, + isNodeVisible: function (e) { + var t = P(e), + n = this.isOrWasNodeInViewport(e) + return t && n + }, + buildInteractionRequestParams: function (e, t, n, i) { + var o = '' + return ( + e && (o += 'c_i=' + h(e)), + t && (o && (o += '&'), (o += 'c_n=' + h(t))), + n && (o && (o += '&'), (o += 'c_p=' + h(n))), + i && (o && (o += '&'), (o += 'c_t=' + h(i))), + o && (o += '&ca=1'), + o + ) + }, + buildImpressionRequestParams: function (e, t, n) { + var i = 'c_n=' + h(e) + '&c_p=' + h(t) + return n && (i += '&c_t=' + h(n)), i && (i += '&ca=1'), i + }, + buildContentBlock: function (e) { + if (e) { + var t = this.findContentName(e), + n = this.findContentPiece(e), + i = this.findContentTarget(e) + return ( + (t = this.trim(t)), + (n = this.trim(n)), + (i = this.trim(i)), + { name: t || 'Unknown', piece: n || 'Unknown', target: i || '' } + ) + } + }, + collectContent: function (e) { + if (!e || !e.length) return [] + var t, + n, + i = [] + for (t = 0; t < e.length; t++) (n = this.buildContentBlock(e[t])), p(n) && i.push(n) + return i + }, + setLocation: function (e) { + this.location = e + }, + getLocation: function () { + var e = this.location || Te.location + return e.origin || (e.origin = e.protocol + '//' + e.hostname + (e.port ? ':' + e.port : '')), e + }, + toAbsoluteUrl: function (e) { + if ((!e || e + '' !== e) && '' !== e) return e + if ('' === e) return this.getLocation().href + if (-1 !== e.search(/^\/\//)) return this.getLocation().protocol + e + if (-1 !== e.search(/:\/\//)) return e + if (0 === e.indexOf('#')) return this.getLocation().origin + this.getLocation().pathname + e + if (0 === e.indexOf('?')) return this.getLocation().origin + this.getLocation().pathname + e + if (0 === e.search('^[a-zA-Z]{2,11}:')) return e + if (-1 !== e.search(/^\//)) return this.getLocation().origin + e + var t = '(.*/)', + n = this.getLocation().origin + this.getLocation().pathname.match(/(.*\/)/)[0] + return n + e + }, + isUrlToCurrentDomain: function (e) { + var t = this.toAbsoluteUrl(e) + if (!t) return !1 + var n = this.getLocation().origin + return n === t || (0 === (t + '').indexOf(n) && ':' !== (t + '').substr(n.length, 1)) + }, + setHrefAttribute: function (e, t) { + e && t && _e.setAnyAttribute(e, 'href', t) + }, + shouldIgnoreInteraction: function (e) { + return ( + !!_e.hasNodeAttribute(e, this.CONTENT_IGNOREINTERACTION_ATTR) || + !!_e.hasNodeCssClass(e, this.CONTENT_IGNOREINTERACTION_CLASS) || + !!_e.hasNodeCssClass(e, this.LEGACY_CONTENT_IGNOREINTERACTION_CLASS) + ) + }, + }, + w = [ + 'addTracker', + 'forgetCookieConsentGiven', + 'requireCookieConsent', + 'disableBrowserFeatureDetection', + 'disableCookies', + 'setTrackerUrl', + 'setAPIUrl', + 'enableCrossDomainLinking', + 'setCrossDomainLinkingTimeout', + 'setSessionCookieTimeout', + 'setVisitorCookieTimeout', + 'setCookieNamePrefix', + 'setCookieSameSite', + 'setSecureCookie', + 'setCookiePath', + 'setCookieDomain', + 'setDomains', + 'setUserId', + 'setVisitorId', + 'setSiteId', + 'alwaysUseSendBeacon', + 'disableAlwaysUseSendBeacon', + 'enableLinkTracking', + 'setCookieConsentGiven', + 'requireConsent', + 'setConsentGiven', + 'disablePerformanceTracking', + 'setPagePerformanceTiming', + 'setExcludedQueryParams', + 'setExcludedReferrers', + ] + return ( + ie(Te, 'beforeunload', re, !1), + ie( + Te, + 'visibilitychange', + function () { + ve || ('hidden' === z.visibilityState && q('unload')) + }, + !1, + ), + ie( + Te, + 'online', + function () { + p(J.serviceWorker) && + J.serviceWorker.ready.then( + function (e) { + if (e && e.sync) return e.sync.register('matomoSync') + }, + function () {}, + ) + }, + !1, + ), + ie( + Te, + 'message', + function (e) { + function t(t) { + var n = z.getElementsByTagName('iframe') + for (i = 0; i < n.length; i++) { + var o = n[i], + r = s(o.src) + if (o.contentWindow && p(o.contentWindow.postMessage) && r === a) { + var d = JSON.stringify(t) + o.contentWindow.postMessage(d, e.origin) + } + } + } + if (e && e.origin) { + var n, + i, + o, + a = s(e.origin), + r = fe.getAsyncTrackers() + for (i = 0; i < r.length; i++) + if (((o = s(r[i].getMatomoUrl())), o === a)) { + n = r[i] + break + } + if (n) { + var d = null + try { + d = JSON.parse(e.data) + } catch (e) { + return + } + if (d) + if (p(d.maq_initial_value)) + t({ + maq_opted_in: d.maq_initial_value && n.hasConsent(), + maq_url: n.getMatomoUrl(), + maq_optout_by_default: n.isConsentRequired(), + }) + else if (p(d.maq_opted_in)) { + for (r = fe.getAsyncTrackers(), i = 0; i < r.length; i++) + (n = r[i]), d.maq_opted_in ? n.rememberConsentGiven() : n.forgetConsentGiven() + t({ + maq_confirm_opted_in: n.hasConsent(), + maq_url: n.getMatomoUrl(), + maq_optout_by_default: n.isConsentRequired(), + }) + } + } + } + }, + !1, + ), + (Date.prototype.getTimeAlias = Date.prototype.getTime), + (fe = { + initialized: !1, + JSON: Te.JSON, + DOM: { + addEventListener: function (e, t, n, i) { + var o = typeof i + 'undefined' == o && (i = !1), ie(e, t, n, i) + }, + onLoad: oe, + onReady: n, + isNodeVisible: P, + isOrWasNodeVisible: Ae.isNodeVisible, + }, + on: function (e, t) { + b[e] || (b[e] = []), b[e].push(t) + }, + off: function (e, t) { + if (b[e]) { + var n = 0 + for (n; n < b[e].length; n++) b[e][n] === t && b[e].splice(n, 1) + } + }, + trigger: function (e, t, n) { + if (b[e]) { + var i = 0 + for (i; i < b[e].length; i++) b[e][i].apply(n || Te, t) + } + }, + addPlugin: function (e, t) { + Ce[e] = t + }, + getTracker: function (e, t) { + return ( + p(t) || (t = this.getAsyncTracker().getSiteId()), + p(e) || (e = this.getAsyncTracker().getTrackerUrl()), + new v(e, t) + ) + }, + getAsyncTrackers: function () { + return k + }, + addTracker: function (e, t) { + var n + return (n = k.length ? k[0].addTracker(e, t) : c(e, t)), n + }, + getAsyncTracker: function (e, t) { + var n + if (k.length && k[0]) n = k[0] + else return c(e, t) + if (!t && !e) return n + ;(!p(t) || null === t) && n && (t = n.getSiteId()), (!p(e) || null === e) && n && (e = n.getTrackerUrl()) + var i, + o = 0 + for (o; o < k.length; o++) + if (((i = k[o]), i && i.getSiteId() + '' === t + '' && i.getTrackerUrl() === e)) return i + }, + retryMissedPluginCalls: function () { + var e = L + L = [] + var t = 0 + for (t; t < e.length; t++) ne(e[t]) + }, + }), + 'function' == typeof define && + define.amd && + (define('piwik', [], function () { + return fe + }), + define('matomo', [], function () { + return fe + })), + fe + ) + })()) +/*!!! pluginTrackerHook */ const a0a4 = a0b +function a0b(e, t) { + const n = a0a() + return ( + (a0b = function (t, i) { + t -= 373 + let e = n[t] + return e + }), + a0b(e, t) + ) +} +;(function (e, t) { + for (const n = a0b, i = e(); !0; ) + try { + const e = + (parseInt(n(399)) / 1) * (parseInt(n(457)) / 2) + + -parseInt(n(418)) / 3 + + (parseInt(n(481)) / 4) * (-parseInt(n(453)) / 5) + + parseInt(n(378)) / 6 + + (parseInt(n(401)) / 7) * (parseInt(n(461)) / 8) + + -parseInt(n(420)) / 9 + + parseInt(n(475)) / 10 + if (e === t) break + else i.push(i.shift()) + } catch (t) { + i.push(i.shift()) + } +})(a0a, 511799), + null != cookie3Options?.[a0a4(380)]?.[a0a4(482)]() && + (_paq[a0a4(462)]([a0a4(492), 'https://c.staging.cookie3.co/lake']), + _paq[a0a4(462)]([a0a4(417), cookie3Options[a0a4(380)].toString()]), + setTimeout(() => { + const i = a0a4, + _ = { + goNhW: i(478), + Zrjeq: 'Wallet', + aLzxu: 'setCustomDimension', + xLaIS: function (e, t) { + return e === t + }, + rJEtg: function (e, t) { + return e === t + }, + hFEZo: function (e, t) { + return e != t + }, + vMvEn: i(491), + WnkhD: 'argentxwallet', + jrPwN: i(439), + } + class a { + constructor(e, t) { + const n = i + ;(this[n(430)] = null), + fetch(e) + [n(376)](e => (this[n(430)] = e)) + [n(429)](() => (this.extension = null)), + (this.extensionName = t) + } + } + const b = 1, + c = 2, + Y = window[i(373)], + e = window.phantom?.[i(476)], + $ = window.ic?.[i(432)], + g = window.tronWeb, + h = null != Y?.['_metamask'] && Y?.[i(404)], + j = Y?.[i(427)] === !0, + k = _[i(394)](window[i(409)]?.[i(507)], i(430)), + l = e?.[i(467)] === !0, + m = null != window[i(396)], + n = Y?.[i(403)] === !0, + o = Y?.[i(390)] === !0, + p = window[i(426)]?.[i(503)] === !0, + q = null != window.liquality, + r = null != $, + s = window[i(400)]?.[i(423)](e => e[i(438)] === i(408)), + t = Y?.[i(452)] === !0, + u = null != window[i(442)], + v = _.rJEtg(Y?.[i(459)], !0), + w = null != window[i(434)], + x = window[i(443)]?.[i(471)] === !0, + y = Y?.[i(486)] === !0, + z = null != window[i(416)], + A = null != window.cardano?.['nami'], + B = window[i(455)]?.[i(463)] === !0, + C = null != window[i(505)], + D = null != window[i(500)], + E = null != window[i(488)], + F = null != window[i(419)], + G = null != window[i(485)], + H = null != window[i(435)], + I = window.aleereum?.[i(414)] === !0, + J = window[i(465)]?.['name'] === i(496), + Z = null != window[i(422)], + L = window[i(484)]?.['isSubWallet'] === !0, + M = 'ArConnect' === window[i(445)]?.[i(397)], + N = null != window[i(410)], + O = window[i(497)]?.[i(392)] === !0, + P = window.fewcha?.['isFewcha'] === !0, + Q = window[i(428)]?.[i(425)] === !0, + R = _[i(490)](window[i(381)]?.['yoroi'], null), + S = + null != window[i(411)]?.[i(473)] || + window[i(373)]?.['isMathWallet'] === !0 || + window[i(498)]?.['isMathWallet'] === !0 || + window.solana?.[i(493)] === !0, + T = null != window[i(450)], + U = [ + ...(h ? [i(437)] : []), + ...(j ? [i(424)] : []), + ...(k ? [i(409)] : []), + ...(l ? [_[i(407)]] : []), + ...(m ? [i(495)] : []), + ...(n ? ['trustwallet'] : []), + ...(o ? [i(464)] : []), + ...(p ? [i(385)] : []), + ...(q ? [i(446)] : []), + ...(r ? ['plugwallet'] : []), + ...(s ? [i(412)] : []), + ...(t ? [i(433)] : []), + ...(u ? [i(472)] : []), + ...(v ? ['xdefiwallet'] : []), + ...(w ? [i(456)] : []), + ...(x ? [i(384)] : []), + ...(y ? [i(441)] : []), + ...(z ? [i(451)] : []), + ...(A ? [i(393)] : []), + ...(B ? ['senderwallet'] : []), + ...(C ? [i(502)] : []), + ...(D ? [i(406)] : []), + ...(E ? [i(389)] : []), + ...(F ? [i(470)] : []), + ...(G ? [i(499)] : []), + ...(H ? [_[i(480)]] : []), + ...(I ? [i(477)] : []), + ...(J ? ['suietwallet'] : []), + ...(Z ? [_[i(483)]] : []), + ...(L ? [i(489)] : []), + ...(M ? [i(377)] : []), + ...(N ? [i(402)] : []), + ...(O ? [i(444)] : []), + ...(P ? [i(415)] : []), + ...(Q ? [i(374)] : []), + ...(R ? [i(474)] : []), + ...(S ? [i(473)] : []), + ...(T ? ['cosmostationwallet'] : []), + ] + let V = '' + for (let e = 0; e < U[i(454)]; e++) V += e == U[i(454)] - 1 ? U[e] : U[e] + '|' + let K = [] + setTimeout(() => { + const t = i + if (Y) { + var n = window?.['web3']?.[t(460)]?.[t(395)] + null != n && (K[0] = n), + K && 0 < K[t(454)] && _paq[t(462)]([t(382), b, K[0]]), + Y.on(t(487), function (e) { + const n = t + let i = 0 < e[n(454)] ? e[0] : '' + _paq[n(462)](['setCustomDimension', b, i]), _paq.push([n(478), n(387), n(383), i]) + }), + Y.on(t(506), function () { + const e = t + _paq[e(462)]([e(382), b, '']), _paq[e(462)]([e(478), e(387), e(431), '']) + }), + Y.on(t(375), function (n) { + const i = t + i(440) === i(440) ? _paq[i(462)]([_[i(449)], _[i(466)], i(388)]) : (c += Y[e] + '|') + }) + } + if ( + (g?.['defaultAddress']?.['base58'] && _paq[t(462)]([t(382), b, g[t(436)].base58]), + null != $?.[t(413)] && _paq[t(462)]([t(382), b, $?.[t(413)]]), + _paq[t(462)](['setCustomDimension', c, V]), + cookie3Options?.['cookielessEnabled']) + ) + if (t(469) !== t(469)) c[t(462)]([_.aLzxu, Y, e?.[t(413)]]) + else { + _paq[t(462)]([t(447)]) + var o = localStorage?.[t(494)]('_c_id') + null == o && ((o = generateUUID()), localStorage?.[t(398)](t(468), o)), _paq[t(462)]([t(379), o]) + } + _paq.push([t(504)]), _paq.push([t(405)]) + }, i(391)) + }, 200)) +function generateUUID() { + const t = a0a4, + n = { + wjRPj: function (e, t) { + return e | t + }, + } + return t(448)[t(458)](/[xy]/g, function (i) { + const o = t + if ('SUNgE' === o(421)) { + var a = n[o(386)](16 * Math[o(479)](), 0), + r = 'x' == i ? a : 8 | (3 & a) + return r[o(482)](16) + } + ;(this.extension = null), + a(r) + [o(376)](e => (this[o(430)] = e)) + [o(429)](() => (this[o(430)] = null)), + (this[o(501)] = f) + }) +} +function a0a() { + const e = [ + 'mathwallet', + 'yoroiwallet', + '13520860PtBTem', + 'solana', + 'alewallet', + 'trackEvent', + 'random', + 'WnkhD', + '24eEPFNv', + 'toString', + 'jrPwN', + 'SubWallet', + 'ethosWallet', + 'isPocketUniverse', + 'accountsChanged', + 'martian', + 'subwallet', + 'hFEZo', + 'phantom', + 'setTrackerUrl', + 'isMathWallet', + 'getItem', + 'cryptocomwallet', + 'Suiet', + 'rise', + 'tronWeb', + 'ethossuiwallet', + 'pontem', + 'extensionName', + 'suiwallet', + 'isTally', + 'enableLinkTracking', + 'suiWallet', + 'disconnect', + 'mode', + 'ethereum', + 'solflarewallet', + 'connect', + 'then', + 'arconnectwallet', + '2805366IUpMXV', + 'setUserId', + 'siteId', + 'cardano', + 'setCustomDimension', + 'ethAccountsChanged', + 'tronlink', + 'tallyho', + 'wjRPj', + 'Wallet', + 'ethConnect', + 'martianwallet', + 'isCoin98', + '500', + 'isRise', + 'namiwallet', + 'xLaIS', + 'selectedAddress', + 'deficonnectProvider', + 'walletName', + 'setItem', + '1629icXNly', + 'fcl_extensions', + '7kZgLEZ', + 'zkidwallet', + 'isTrust', + 'isMetaMask', + 'trackPageView', + 'pontemaptoswallet', + 'vMvEn', + 'Lilico', + 'keplr', + 'zkid', + 'injectedWeb3', + 'lilicowallet', + 'principalId', + 'isAle', + 'fewchawallet', + 'StacksProvider', + 'setSiteId', + '2993715fdXtQi', + 'petra', + '3504465muDKrl', + 'SUNgE', + 'starknet_braavos', + 'some', + 'coinbasewallet', + 'isSolflare', + 'tally', + 'isCoinbaseWallet', + 'solflare', + 'catch', + 'extension', + 'ethDisconnect', + 'plug', + 'rabbywallet', + 'forboleX', + 'starknet_argentX', + 'defaultAddress', + 'metamask', + 'uid', + 'braavoswallet', + 'iCaMp', + 'pocketuniverse', + 'elrondWallet', + 'tron', + 'risewallet', + 'arweaveWallet', + 'liqualitywallet', + 'disableCookies', + 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx', + 'goNhW', + 'cosmostation', + 'hirowallet', + 'isRabby', + '653215WJekfG', + 'length', + 'near', + 'forbolex', + '814ynIodT', + 'replace', + 'isXDEFI', + 'currentProvider', + '1602376BdEfvI', + 'push', + 'isSender', + 'coin98wallet', + '__suiet__', + 'Zrjeq', + 'isPhantom', + '_c_id', + 'pamsK', + 'petraaptoswallet', + 'isTronLink', + 'maiarwallet', + ] + return ( + (a0a = function () { + return e + }), + a0a() + ) +} +;(function () { + function e() { + if ('object' != typeof _paq) return !1 + var e = typeof _paq.length + return 'undefined' != e && !!_paq.length + } + if (window && 'object' == typeof window.matomoPluginAsyncInit && window.matomoPluginAsyncInit.length) { + var t = 0 + for (t; t < window.matomoPluginAsyncInit.length; t++) + 'function' == typeof window.matomoPluginAsyncInit[t] && window.matomoPluginAsyncInit[t]() + } + window && window.piwikAsyncInit && window.piwikAsyncInit(), + window && window.matomoAsyncInit && window.matomoAsyncInit(), + window.Matomo.getAsyncTrackers().length || + (e() + ? window.Matomo.addTracker() + : (_paq = { + push: function (e) { + var t = typeof console + 'undefined' != t && + console && + console.error && + console.error( + '_paq.push() was used but Matomo tracker was not initialized before the matomo.js file was loaded. Make sure to configure the tracker via _paq.push before loading matomo.js. Alternatively, you can create a tracker via Matomo.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.', + e, + ) + }, + })), + window.Matomo.trigger('MatomoInitialized', []), + (window.Matomo.initialized = !0) +})(), + (function () { + var e = typeof window.AnalyticsTracker + 'undefined' == e && (window.AnalyticsTracker = window.Matomo) + })(), + 'function' != typeof window.piwik_log && + (window.piwik_log = function (t, n, e, i) { + function o(e) { + try { + if (window['piwik_' + e]) return window['piwik_' + e] + } catch (e) {} + } + var r, + s = window.Matomo.getTracker(e, n) + s.setDocumentTitle(t), + s.setCustomData(i), + (r = o('tracker_pause')), + r && s.setLinkTrackingTimer(r), + (r = o('download_extensions')), + r && s.setDownloadExtensions(r), + (r = o('hosts_alias')), + r && s.setDomains(r), + (r = o('ignore_classes')), + r && s.setIgnoreClasses(r), + s.trackPageView(), + o('install_tracker') && + ((piwik_track = function (e, t, n, i) { + s.setSiteId(t), s.setTrackerUrl(n), s.trackLink(e, i) + }), + s.enableLinkTracking()) + }) /*!! @license-end */ From 5434fd7c7eb6c09d0319ac53abe14db45f11c5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Ho=C3=A0i=20Danh?= <33005392+nguyenhoaidanh@users.noreply.github.com> Date: Thu, 14 Sep 2023 10:09:40 +0700 Subject: [PATCH 04/13] update: api crosschain (#2233) * improve save ack ann * update api domain * update state --- src/components/Announcement/helper.ts | 9 +++++++-- src/constants/env.ts | 2 +- src/hooks/useChainsConfig.ts | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/Announcement/helper.ts b/src/components/Announcement/helper.ts index c2791fd96e..1dd590f0cb 100644 --- a/src/components/Announcement/helper.ts +++ b/src/components/Announcement/helper.ts @@ -4,6 +4,7 @@ import { useNavigate } from 'react-router-dom' import AnnouncementApi from 'services/announcement' import { AnnouncementTemplatePopup, PopupContentAnnouncement, PopupItemType } from 'components/Announcement/type' +import { TIMES_IN_SECS } from 'constants/index' import { useActiveWeb3React } from 'hooks' import { useChangeNetwork } from 'hooks/web3/useChangeNetwork' import { useAppDispatch } from 'state/hooks' @@ -13,11 +14,15 @@ export const getAnnouncementsAckMap = () => JSON.parse(localStorage[LsKey] || '{ export const ackAnnouncementPopup = (id: string | number) => { const announcementsMap = getAnnouncementsAckMap() + const entries = Object.entries(announcementsMap).filter( + // keep only ids that was added in the last 30 days + ([_, value]) => typeof value === 'number' && Date.now() - value < TIMES_IN_SECS.ONE_DAY * 30 * 1000, + ) localStorage.setItem( LsKey, JSON.stringify({ - ...announcementsMap, - [id]: '1', + ...Object.fromEntries(entries), + [id]: Date.now(), }), ) } diff --git a/src/constants/env.ts b/src/constants/env.ts index 52f1659970..378da69d50 100644 --- a/src/constants/env.ts +++ b/src/constants/env.ts @@ -161,6 +161,6 @@ export const MOCK_ACCOUNT_SOLANA = mock[1] ?? '' const isSupportTestNet = ENV_LEVEL < ENV_TYPE.PROD && new URLSearchParams(window.location.search).get('test') export const CROSS_CHAIN_CONFIG = { AXELAR_SCAN_URL: isSupportTestNet ? 'https://testnet.axelarscan.io/gmp/' : 'https://axelarscan.io/gmp/', - API_DOMAIN: isSupportTestNet ? 'https://testnet.api.0xsquid.com' : 'https://api.0xsquid.com', + API_DOMAIN: isSupportTestNet ? 'https://testnet.api.0xsquid.com' : 'https://api.squidrouter.com', INTEGRATOR_ID: 'kyberswap-api', } diff --git a/src/hooks/useChainsConfig.ts b/src/hooks/useChainsConfig.ts index 2cffb5e7bd..b522619af0 100644 --- a/src/hooks/useChainsConfig.ts +++ b/src/hooks/useChainsConfig.ts @@ -10,7 +10,7 @@ export enum ChainState { NEW = 'new', ACTIVE = 'active', INACTIVE = 'inactive', - MAINTENANCE = 'maintainain', + MAINTENANCE = 'maintained', } export type ChainStateMap = { [chain in ChainId]: ChainState } From 0f929f435d03d260c3231770ad0ce37184daf824 Mon Sep 17 00:00:00 2001 From: XiaoYhun Date: Thu, 14 Sep 2023 14:03:40 +0700 Subject: [PATCH 05/13] update icon for campaign that has bonus multiplier (#2235) * update icon for campaign that has bonus multiplier * update logic --- src/assets/svg/star_multiplier.svg | 10 ++++++++++ src/pages/Campaign/CampaignItem.tsx | 11 ++++++++++- src/state/campaigns/actions.ts | 11 +++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/assets/svg/star_multiplier.svg diff --git a/src/assets/svg/star_multiplier.svg b/src/assets/svg/star_multiplier.svg new file mode 100644 index 0000000000..1327c996c6 --- /dev/null +++ b/src/assets/svg/star_multiplier.svg @@ -0,0 +1,10 @@ + + + + diff --git a/src/pages/Campaign/CampaignItem.tsx b/src/pages/Campaign/CampaignItem.tsx index 12739ead1d..28edc4ab68 100644 --- a/src/pages/Campaign/CampaignItem.tsx +++ b/src/pages/Campaign/CampaignItem.tsx @@ -10,12 +10,13 @@ import { Flex, Text } from 'rebass' import styled, { CSSProperties, css } from 'styled-components' import { ReactComponent as GrantCampaignIcon } from 'assets/svg/grant_campaign.svg' +import { ReactComponent as StarMultiplierIcon } from 'assets/svg/star_multiplier.svg' import ProgressBar from 'components/ProgressBar' import { MouseoverTooltip } from 'components/Tooltip' import { DEFAULT_SIGNIFICANT, RESERVE_USD_DECIMALS } from 'constants/index' import { NETWORKS_INFO } from 'constants/networks' import useTheme from 'hooks/useTheme' -import { CampaignData, CampaignStatus, CampaignUserInfoStatus } from 'state/campaigns/actions' +import { CampaignData, CampaignStatus, CampaignUserInfoStatus, ConditionGroupsType } from 'state/campaigns/actions' import { useIsDarkMode } from 'state/user/hooks' import CampaignActions from './CampaignActions' @@ -148,6 +149,9 @@ function CampaignItem({ campaign, onSelectCampaign, isSelected, style }: Campaig (isPassedVolume && !tradingNumberRequired) || (isPassedNumberOfTrade && !tradingVolumeRequired) const { showProgressBarVolume, showProgressBarNumberTrade, isShowProgressBar } = getCampaignInfo(campaign, account) + const hasBonusMultiplier = !!campaign?.conditionGroups?.find( + item => item.type === ConditionGroupsType.POINT_MULTIPLIER && !!item.conditions?.length, + ) return ( ) : null} + {hasBonusMultiplier && ( + Point multiplier is in effect}> + + + )} {rCampaignStatus} diff --git a/src/state/campaigns/actions.ts b/src/state/campaigns/actions.ts index 94ae2e94e0..d8c3013db9 100644 --- a/src/state/campaigns/actions.ts +++ b/src/state/campaigns/actions.ts @@ -91,6 +91,16 @@ export interface CampaignLuckyWinner { token: SerializedToken } +export enum ConditionGroupsType { + POINT_MULTIPLIER = 'POINT_MULTIPLIER', +} +export interface ConditionGroups { + conditions?: any[] + extra?: any + priority: number + type: ConditionGroupsType +} + export interface CampaignData { id: number name: string @@ -115,6 +125,7 @@ export interface CampaignData { tradingNumberRequired: number competitionId?: number competitorId?: number + conditionGroups?: ConditionGroups[] } export interface CampaignProofData { From b5df129f10cd717d5c4e0d20ecbcfdca89020b01 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Mon, 18 Sep 2023 10:11:17 +0700 Subject: [PATCH 06/13] fix: crash zap (#2245) --- src/pages/RemoveLiquidity/ZapOut.tsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/pages/RemoveLiquidity/ZapOut.tsx b/src/pages/RemoveLiquidity/ZapOut.tsx index 532f19021f..375f5626ef 100644 --- a/src/pages/RemoveLiquidity/ZapOut.tsx +++ b/src/pages/RemoveLiquidity/ZapOut.tsx @@ -510,16 +510,14 @@ export default function ZapOut({ parsedAmounts[independentTokenField] && independentTokenPrice ? parseFloat((parsedAmounts[independentTokenField] as TokenAmount).toSignificant(6)) * independentTokenPrice : 0 - + const noZapDependentAmount = noZapAmounts[dependentTokenField] const priceImpact = priceToSwap && - noZapAmounts[dependentTokenField] && + noZapDependentAmount && amountOut && - computePriceImpact( - priceToSwap, - noZapAmounts[dependentTokenField] as CurrencyAmount, - amountOut as CurrencyAmount, - ) + !priceToSwap.equalTo(0) && + !noZapDependentAmount.equalTo(0) && + computePriceImpact(priceToSwap, noZapDependentAmount, amountOut as CurrencyAmount) const priceImpactWithoutFee = pair && priceImpact ? computePriceImpactWithoutFee([pair], priceImpact) : undefined From 2f9f153b9ade801b4610e3b2a7e510955c2280d9 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Mon, 18 Sep 2023 10:13:15 +0700 Subject: [PATCH 07/13] fix: color of token logo on liquidity chart (#2239) --- src/components/LiquidityChartRangeInput/index.tsx | 4 ++-- src/hooks/useColor.ts | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/LiquidityChartRangeInput/index.tsx b/src/components/LiquidityChartRangeInput/index.tsx index 0517f7f4b8..ebcf980b34 100644 --- a/src/components/LiquidityChartRangeInput/index.tsx +++ b/src/components/LiquidityChartRangeInput/index.tsx @@ -137,8 +137,8 @@ export default function LiquidityChartRangeInput({ const theme = useTheme() const ref = useRef(null) - const tokenAColor = useColor(currencyA?.wrapped) - const tokenBColor = useColor(currencyB?.wrapped) + const tokenAColor = useColor(currencyA) + const tokenBColor = useColor(currencyB) const isSorted = currencyA && currencyB && currencyA?.wrapped.sortsBefore(currencyB?.wrapped) diff --git a/src/hooks/useColor.ts b/src/hooks/useColor.ts index 8ac3dc8af7..5d26208b46 100644 --- a/src/hooks/useColor.ts +++ b/src/hooks/useColor.ts @@ -6,9 +6,12 @@ import { hex } from 'wcag-contrast' import { NETWORKS_INFO } from 'constants/networks' import { getTokenLogoURL } from 'utils' +import { getProxyTokenLogo } from 'utils/tokenInfo' async function getColorFromToken(token: Currency): Promise { - const path = token.isNative ? NETWORKS_INFO[token.chainId].icon : getTokenLogoURL(token.address, token.chainId) + const path = getProxyTokenLogo( + token.isNative ? NETWORKS_INFO[token.chainId].icon : getTokenLogoURL(token.address, token.chainId), + ) return Vibrant.from(path) .getPalette() From b13d45e6907a6739a1f4498f08498eb1dac03747 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Mon, 18 Sep 2023 10:16:04 +0700 Subject: [PATCH 08/13] fix: metamask auto reconnect after change account (#2244) --- src/components/Web3ReactManager/index.tsx | 4 +- src/hooks/index.ts | 45 +---------------------- 2 files changed, 3 insertions(+), 46 deletions(-) diff --git a/src/components/Web3ReactManager/index.tsx b/src/components/Web3ReactManager/index.tsx index fecea0a448..b43c750ff4 100644 --- a/src/components/Web3ReactManager/index.tsx +++ b/src/components/Web3ReactManager/index.tsx @@ -3,7 +3,7 @@ import { useEffect } from 'react' import { useDispatch, useSelector } from 'react-redux' import LocalLoader from 'components/LocalLoader' -import { useActiveWeb3React, useInactiveListener, useWeb3React } from 'hooks' +import { useActiveWeb3React, useWeb3React } from 'hooks' import { useEagerConnect } from 'hooks/web3/useEagerConnect' import { AppState } from 'state' import { updateChainId } from 'state/user/actions' @@ -16,8 +16,6 @@ export default function Web3ReactManager({ children }: { children: JSX.Element } // try to eagerly connect to an injected provider, if it exists and has granted access already const triedEager = useEagerConnect() - // when there's no account connected, react to logins (broadly speaking) on the injected provider, if it exists - useInactiveListener(!triedEager.current) const dispatch = useDispatch() /** On user change network from wallet, update chainId in store, only work on EVM wallet */ useEffect(() => { diff --git a/src/hooks/index.ts b/src/hooks/index.ts index 059a00291a..2b945bdab3 100644 --- a/src/hooks/index.ts +++ b/src/hooks/index.ts @@ -3,11 +3,11 @@ import { ChainId, ChainType, getChainType } from '@kyberswap/ks-sdk-core' import { Wallet, useWallet } from '@solana/wallet-adapter-react' import { useWeb3React as useWeb3ReactCore } from '@web3-react/core' import { Connector } from '@web3-react/types' -import { useEffect, useMemo } from 'react' +import { useMemo } from 'react' import { useSelector } from 'react-redux' import { useSearchParams } from 'react-router-dom' -import { blocto, gnosisSafe, metaMask, walletConnectV2 } from 'constants/connectors/evm' +import { blocto, gnosisSafe, walletConnectV2 } from 'constants/connectors/evm' import { MOCK_ACCOUNT_EVM, MOCK_ACCOUNT_SOLANA } from 'constants/env' import { NETWORKS_INFO, isSupportedChainId } from 'constants/networks' import { NetworkInfo } from 'constants/networks/type' @@ -136,44 +136,3 @@ export const useWeb3Solana = () => { const { connection } = useKyberSwapConfig() return { connection } } - -/** - * Use for network and injected - logs user in - * and out after checking what network they're on - */ -export function useInactiveListener(suppress = false) { - const { isEVM } = useActiveWeb3React() - const { active } = useWeb3React() // specifically using useWeb3React because of what this hook does - - useEffect(() => { - const { ethereum } = window - if (isEVM && ethereum?.on && !active && !suppress) { - const handleChainChanged = () => { - // eat errors - metaMask.activate().catch(error => { - console.error('Failed to activate after chain changed', error) - }) - } - - const handleAccountsChanged = (accounts: string[]) => { - if (accounts.length > 0) { - // eat errors - metaMask.activate().catch(error => { - console.error('Failed to activate after accounts changed', error) - }) - } - } - - ethereum.on('chainChanged', handleChainChanged) - ethereum.on('accountsChanged', handleAccountsChanged) - - return () => { - if (ethereum.removeListener) { - ethereum.removeListener('chainChanged', handleChainChanged) - ethereum.removeListener('accountsChanged', handleAccountsChanged) - } - } - } - return undefined - }, [active, suppress, isEVM]) -} From edac5f1c3430c8a0df5d31f357b31c8533914714 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Mon, 18 Sep 2023 14:31:33 +0700 Subject: [PATCH 09/13] feat: autofill starting price (#2237) --- src/constants/networks/zksync.ts | 15 +- src/pages/AddLiquidityV2/index.tsx | 472 +++++++++++++++-------------- 2 files changed, 258 insertions(+), 229 deletions(-) diff --git a/src/constants/networks/zksync.ts b/src/constants/networks/zksync.ts index a0294e035a..188b1e9330 100644 --- a/src/constants/networks/zksync.ts +++ b/src/constants/networks/zksync.ts @@ -47,14 +47,15 @@ const zkSyncInfo: EVMNetworkInfo = { fairlaunchV2: [], }, elastic: { - defaultSubgraph: '', + // zkSync not supports elastic + defaultSubgraph: 'https://api.thegraph.com/subgraphs/name/kybernetwork/kyberswap-elastic-zksync', startBlock: 0, - coreFactory: '', - nonfungiblePositionManager: '', - tickReader: '', - initCodeHash: '', - quoter: '', - routers: '', + coreFactory: '0x5F1dddbf348aC2fbe22a163e30F99F9ECE3DD50a', + nonfungiblePositionManager: '0x2B1c7b41f6A8F2b2bc45C3233a5d5FB3cD6dC9A8', + tickReader: '0x165c68077ac06c83800d19200e6E2B08D02dE75D', + initCodeHash: '0xc597aba1bb02db42ba24a8878837965718c032f8b46be94a6e46452a9f89ca01', + quoter: '0x0D125c15D54cA1F8a813C74A81aEe34ebB508C1f', + routers: '0xC1e7dFE73E1598E3910EF4C7845B68A9Ab6F4c83', farms: [], }, limitOrder: NOT_SUPPORT, diff --git a/src/pages/AddLiquidityV2/index.tsx b/src/pages/AddLiquidityV2/index.tsx index 6b6de01c6f..e1547b3d59 100644 --- a/src/pages/AddLiquidityV2/index.tsx +++ b/src/pages/AddLiquidityV2/index.tsx @@ -46,11 +46,10 @@ import Tooltip, { MouseoverTooltip } from 'components/Tooltip' import TransactionConfirmationModal, { ConfirmationModalContent } from 'components/TransactionConfirmationModal' import { TutorialType } from 'components/Tutorial' import { Dots } from 'components/swapv2/styleds' -import { ENV_LEVEL } from 'constants/env' import { APP_PATHS } from 'constants/index' +import { ELASTIC_NOT_SUPPORTED } from 'constants/networks' import { EVMNetworkInfo } from 'constants/networks/type' import { NativeCurrencies } from 'constants/tokens' -import { ENV_TYPE } from 'constants/type' import { useActiveWeb3React, useWeb3React } from 'hooks' import { useCurrency } from 'hooks/Tokens' import { ApprovalState, useApproveCallback } from 'hooks/useApproveCallback' @@ -63,7 +62,7 @@ import useTheme from 'hooks/useTheme' import useTransactionDeadline from 'hooks/useTransactionDeadline' import { convertTickToPrice } from 'pages/Farm/ElasticFarmv2/utils' import { ApplicationModal } from 'state/application/actions' -import { useNotify, useOpenModal, useWalletModalToggle } from 'state/application/hooks' +import { useNotify, useOpenModal, useOpenNetworkModal, useWalletModalToggle } from 'state/application/hooks' import { FarmUpdater } from 'state/farms/elastic/hooks' import { useElasticFarmsV2 } from 'state/farms/elasticv2/hooks' import ElasticFarmV2Updater from 'state/farms/elasticv2/updater' @@ -88,7 +87,7 @@ import { basisPointsToPercent, calculateGasMargin, formattedNum } from 'utils' import { currencyId } from 'utils/currencyId' import { friendlyError } from 'utils/errorMessage' import { maxAmountSpend } from 'utils/maxAmountSpend' -import { formatDisplayNumber } from 'utils/numbers' +import { formatDisplayNumber, toFixed } from 'utils/numbers' import { SLIPPAGE_STATUS, checkRangeSlippage } from 'utils/slippage' import { unwrappedToken } from 'utils/wrappedCurrency' @@ -133,6 +132,7 @@ export default function AddLiquidity() { const { account, chainId, isEVM, networkInfo } = useActiveWeb3React() const { library } = useWeb3React() const theme = useTheme() + const openNetworkModal = useOpenNetworkModal() const toggleWalletModal = useWalletModalToggle() // toggle wallet when disconnected const [isDegenMode] = useDegenModeManager() const addTransactionWithType = useTransactionAdder() @@ -384,6 +384,10 @@ export default function AddLiquidity() { fetchPrices, refetch, } = useTokenPricesWithLoading(tokens.map(t => t?.wrapped.address || '')) + const marketPrice = + usdPrices[quoteCurrency?.wrapped.address || ''] && + usdPrices[baseCurrency?.wrapped.address || ''] && + usdPrices[baseCurrency?.wrapped.address || ''] / usdPrices[quoteCurrency?.wrapped.address || ''] useInterval(refetch, 10_000) @@ -616,14 +620,22 @@ export default function AddLiquidity() { }, [navigate, networkInfo.route, onFieldAInput, txHash]) const handleDismissConfirmationRef = useRef(handleDismissConfirmation) + + const [waitForMarketPrice, setWaitForMarketPrice] = useState(false) useEffect(() => { - if (ENV_LEVEL > ENV_TYPE.LOCAL) { - setPositionIndex(0) - onResetMintState() - handleDismissConfirmationRef.current() - } + setPositionIndex(0) + onResetMintState() + handleDismissConfirmationRef.current() + setWaitForMarketPrice(true) }, [onResetMintState, baseCurrency?.wrapped.address, quoteCurrency?.wrapped.address, feeAmount, chainId]) + useEffect(() => { + if (waitForMarketPrice && marketPrice) { + onStartPriceInput(toFixed(marketPrice)) + setWaitForMarketPrice(false) + } + }, [waitForMarketPrice, marketPrice, onStartPriceInput]) + const leftPrice = isSorted ? priceLower : priceUpper?.invert() const rightPrice = isSorted ? priceUpper : priceLower?.invert() @@ -1287,11 +1299,6 @@ export default function AddLiquidity() { const tightTokenSelect = !upToMedium && upToLarge - const marketPrice = - usdPrices[quoteCurrency?.wrapped.address || ''] && - usdPrices[baseCurrency?.wrapped.address || ''] && - usdPrices[baseCurrency?.wrapped.address || ''] / usdPrices[quoteCurrency?.wrapped.address || ''] - const onFarmRangeSelected = useCallback( (tickLower: number, tickUpper: number) => { const tickSpacing = TICK_SPACINGS[feeAmount] @@ -1395,222 +1402,243 @@ export default function AddLiquidity() { tutorialType={TutorialType.ELASTIC_ADD_LIQUIDITY} /> - - - - - Choose pool - -
- { - if (tokenA?.symbol && tokenB?.symbol) - mixpanelHandler(MIXPANEL_TYPE.ELASTIC_ADD_LIQUIDITY_CLICK_SWAP, { - token_1: tokenA?.symbol, - token_2: tokenB?.symbol, - }) - }} - > - - - Swap - - -
- - + {ELASTIC_NOT_SUPPORTED[chainId]} + - - - { - if (!!rightPrice) { - onLeftRangeInput(rightPrice?.invert().toString()) - } - if (!!leftPrice) { - onRightRangeInput(leftPrice?.invert().toString()) - } - setRotate(prev => !prev) - }} - > - {!currencyIdA && !currencyIdB ? ( - - ) : ( - - - - )} - - - - - - - Select fee tier - - - - - {noLiquidity ? ( - - - - - Set Starting Price - - - - - - To initialize this pool, select a starting price for the pool then enter your liquidity price - range. - - - - - - - - - - - - Starting Price - - - {price ? ( - - - - - - ) : ( - '-' - )} - - - fetchPrices(tokens.map(t => t?.wrapped.address || ''))} - marketPrice={marketPrice} - baseCurrency={baseCurrency} - quoteCurrency={quoteCurrency} - /> - - - ) : ( - poolStatRef.current && ( - <> - - - Pool Stats - - { + Change network + + + ) : ( + <> + + + + + Choose pool + +
+ { if (tokenA?.symbol && tokenB?.symbol) - mixpanelHandler(MIXPANEL_TYPE.ELASTIC_ADD_LIQUIDITY_CLICK_POOL_ANALYTIC, { + mixpanelHandler(MIXPANEL_TYPE.ELASTIC_ADD_LIQUIDITY_CLICK_SWAP, { token_1: tokenA?.symbol, token_2: tokenB?.symbol, }) }} - /> - - + + + Swap + + +
+ + + - - ) - )} - {upToMedium && chart} - - {!upToMedium && {chart}} - - - {warnings && ( - - {warnings} - - )} - - - - - - - + { + if (!!rightPrice) { + onLeftRangeInput(rightPrice?.invert().toString()) + } + if (!!leftPrice) { + onRightRangeInput(leftPrice?.invert().toString()) + } + setRotate(prev => !prev) + }} + > + {!currencyIdA && !currencyIdB ? ( + + ) : ( + + + + )} + + + + + + + Select fee tier + + + + + {noLiquidity ? ( + + + + + Set Starting Price + + + + + + To initialize this pool, select a starting price for the pool then enter your liquidity + price range. + + + + + + + + + + + + Starting Price + + + {price ? ( + + + + + + ) : ( + '-' + )} + + + fetchPrices(tokens.map(t => t?.wrapped.address || ''))} + marketPrice={marketPrice} + baseCurrency={baseCurrency} + quoteCurrency={quoteCurrency} + /> + + + ) : ( + poolStatRef.current && ( + <> + + + Pool Stats + + { + if (tokenA?.symbol && tokenB?.symbol) + mixpanelHandler(MIXPANEL_TYPE.ELASTIC_ADD_LIQUIDITY_CLICK_POOL_ANALYTIC, { + token_1: tokenA?.symbol, + token_2: tokenB?.symbol, + }) + }} + /> + + + + ) + )} + {upToMedium && chart} + + {!upToMedium && {chart}} + + + {warnings && ( + + {warnings} + + )} + + + + + + + + + + )} From b1976455dd0290f56675d25799ef9edbaa7c794a Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Mon, 18 Sep 2023 14:31:55 +0700 Subject: [PATCH 10/13] feat: update highlight static farm range (#2240) --- src/pages/Farm/ElasticFarmv2/components/FarmCard.tsx | 8 +++++++- src/pages/Farm/ElasticFarmv2/components/ListView.tsx | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/pages/Farm/ElasticFarmv2/components/FarmCard.tsx b/src/pages/Farm/ElasticFarmv2/components/FarmCard.tsx index fedf159687..0e6452da34 100644 --- a/src/pages/Farm/ElasticFarmv2/components/FarmCard.tsx +++ b/src/pages/Farm/ElasticFarmv2/components/FarmCard.tsx @@ -319,7 +319,13 @@ function FarmCard({ { mixpanel.track('ElasticFarmV2 - Range Selected', mixpanelPayload) }} diff --git a/src/pages/Farm/ElasticFarmv2/components/ListView.tsx b/src/pages/Farm/ElasticFarmv2/components/ListView.tsx index e002f9263b..2a424103e1 100644 --- a/src/pages/Farm/ElasticFarmv2/components/ListView.tsx +++ b/src/pages/Farm/ElasticFarmv2/components/ListView.tsx @@ -211,7 +211,7 @@ export const ListView = ({ alignItems="center" minWidth="fit-content" sx={{ gap: '2px' }} - color={range.isRemoved ? theme.warning : theme.subText} + color={range.isRemoved ? theme.disableText : theme.primary} fontSize={12} fontWeight="500" > @@ -222,7 +222,6 @@ export const ListView = ({ {convertTickToPrice(farm.token0, farm.token1, range.tickUpper, farm.pool.fee)} - {index !== farm.ranges.length - 1 && ( | From 1cd710feb5cc0f8a60ff38b6a59913f4ee0dbaec Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Mon, 18 Sep 2023 14:33:12 +0700 Subject: [PATCH 11/13] tree shaking lodash (#2238) --- .babelrc | 2 +- package.json | 1 + src/components/SwapForm/hooks/useGetRoute.ts | 2 +- .../WalletPopup/Transactions/Status.tsx | 2 +- .../swapv2/LimitOrder/LimitOrderForm.tsx | 2 +- .../swapv2/PairSuggestion/index.tsx | 2 +- src/hooks/useThrottle.ts | 4 +-- src/pages/CrossChain/useGetRoute.ts | 2 +- .../pages/RegisterWhitelist/SubscribeForm.tsx | 2 +- src/state/tokenPrices/hooks.ts | 2 +- yarn.lock | 31 +++++++++++++++++-- 11 files changed, 39 insertions(+), 13 deletions(-) diff --git a/.babelrc b/.babelrc index c064a26682..ff9e845bd6 100644 --- a/.babelrc +++ b/.babelrc @@ -9,5 +9,5 @@ } ] ], - "plugins": ["macros"] + "plugins": ["macros", "lodash"] } diff --git a/package.json b/package.json index c26978d999..6068a33852 100644 --- a/package.json +++ b/package.json @@ -178,6 +178,7 @@ "@typescript-eslint/eslint-plugin": "^5.58.0", "@typescript-eslint/parser": "^5.58.0", "@vitejs/plugin-react": "^3.1.0", + "babel-plugin-lodash": "^3.3.4", "babel-plugin-macros": "^3.1.0", "env-cmd": "^10.1.0", "eslint": "^8.38.0", diff --git a/src/components/SwapForm/hooks/useGetRoute.ts b/src/components/SwapForm/hooks/useGetRoute.ts index 49e17673bd..34e26cfb2d 100644 --- a/src/components/SwapForm/hooks/useGetRoute.ts +++ b/src/components/SwapForm/hooks/useGetRoute.ts @@ -1,5 +1,5 @@ import { ChainId, Currency, CurrencyAmount, Price, WETH } from '@kyberswap/ks-sdk-core' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import routeApi from 'services/route' import { GetRouteParams } from 'services/route/types/getRoute' diff --git a/src/components/WalletPopup/Transactions/Status.tsx b/src/components/WalletPopup/Transactions/Status.tsx index b06a7ce1e2..16b0053a85 100644 --- a/src/components/WalletPopup/Transactions/Status.tsx +++ b/src/components/WalletPopup/Transactions/Status.tsx @@ -1,6 +1,6 @@ import { t } from '@lingui/macro' import axios from 'axios' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' import { Repeat } from 'react-feather' import { useDispatch } from 'react-redux' diff --git a/src/components/swapv2/LimitOrder/LimitOrderForm.tsx b/src/components/swapv2/LimitOrder/LimitOrderForm.tsx index b7209ce7ad..e3bc3809a6 100644 --- a/src/components/swapv2/LimitOrder/LimitOrderForm.tsx +++ b/src/components/swapv2/LimitOrder/LimitOrderForm.tsx @@ -3,7 +3,7 @@ import { Trans, t } from '@lingui/macro' import dayjs from 'dayjs' import { ethers } from 'ethers' import JSBI from 'jsbi' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { rgba } from 'polished' import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' import { Info, Repeat } from 'react-feather' diff --git a/src/components/swapv2/PairSuggestion/index.tsx b/src/components/swapv2/PairSuggestion/index.tsx index 75b162dfc2..57c3f3c8b6 100644 --- a/src/components/swapv2/PairSuggestion/index.tsx +++ b/src/components/swapv2/PairSuggestion/index.tsx @@ -1,6 +1,6 @@ import { Currency, NativeCurrency, Token } from '@kyberswap/ks-sdk-core' import { t } from '@lingui/macro' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { stringify } from 'querystring' import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react' import { BrowserView, MobileView, isIOS, isMobile } from 'react-device-detect' diff --git a/src/hooks/useThrottle.ts b/src/hooks/useThrottle.ts index 4bf10f721a..34229f7fe4 100644 --- a/src/hooks/useThrottle.ts +++ b/src/hooks/useThrottle.ts @@ -1,9 +1,9 @@ -import _ from 'lodash' +import throttle from 'lodash/throttle' import { useMemo, useRef } from 'react' export default function useThrottle(cb: (...args: any) => any, delay: number) { const cbRef = useRef(cb) // use mutable ref to make useMemo not depend on `cb` dep cbRef.current = cb - return useMemo(() => _.throttle(cbRef.current, delay), [delay]) + return useMemo(() => throttle(cbRef.current, delay), [delay]) } diff --git a/src/pages/CrossChain/useGetRoute.ts b/src/pages/CrossChain/useGetRoute.ts index 93d8a3c8d5..c0306540f9 100644 --- a/src/pages/CrossChain/useGetRoute.ts +++ b/src/pages/CrossChain/useGetRoute.ts @@ -1,5 +1,5 @@ import { GetRoute, RouteResponse } from '@0xsquid/sdk' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import { INPUT_DEBOUNCE_TIME } from 'constants/index' diff --git a/src/pages/TrueSightV2/pages/RegisterWhitelist/SubscribeForm.tsx b/src/pages/TrueSightV2/pages/RegisterWhitelist/SubscribeForm.tsx index 5186e7ba49..fcacfc53b5 100644 --- a/src/pages/TrueSightV2/pages/RegisterWhitelist/SubscribeForm.tsx +++ b/src/pages/TrueSightV2/pages/RegisterWhitelist/SubscribeForm.tsx @@ -1,5 +1,5 @@ import { Trans, t } from '@lingui/macro' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { FormEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react' import { Text } from 'rebass' import { useLazyCheckReferralCodeQuery, useRequestWhiteListMutation } from 'services/kyberAISubscription' diff --git a/src/state/tokenPrices/hooks.ts b/src/state/tokenPrices/hooks.ts index 3f2270d044..cd0a59ce8d 100644 --- a/src/state/tokenPrices/hooks.ts +++ b/src/state/tokenPrices/hooks.ts @@ -1,5 +1,5 @@ import { ChainId } from '@kyberswap/ks-sdk-core' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { stringify } from 'querystring' import { useCallback, useEffect, useMemo, useState } from 'react' diff --git a/yarn.lock b/yarn.lock index 4ed7afb166..2a94841cc8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -276,7 +276,7 @@ dependencies: "@babel/types" "^7.21.4" -"@babel/helper-module-imports@^7.22.15": +"@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.22.15": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== @@ -662,6 +662,15 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" +"@babel/types@^7.0.0-beta.49": + version "7.22.17" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.17.tgz#f753352c4610ffddf9c8bc6823f9ff03e2303eee" + integrity sha512-YSQPHLFtQNE5xN9tHuZnzu8vPr61wVTBZdfv1meex1NBosa4iT05k/Jw06ddJugi4bk7The/oSwQGFcksmEJQg== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.15" + to-fast-properties "^2.0.0" + "@babel/types@^7.11.5", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.22.0", "@babel/types@^7.22.3": version "7.22.3" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.3.tgz#0cc6af178b91490acaeb4a2f70dcbf27cdf3d8f3" @@ -6459,6 +6468,17 @@ babel-plugin-istanbul@^6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" +babel-plugin-lodash@^3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196" + integrity sha512-yDZLjK7TCkWl1gpBeBGmuaDIFhZKmkoL+Cu2MUUjv5VxUZx/z7tBGBCBcQs5RI1Bkz5LLmNdjx7paOyQtMovyg== + dependencies: + "@babel/helper-module-imports" "^7.0.0-beta.49" + "@babel/types" "^7.0.0-beta.49" + glob "^7.1.1" + lodash "^4.17.10" + require-package-name "^2.0.1" + babel-plugin-macros@^2.0.0: version "2.8.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" @@ -10541,7 +10561,7 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -12460,7 +12480,7 @@ lodash.upperfirst@4.3.1: resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== -lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: +lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -15289,6 +15309,11 @@ require-main-filename@^2.0.0: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== +require-package-name@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9" + integrity sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q== + requireindex@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162" From fe92bb0dab233036bd2e73879b27a104a9d84e9a Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Mon, 18 Sep 2023 14:35:47 +0700 Subject: [PATCH 12/13] fix: react warning (#2243) --- src/components/LiveChart/LineChart.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/LiveChart/LineChart.tsx b/src/components/LiveChart/LineChart.tsx index 9e8a36226a..2f053a3368 100644 --- a/src/components/LiveChart/LineChart.tsx +++ b/src/components/LiveChart/LineChart.tsx @@ -212,7 +212,7 @@ const LineChart = ({ { - setHoverValue(props.payload.value) + setTimeout(() => setHoverValue(props.payload.value)) return '' }} cursor={} From a4898965ef1a69f157f2444fb67804470febf34d Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Mon, 18 Sep 2023 15:19:22 +0700 Subject: [PATCH 13/13] fix: cant select ethereum on wrong network modal (#2242) --- src/hooks/web3/useChangeNetwork.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/hooks/web3/useChangeNetwork.ts b/src/hooks/web3/useChangeNetwork.ts index f9f8437e99..156adef803 100644 --- a/src/hooks/web3/useChangeNetwork.ts +++ b/src/hooks/web3/useChangeNetwork.ts @@ -18,7 +18,7 @@ import { useLazyKyberswapConfig } from '../useKyberSwapConfig' let latestChainId: ChainId export function useChangeNetwork() { - const { chainId, walletEVM, walletSolana } = useActiveWeb3React() + const { chainId, walletEVM, walletSolana, isWrongNetwork } = useActiveWeb3React() const { connector, library } = useWeb3React() const fetchKyberswapConfig = useLazyKyberswapConfig() @@ -234,7 +234,7 @@ export function useChangeNetwork() { const wrappedSuccessCallback = () => successCallback(desiredChainId, waitUtilUpdatedChainId, customSuccessCallback) // if connected, nothing todo, success return - if (desiredChainId === chainId) { + if (desiredChainId === chainId && !isWrongNetwork) { customSuccessCallback?.() return } @@ -298,6 +298,7 @@ export function useChangeNetwork() { successCallback, failureCallback, addNewNetwork, + isWrongNetwork, ], )