Commit b82b9acc authored by lynn's avatar lynn Committed by GitHub

fix: remove stablecoin usd val fetch in logging to reduce infura spend (#4543)

remove stablecoin usd val fetch reduce infura
parent fac38457
...@@ -10,7 +10,6 @@ import { ...@@ -10,7 +10,6 @@ import {
getDurationUntilTimestampSeconds, getDurationUntilTimestampSeconds,
getTokenAddress, getTokenAddress,
} from 'components/AmplitudeAnalytics/utils' } from 'components/AmplitudeAnalytics/utils'
import { useStablecoinValue } from 'hooks/useStablecoinPrice'
import useTransactionDeadline from 'hooks/useTransactionDeadline' import useTransactionDeadline from 'hooks/useTransactionDeadline'
import { ReactNode } from 'react' import { ReactNode } from 'react'
import { Text } from 'rebass' import { Text } from 'rebass'
...@@ -30,8 +29,6 @@ interface AnalyticsEventProps { ...@@ -30,8 +29,6 @@ interface AnalyticsEventProps {
transactionDeadlineSecondsSinceEpoch: number | undefined transactionDeadlineSecondsSinceEpoch: number | undefined
isAutoSlippage: boolean isAutoSlippage: boolean
isAutoRouterApi: boolean isAutoRouterApi: boolean
tokenInAmountUsd: string | undefined
tokenOutAmountUsd: string | undefined
swapQuoteReceivedDate: Date | undefined swapQuoteReceivedDate: Date | undefined
routes: RoutingDiagramEntry[] routes: RoutingDiagramEntry[]
} }
...@@ -70,16 +67,12 @@ const formatAnalyticsEventProperties = ({ ...@@ -70,16 +67,12 @@ const formatAnalyticsEventProperties = ({
transactionDeadlineSecondsSinceEpoch, transactionDeadlineSecondsSinceEpoch,
isAutoSlippage, isAutoSlippage,
isAutoRouterApi, isAutoRouterApi,
tokenInAmountUsd,
tokenOutAmountUsd,
swapQuoteReceivedDate, swapQuoteReceivedDate,
routes, routes,
}: AnalyticsEventProps) => ({ }: AnalyticsEventProps) => ({
estimated_network_fee_usd: trade.gasUseEstimateUSD ? formatToDecimal(trade.gasUseEstimateUSD, 2) : undefined, estimated_network_fee_usd: trade.gasUseEstimateUSD ? formatToDecimal(trade.gasUseEstimateUSD, 2) : undefined,
transaction_hash: hash, transaction_hash: hash,
transaction_deadline_seconds: getDurationUntilTimestampSeconds(transactionDeadlineSecondsSinceEpoch), transaction_deadline_seconds: getDurationUntilTimestampSeconds(transactionDeadlineSecondsSinceEpoch),
token_in_amount_usd: tokenInAmountUsd ? parseFloat(tokenInAmountUsd) : undefined,
token_out_amount_usd: tokenOutAmountUsd ? parseFloat(tokenOutAmountUsd) : undefined,
token_in_address: getTokenAddress(trade.inputAmount.currency), token_in_address: getTokenAddress(trade.inputAmount.currency),
token_out_address: getTokenAddress(trade.outputAmount.currency), token_out_address: getTokenAddress(trade.outputAmount.currency),
token_in_symbol: trade.inputAmount.currency.symbol, token_in_symbol: trade.inputAmount.currency.symbol,
...@@ -121,8 +114,6 @@ export default function SwapModalFooter({ ...@@ -121,8 +114,6 @@ export default function SwapModalFooter({
const transactionDeadlineSecondsSinceEpoch = useTransactionDeadline()?.toNumber() // in seconds since epoch const transactionDeadlineSecondsSinceEpoch = useTransactionDeadline()?.toNumber() // in seconds since epoch
const isAutoSlippage = useUserSlippageTolerance()[0] === 'auto' const isAutoSlippage = useUserSlippageTolerance()[0] === 'auto'
const [clientSideRouter] = useClientSideRouter() const [clientSideRouter] = useClientSideRouter()
const tokenInAmountUsd = useStablecoinValue(trade.inputAmount)?.toFixed(2)
const tokenOutAmountUsd = useStablecoinValue(trade.outputAmount)?.toFixed(2)
const routes = getTokenPath(trade) const routes = getTokenPath(trade)
return ( return (
...@@ -139,8 +130,6 @@ export default function SwapModalFooter({ ...@@ -139,8 +130,6 @@ export default function SwapModalFooter({
transactionDeadlineSecondsSinceEpoch, transactionDeadlineSecondsSinceEpoch,
isAutoSlippage, isAutoSlippage,
isAutoRouterApi: !clientSideRouter, isAutoRouterApi: !clientSideRouter,
tokenInAmountUsd,
tokenOutAmountUsd,
swapQuoteReceivedDate, swapQuoteReceivedDate,
routes, routes,
})} })}
......
...@@ -4,7 +4,6 @@ import { sendAnalyticsEvent } from 'components/AmplitudeAnalytics' ...@@ -4,7 +4,6 @@ import { sendAnalyticsEvent } from 'components/AmplitudeAnalytics'
import { EventName } from 'components/AmplitudeAnalytics/constants' import { EventName } from 'components/AmplitudeAnalytics/constants'
import { formatPercentInBasisPointsNumber, formatToDecimal, getTokenAddress } from 'components/AmplitudeAnalytics/utils' import { formatPercentInBasisPointsNumber, formatToDecimal, getTokenAddress } from 'components/AmplitudeAnalytics/utils'
import { DEFAULT_TXN_DISMISS_MS, L2_TXN_DISMISS_MS } from 'constants/misc' import { DEFAULT_TXN_DISMISS_MS, L2_TXN_DISMISS_MS } from 'constants/misc'
import { useStablecoinValue } from 'hooks/useStablecoinPrice'
import LibUpdater from 'lib/hooks/transactions/updater' import LibUpdater from 'lib/hooks/transactions/updater'
import { useCallback, useMemo } from 'react' import { useCallback, useMemo } from 'react'
import { useAppDispatch, useAppSelector } from 'state/hooks' import { useAppDispatch, useAppSelector } from 'state/hooks'
...@@ -22,23 +21,12 @@ interface AnalyticsEventProps { ...@@ -22,23 +21,12 @@ interface AnalyticsEventProps {
trade: InterfaceTrade<Currency, Currency, TradeType> trade: InterfaceTrade<Currency, Currency, TradeType>
hash: string | undefined hash: string | undefined
allowedSlippage: Percent allowedSlippage: Percent
tokenInAmountUsd: string | undefined
tokenOutAmountUsd: string | undefined
succeeded: boolean succeeded: boolean
} }
const formatAnalyticsEventProperties = ({ const formatAnalyticsEventProperties = ({ trade, hash, allowedSlippage, succeeded }: AnalyticsEventProps) => ({
trade,
hash,
allowedSlippage,
tokenInAmountUsd,
tokenOutAmountUsd,
succeeded,
}: AnalyticsEventProps) => ({
estimated_network_fee_usd: trade.gasUseEstimateUSD ? formatToDecimal(trade.gasUseEstimateUSD, 2) : undefined, estimated_network_fee_usd: trade.gasUseEstimateUSD ? formatToDecimal(trade.gasUseEstimateUSD, 2) : undefined,
transaction_hash: hash, transaction_hash: hash,
token_in_amount_usd: tokenInAmountUsd ? parseFloat(tokenInAmountUsd) : undefined,
token_out_amount_usd: tokenOutAmountUsd ? parseFloat(tokenOutAmountUsd) : undefined,
token_in_address: getTokenAddress(trade.inputAmount.currency), token_in_address: getTokenAddress(trade.inputAmount.currency),
token_out_address: getTokenAddress(trade.outputAmount.currency), token_out_address: getTokenAddress(trade.outputAmount.currency),
token_in_symbol: trade.inputAmount.currency.symbol, token_in_symbol: trade.inputAmount.currency.symbol,
...@@ -65,8 +53,6 @@ export default function Updater() { ...@@ -65,8 +53,6 @@ export default function Updater() {
trade: { trade }, trade: { trade },
allowedSlippage, allowedSlippage,
} = useDerivedSwapInfo() } = useDerivedSwapInfo()
const tokenInAmountUsd = useStablecoinValue(trade?.inputAmount)?.toFixed(2)
const tokenOutAmountUsd = useStablecoinValue(trade?.outputAmount)?.toFixed(2)
const dispatch = useAppDispatch() const dispatch = useAppDispatch()
const onCheck = useCallback( const onCheck = useCallback(
...@@ -101,8 +87,6 @@ export default function Updater() { ...@@ -101,8 +87,6 @@ export default function Updater() {
trade, trade,
hash, hash,
allowedSlippage, allowedSlippage,
tokenInAmountUsd,
tokenOutAmountUsd,
succeeded: receipt.status === 1, succeeded: receipt.status === 1,
}) })
) )
...@@ -115,7 +99,7 @@ export default function Updater() { ...@@ -115,7 +99,7 @@ export default function Updater() {
isL2 ? L2_TXN_DISMISS_MS : DEFAULT_TXN_DISMISS_MS isL2 ? L2_TXN_DISMISS_MS : DEFAULT_TXN_DISMISS_MS
) )
}, },
[addPopup, allowedSlippage, dispatch, isL2, tokenInAmountUsd, tokenOutAmountUsd, trade, transactions] [addPopup, allowedSlippage, dispatch, isL2, trade, transactions]
) )
const pendingTransactions = useMemo(() => (chainId ? transactions[chainId] ?? {} : {}), [chainId, transactions]) const pendingTransactions = useMemo(() => (chainId ? transactions[chainId] ?? {} : {}), [chainId, transactions])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment