ButterflyEffect/uniswap-interface-uncensored
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: move ga events to amplitude (#7300)

Browse Source 
* feat: move ga events to amplitude

* fix: add deets to add events
This commit is contained in:
eddie 2023-09-12 10:28:12 -07:00 committed by GitHub
parent 0fffff66dc
commit a9b2179eab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 72 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -190,7 +190,7 @@
"@sentry/types": "^7.45.0",
"@types/react-window-infinite-loader": "^1.0.6",
"@uniswap/analytics": "^1.4.0",
"@uniswap/analytics-events": "^2.18.0",
"@uniswap/analytics-events": "^2.19.1",
"@uniswap/governance": "^1.0.2",
"@uniswap/liquidity-staker": "^1.0.2",
"@uniswap/merkle-distributor": "^1.0.1",

20
src/components/FeeSelector/index.tsx
View File

@ -1,8 +1,9 @@
import { Trans } from '@lingui/macro'
import { FeePoolSelectAction, LiquidityEventName } from '@uniswap/analytics-events'
import { Currency } from '@uniswap/sdk-core'
import { FeeAmount } from '@uniswap/v3-sdk'
import { useWeb3React } from '@web3-react/core'
import { sendEvent } from 'components/analytics'
import { sendAnalyticsEvent, useTrace } from 'analytics'
import { ButtonGray } from 'components/Button'
import Card from 'components/Card'
import { AutoColumn } from 'components/Column'
@ -60,6 +61,7 @@ export default function FeeSelector({
currencyB?: Currency
}) {
const { chainId } = useWeb3React()
const trace = useTrace()
const { isLoading, isError, largestUsageFeeTier, distributions } = useFeeTierDistribution(currencyA, currencyB)
@ -101,13 +103,13 @@ export default function FeeSelector({
const handleFeePoolSelectWithEvent = useCallback(
(fee: FeeAmount) => {
sendEvent({
category: 'FeePoolSelect',
action: 'Manual',
sendAnalyticsEvent(LiquidityEventName.SELECT_LIQUIDITY_POOL_FEE_TIER, {
action: FeePoolSelectAction.MANUAL,
...trace,
})
handleFeePoolSelect(fee)
},
[handleFeePoolSelect]
[handleFeePoolSelect, trace]
)
useEffect(() => {
@ -122,14 +124,14 @@ export default function FeeSelector({
setShowOptions(false)
recommended.current = true
sendEvent({
category: 'FeePoolSelect',
action: ' Recommended',
sendAnalyticsEvent(LiquidityEventName.SELECT_LIQUIDITY_POOL_FEE_TIER, {
action: FeePoolSelectAction.RECOMMENDED,
...trace,
})
handleFeePoolSelect(largestUsageFeeTier)
}
}, [feeAmount, isLoading, isError, largestUsageFeeTier, handleFeePoolSelect])
}, [feeAmount, isLoading, isError, largestUsageFeeTier, handleFeePoolSelect, trace])
useEffect(() => {
setShowOptions(isError)

5
src/components/PrivacyPolicy/index.tsx
View File

@ -1,5 +1,6 @@
import { Trans } from '@lingui/macro'
import { sendEvent } from 'components/analytics'
import { SharedEventName } from '@uniswap/analytics-events'
import { sendAnalyticsEvent } from 'analytics'
import Card, { DarkGrayCard } from 'components/Card'
import Row, { AutoRow, RowBetween } from 'components/Row'
import { useEffect, useRef } from 'react'
@ -87,7 +88,7 @@ export function PrivacyPolicyModal() {
useEffect(() => {
if (!open) return
sendEvent({
sendAnalyticsEvent(SharedEventName.PAGE_VIEWED, {
category: 'Modal',
action: 'Show Legal',
})

13
src/components/analytics/index.ts
View File

@ -1,4 +1,6 @@
import { InterfaceEventName } from '@uniswap/analytics-events'
import { useWeb3React } from '@web3-react/core'
import { sendAnalyticsEvent } from 'analytics'
import { useEffect } from 'react'
import { UaEventOptions } from 'react-ga4/types/ga4'
import { useLocation } from 'react-router-dom'
@ -18,15 +20,10 @@ export function sendEvent(event: string | UaEventOptions, params?: any) {
return googleAnalytics.sendEvent(event, params)
}
export function outboundLink(
{
export function outboundLink({ label }: { label: string }) {
sendAnalyticsEvent(InterfaceEventName.EXTERNAL_LINK_CLICK, {
label,
}: {
label: string
},
hitCallback: () => unknown
) {
return googleAnalytics.outboundLink({ label }, hitCallback)
})
}
export function sendTiming(timingCategory: any, timingVar: any, timingValue: any, timingLabel: any) {

24
src/pages/AddLiquidity/index.tsx
View File

@ -1,14 +1,13 @@
import { BigNumber } from '@ethersproject/bignumber'
import type { TransactionResponse } from '@ethersproject/providers'
import { Trans } from '@lingui/macro'
import { BrowserEvent, InterfaceElementName, InterfaceEventName } from '@uniswap/analytics-events'
import { BrowserEvent, InterfaceElementName, InterfaceEventName, LiquidityEventName } from '@uniswap/analytics-events'
import { Currency, CurrencyAmount, NONFUNGIBLE_POSITION_MANAGER_ADDRESSES, Percent } from '@uniswap/sdk-core'
import { FeeAmount, NonfungiblePositionManager } from '@uniswap/v3-sdk'
import { useWeb3React } from '@web3-react/core'
import { TraceEvent } from 'analytics'
import { sendAnalyticsEvent, TraceEvent, useTrace } from 'analytics'
import { useToggleAccountDrawer } from 'components/AccountDrawer'
import OwnershipWarning from 'components/addLiquidity/OwnershipWarning'
import { sendEvent } from 'components/analytics'
import UnsupportedCurrencyFooter from 'components/swap/UnsupportedCurrencyFooter'
import { isSupportedChain } from 'constants/chains'
import usePrevious from 'hooks/usePrevious'
@ -56,7 +55,7 @@ import useTransactionDeadline from '../../hooks/useTransactionDeadline'
import { useV3PositionFromTokenId } from '../../hooks/useV3Positions'
import { Bound, Field } from '../../state/mint/v3/actions'
import { useTransactionAdder } from '../../state/transactions/hooks'
import { TransactionType } from '../../state/transactions/types'
import { TransactionInfo, TransactionType } from '../../state/transactions/types'
import { useUserSlippageToleranceWithDefault } from '../../state/user/hooks'
import { ThemedText } from '../../theme'
import approveAmountCalldata from '../../utils/approveAmountCalldata'
@ -106,6 +105,7 @@ function AddLiquidity() {
}>()
const { account, chainId, provider } = useWeb3React()
const theme = useTheme()
const trace = useTrace()
const toggleWalletDrawer = useToggleAccountDrawer() // toggle wallet when disconnected
const addTransaction = useTransactionAdder()
@ -294,7 +294,7 @@ function AddLiquidity() {
.sendTransaction(newTxn)
.then((response: TransactionResponse) => {
setAttemptingTxn(false)
addTransaction(response, {
const transactionInfo: TransactionInfo = {
type: TransactionType.ADD_LIQUIDITY_V3_POOL,
baseCurrencyId: currencyId(baseCurrency),
quoteCurrencyId: currencyId(quoteCurrency),
@ -302,12 +302,13 @@ function AddLiquidity() {
expectedAmountBaseRaw: parsedAmounts[Field.CURRENCY_A]?.quotient?.toString() ?? '0',
expectedAmountQuoteRaw: parsedAmounts[Field.CURRENCY_B]?.quotient?.toString() ?? '0',
feeAmount: position.pool.fee,
})
}
addTransaction(response, transactionInfo)
setTxHash(response.hash)
sendEvent({
category: 'Liquidity',
action: 'Add',
sendAnalyticsEvent(LiquidityEventName.ADD_LIQUIDITY_SUBMITTED, {
label: [currencies[Field.CURRENCY_A]?.symbol, currencies[Field.CURRENCY_B]?.symbol].join('/'),
...trace,
...transactionInfo,
})
})
})
@ -434,11 +435,6 @@ function AddLiquidity() {
const maxPrice = pricesAtLimit[Bound.UPPER]
if (maxPrice) searchParams.set('maxPrice', maxPrice.toSignificant(5))
setSearchParams(searchParams)
sendEvent({
category: 'Liquidity',
action: 'Full Range Clicked',
})
}, [getSetFullRange, pricesAtLimit, searchParams, setSearchParams])
// START: sync values with query string

20
src/pages/AddLiquidityV2/index.tsx
View File

@ -1,12 +1,11 @@
import { BigNumber } from '@ethersproject/bignumber'
import type { TransactionResponse } from '@ethersproject/providers'
import { Trans } from '@lingui/macro'
import { BrowserEvent, InterfaceElementName, InterfaceEventName } from '@uniswap/analytics-events'
import { BrowserEvent, InterfaceElementName, InterfaceEventName, LiquidityEventName } from '@uniswap/analytics-events'
import { Currency, CurrencyAmount, Percent } from '@uniswap/sdk-core'
import { useWeb3React } from '@web3-react/core'
import { TraceEvent } from 'analytics'
import { sendAnalyticsEvent, TraceEvent, useTrace } from 'analytics'
import { useToggleAccountDrawer } from 'components/AccountDrawer'
import { sendEvent } from 'components/analytics'
import UnsupportedCurrencyFooter from 'components/swap/UnsupportedCurrencyFooter'
import { SwitchLocaleLink } from 'components/SwitchLocaleLink'
import { V2Unsupported } from 'components/V2Unsupported'
@ -37,7 +36,7 @@ import { PairState } from '../../hooks/useV2Pairs'
import { Field } from '../../state/mint/actions'
import { useDerivedMintInfo, useMintActionHandlers, useMintState } from '../../state/mint/hooks'
import { useTransactionAdder } from '../../state/transactions/hooks'
import { TransactionType } from '../../state/transactions/types'
import { TransactionInfo, TransactionType } from '../../state/transactions/types'
import { useUserSlippageToleranceWithDefault } from '../../state/user/hooks'
import { ThemedText } from '../../theme'
import { calculateGasMargin } from '../../utils/calculateGasMargin'
@ -57,6 +56,7 @@ export default function AddLiquidity() {
const { account, chainId, provider } = useWeb3React()
const theme = useTheme()
const trace = useTrace()
const currencyA = useCurrency(currencyIdA)
const currencyB = useCurrency(currencyIdB)
@ -191,20 +191,22 @@ export default function AddLiquidity() {
}).then((response) => {
setAttemptingTxn(false)
addTransaction(response, {
const transactionInfo: TransactionInfo = {
type: TransactionType.ADD_LIQUIDITY_V2_POOL,
baseCurrencyId: currencyId(currencyA),
expectedAmountBaseRaw: parsedAmounts[Field.CURRENCY_A]?.quotient.toString() ?? '0',
quoteCurrencyId: currencyId(currencyB),
expectedAmountQuoteRaw: parsedAmounts[Field.CURRENCY_B]?.quotient.toString() ?? '0',
})
}
addTransaction(response, transactionInfo)
setTxHash(response.hash)
sendEvent({
category: 'Liquidity',
action: 'Add',
sendAnalyticsEvent(LiquidityEventName.ADD_LIQUIDITY_SUBMITTED, {
label: [currencies[Field.CURRENCY_A]?.symbol, currencies[Field.CURRENCY_B]?.symbol].join('/'),
...trace,
...transactionInfo,
})
})
)

11
src/pages/MigrateV2/MigrateV2Pair.tsx
View File

@ -1,10 +1,11 @@
import { Contract } from '@ethersproject/contracts'
import type { TransactionResponse } from '@ethersproject/providers'
import { Trans } from '@lingui/macro'
import { LiquidityEventName, LiquiditySource } from '@uniswap/analytics-events'
import { CurrencyAmount, Fraction, Percent, Price, Token, V2_FACTORY_ADDRESSES } from '@uniswap/sdk-core'
import { FeeAmount, Pool, Position, priceToClosestTick, TickMath } from '@uniswap/v3-sdk'
import { useWeb3React } from '@web3-react/core'
import { sendEvent } from 'components/analytics'
import { sendAnalyticsEvent, useTrace } from 'analytics'
import Badge, { BadgeVariant } from 'components/Badge'
import { ButtonConfirmed } from 'components/Button'
import { BlueCard, DarkGrayCard, LightCard, YellowCard } from 'components/Card'
@ -128,6 +129,7 @@ function V2PairMigration({
const { chainId, account } = useWeb3React()
const theme = useTheme()
const v2FactoryAddress = chainId ? V2_FACTORY_ADDRESSES[chainId] : undefined
const trace = useTrace()
const pairFactory = useSingleCallResult(pair, 'factory')
const isNotUniswap = pairFactory.result?.[0] && pairFactory.result[0] !== v2FactoryAddress
@ -340,10 +342,10 @@ function V2PairMigration({
return migrator
.multicall(data, { gasLimit: calculateGasMargin(gasEstimate) })
.then((response: TransactionResponse) => {
sendEvent({
category: 'Migrate',
action: `${isNotUniswap ? 'SushiSwap' : 'V2'}->V3`,
sendAnalyticsEvent(LiquidityEventName.MIGRATE_LIQUIDITY_SUBMITTED, {
action: `${isNotUniswap ? LiquiditySource.SUSHISWAP : LiquiditySource.V2}->${LiquiditySource.V3}`,
label: `${currency0.symbol}/${currency1.symbol}`,
...trace,
})
addTransaction(response, {
@ -380,6 +382,7 @@ function V2PairMigration({
isNotUniswap,
currency0,
currency1,
trace,
addTransaction,
])

10
src/pages/Pool/PositionPage.tsx
View File

@ -1,12 +1,11 @@
import { BigNumber } from '@ethersproject/bignumber'
import type { TransactionResponse } from '@ethersproject/providers'
import { Trans } from '@lingui/macro'
import { InterfacePageName } from '@uniswap/analytics-events'
import { InterfacePageName, LiquidityEventName, LiquiditySource } from '@uniswap/analytics-events'
import { Currency, CurrencyAmount, Fraction, Percent, Price, Token } from '@uniswap/sdk-core'
import { NonfungiblePositionManager, Pool, Position } from '@uniswap/v3-sdk'
import { useWeb3React } from '@web3-react/core'
import { Trace } from 'analytics'
import { sendEvent } from 'components/analytics'
import { sendAnalyticsEvent, Trace } from 'analytics'
import Badge from 'components/Badge'
import { ButtonConfirmed, ButtonGray, ButtonPrimary } from 'components/Button'
import { DarkCard, LightCard } from 'components/Card'
@ -537,9 +536,8 @@ function PositionPageContent() {
setCollectMigrationHash(response.hash)
setCollecting(false)
sendEvent({
category: 'Liquidity',
action: 'CollectV3',
sendAnalyticsEvent(LiquidityEventName.COLLECT_LIQUIDITY_SUBMITTED, {
source: LiquiditySource.V3,
label: [currency0ForFeeCollectionPurposes.symbol, currency1ForFeeCollectionPurposes.symbol].join('/'),
})

15
src/pages/RemoveLiquidity/V3.tsx
View File

@ -1,10 +1,11 @@
import { BigNumber } from '@ethersproject/bignumber'
import type { TransactionResponse } from '@ethersproject/providers'
import { Trans } from '@lingui/macro'
import { LiquidityEventName, LiquiditySource } from '@uniswap/analytics-events'
import { CurrencyAmount, Percent } from '@uniswap/sdk-core'
import { NonfungiblePositionManager } from '@uniswap/v3-sdk'
import { useWeb3React } from '@web3-react/core'
import { sendEvent } from 'components/analytics'
import { sendAnalyticsEvent, useTrace } from 'analytics'
import RangeBadge from 'components/Badge/RangeBadge'
import { ButtonConfirmed, ButtonPrimary } from 'components/Button'
import { LightCard } from 'components/Card'
@ -71,6 +72,7 @@ function Remove({ tokenId }: { tokenId: BigNumber }) {
const { position } = useV3PositionFromTokenId(tokenId)
const theme = useTheme()
const { account, chainId, provider } = useWeb3React()
const trace = useTrace()
// flag for receiving WETH
const [receiveWETH, setReceiveWETH] = useState(false)
@ -153,10 +155,10 @@ function Remove({ tokenId }: { tokenId: BigNumber }) {
.getSigner()
.sendTransaction(newTxn)
.then((response: TransactionResponse) => {
sendEvent({
category: 'Liquidity',
action: 'RemoveV3',
sendAnalyticsEvent(LiquidityEventName.REMOVE_LIQUIDITY_SUBMITTED, {
source: LiquiditySource.V3,
label: [liquidityValue0.currency.symbol, liquidityValue1.currency.symbol].join('/'),
...trace,
})
setTxnHash(response.hash)
setAttemptingTxn(false)
@ -180,13 +182,14 @@ function Remove({ tokenId }: { tokenId: BigNumber }) {
deadline,
account,
chainId,
feeValue0,
feeValue1,
positionSDK,
liquidityPercentage,
provider,
tokenId,
allowedSlippage,
feeValue0,
feeValue1,
trace,
addTransaction,
])

11
src/pages/RemoveLiquidity/index.tsx
View File

@ -2,12 +2,11 @@ import { BigNumber } from '@ethersproject/bignumber'
import { Contract } from '@ethersproject/contracts'
import type { TransactionResponse } from '@ethersproject/providers'
import { Trans } from '@lingui/macro'
import { BrowserEvent, InterfaceElementName, InterfaceEventName } from '@uniswap/analytics-events'
import { BrowserEvent, InterfaceElementName, InterfaceEventName, LiquidityEventName } from '@uniswap/analytics-events'
import { Currency, Percent } from '@uniswap/sdk-core'
import { useWeb3React } from '@web3-react/core'
import { TraceEvent } from 'analytics'
import { sendAnalyticsEvent, TraceEvent, useTrace } from 'analytics'
import { useToggleAccountDrawer } from 'components/AccountDrawer'
import { sendEvent } from 'components/analytics'
import { V2Unsupported } from 'components/V2Unsupported'
import { isSupportedChain } from 'constants/chains'
import { useNetworkSupportsV2 } from 'hooks/useNetworkSupportsV2'
@ -68,6 +67,7 @@ function RemoveLiquidity() {
const [tokenA, tokenB] = useMemo(() => [currencyA?.wrapped, currencyB?.wrapped], [currencyA, currencyB])
const theme = useTheme()
const trace = useTrace()
// toggle wallet when disconnected
const toggleWalletDrawer = useToggleAccountDrawer()
@ -291,10 +291,9 @@ function RemoveLiquidity() {
setTxHash(response.hash)
sendEvent({
category: 'Liquidity',
action: 'Remove',
sendAnalyticsEvent(LiquidityEventName.REMOVE_LIQUIDITY_SUBMITTED, {
label: [currencyA.symbol, currencyB.symbol].join('/'),
...trace,
})
})
.catch((error: Error) => {

8
src/theme/components/index.tsx
View File

@ -173,15 +173,11 @@ function handleClickExternalLink(event: React.MouseEvent<HTMLAnchorElement>) {
// don't prevent default, don't redirect if it's a new tab
if (target === '_blank' || event.ctrlKey || event.metaKey) {
outboundLink({ label: anonymizedHref }, () => {
console.debug('Fired outbound link event', anonymizedHref)
})
outboundLink({ label: anonymizedHref })
} else {
event.preventDefault()
// send a ReactGA event and then trigger a location change
outboundLink({ label: anonymizedHref }, () => {
window.location.href = anonymizedHref
})
outboundLink({ label: anonymizedHref })
}
}

8
yarn.lock
View File

@ -6045,10 +6045,10 @@
"@typescript-eslint/types" "5.59.1"
eslint-visitor-keys "^3.3.0"
"@uniswap/analytics-events@^2.18.0":
version "2.18.0"
resolved "https://registry.yarnpkg.com/@uniswap/analytics-events/-/analytics-events-2.18.0.tgz#22d38adcbe9c18aec7109e562fd005c0e4082edc"
integrity sha512-raJP1/xLnunxLwu6XyM4kRJuuIb4aHFR5X9fAovpR6gllpbHicwdjPnjKR5Z8DAnFe5ClFBT0T/foyE5SU5oQQ==
"@uniswap/analytics-events@^2.19.1":
version "2.19.1"
resolved "https://registry.yarnpkg.com/@uniswap/analytics-events/-/analytics-events-2.19.1.tgz#943a16b1ff1a43439af38c6e26f5f8583cd1afd7"
integrity sha512-22sdQ4dG+oYnRC9sJ62Cp3ZzwPqEPIkVlrndBGMpmCNXwCd6QeWdvsAP8rCZh+B8hlBieuPlxkiTlPDux6X7kw==
"@uniswap/analytics@^1.4.0":
version "1.4.0"