Skip to content

Commit 1363bd5

Browse files
hello-happy-puppyhello-happy-puppy
committed
ci(release): publish latest release
1 parent cd8fe9b commit 1363bd5

File tree

18 files changed

+209
-101
lines changed

18 files changed

+209
-101
lines changed

‎RELEASE

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
IPFS hash of the deployment:
2-
- CIDv0: `QmQRJ4TzV1zYobbsNLsA4WvSVSvpSxdRAMzWcyHjVyP5FK`
3-
- CIDv1: `bafybeia647xbmz33dcdo7fwhybp54imlqc2hwkdnl53lbnurjajwiofaxy`
2+
- CIDv0: `QmYjLCs2fp85NtK5CYeZBisiUZdf9ZLWBfaQ4CSG67qUyq`
3+
- CIDv1: `bafybeie2mrhbxzypdlpnuhuxdtlhsdvuxtdmrawrp3hl6oufdrwyybhs5q`
44

55
The latest release is always mirrored at [app.uniswap.org](https://app.uniswap.org).
66

@@ -10,15 +10,15 @@ You can also access the Uniswap Interface from an IPFS gateway.
1010
Your Uniswap settings are never remembered across different URLs.
1111

1212
IPFS gateways:
13-
- https://bafybeia647xbmz33dcdo7fwhybp54imlqc2hwkdnl53lbnurjajwiofaxy.ipfs.dweb.link/
14-
- https://bafybeia647xbmz33dcdo7fwhybp54imlqc2hwkdnl53lbnurjajwiofaxy.ipfs.cf-ipfs.com/
15-
- [ipfs://QmQRJ4TzV1zYobbsNLsA4WvSVSvpSxdRAMzWcyHjVyP5FK/](ipfs://QmQRJ4TzV1zYobbsNLsA4WvSVSvpSxdRAMzWcyHjVyP5FK/)
13+
- https://bafybeie2mrhbxzypdlpnuhuxdtlhsdvuxtdmrawrp3hl6oufdrwyybhs5q.ipfs.dweb.link/
14+
- https://bafybeie2mrhbxzypdlpnuhuxdtlhsdvuxtdmrawrp3hl6oufdrwyybhs5q.ipfs.cf-ipfs.com/
15+
- [ipfs://QmYjLCs2fp85NtK5CYeZBisiUZdf9ZLWBfaQ4CSG67qUyq/](ipfs://QmYjLCs2fp85NtK5CYeZBisiUZdf9ZLWBfaQ4CSG67qUyq/)
1616

17-
### 5.51.6 (2024-10-11)
17+
## 5.52.0 (2024-10-11)
1818

1919

20-
### Bug Fixes
20+
### Features
2121

22-
* **web:** hide astrochain usdc (#12963) acd6d55
22+
* **web:** remove red gas UI on web shared swap [prod] + 2 other hotfixes (#12948) 18013a2
2323

2424

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web/5.51.6
1+
web/5.52.0

‎apps/web/src/state/activity/updater.tsx

+29-6
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ import { updateSignature } from 'state/signatures/reducer'
1111
import { SignatureType } from 'state/signatures/types'
1212
import { addTransaction, finalizeTransaction } from 'state/transactions/reducer'
1313
import { TransactionType } from 'state/transactions/types'
14-
import { logSwapSuccess, logUniswapXSwapSuccess } from 'tracing/swapFlowLoggers'
14+
import { logSwapFinalized, logUniswapXSwapFinalized } from 'tracing/swapFlowLoggers'
1515
import { UniswapXOrderStatus } from 'types/uniswapx'
16-
import { TransactionStatus } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
1716
import { isL2ChainId } from 'uniswap/src/features/chains/utils'
1817
import { useTrace } from 'utilities/src/telemetry/trace/TraceContext'
1918

@@ -52,8 +51,8 @@ function useOnActivityUpdate(): OnActivityUpdate {
5251
const hash = original.hash
5352
dispatch(finalizeTransaction({ chainId, hash, ...update }))
5453

55-
if (original.info.type === TransactionType.SWAP && update.status === TransactionStatus.Confirmed) {
56-
logSwapSuccess(hash, chainId, analyticsContext)
54+
if (original.info.type === TransactionType.SWAP) {
55+
logSwapFinalized(hash, chainId, analyticsContext, update.status)
5756
}
5857

5958
addPopup({ type: PopupType.Transaction, hash }, hash, popupDismissalTime)
@@ -68,20 +67,44 @@ function useOnActivityUpdate(): OnActivityUpdate {
6867
const updatedOrder = { ...original, ...update }
6968
dispatch(updateSignature(updatedOrder))
7069

70+
// SignatureDetails.type should not be typed as optional, but this will be fixed when we merge activity for uniswap. The default value appeases the typechecker.
71+
const signatureType = updatedOrder.type ?? SignatureType.SIGN_UNISWAPX_V2_ORDER
72+
7173
if (updatedOrder.status === UniswapXOrderStatus.FILLED) {
7274
const hash = updatedOrder.txHash
7375
const from = original.offerer
7476
// Add a transaction in addition to updating signature for filled orders
7577
dispatch(addTransaction({ chainId, from, hash, info: updatedOrder.swapInfo }))
7678
addPopup({ type: PopupType.Transaction, hash }, hash, popupDismissalTime)
7779

78-
// Only track swap success for Dutch orders; limit order fill-time will throw off time tracking analytics
80+
// Only track swap success for non-limit orders; limit order fill-time will throw off time tracking analytics
7981
if (original.type !== SignatureType.SIGN_LIMIT) {
80-
logUniswapXSwapSuccess(hash, updatedOrder.orderHash, chainId, analyticsContext)
82+
logUniswapXSwapFinalized(
83+
hash,
84+
updatedOrder.orderHash,
85+
chainId,
86+
analyticsContext,
87+
signatureType,
88+
UniswapXOrderStatus.FILLED,
89+
)
8190
}
8291
} else if (original.status !== updatedOrder.status) {
8392
const orderHash = original.orderHash
8493
addPopup({ type: PopupType.Order, orderHash }, orderHash, popupDismissalTime)
94+
95+
if (
96+
updatedOrder.status === UniswapXOrderStatus.CANCELLED ||
97+
updatedOrder.status === UniswapXOrderStatus.EXPIRED
98+
) {
99+
logUniswapXSwapFinalized(
100+
undefined,
101+
updatedOrder.orderHash,
102+
chainId,
103+
analyticsContext,
104+
signatureType,
105+
updatedOrder.status,
106+
)
107+
}
85108
}
86109
}
87110
},

‎apps/web/src/state/routing/quickRouteSlice.ts

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
22
import ms from 'ms'
3-
import {
4-
GetQuickQuoteArgs,
5-
PreviewTradeResult,
6-
QuickRouteResponse,
7-
QuoteState,
8-
RouterPreference,
9-
} from 'state/routing/types'
3+
import { GetQuickQuoteArgs, PreviewTradeResult, QuickRouteResponse, QuoteState } from 'state/routing/types'
104
import { isExactInput, transformQuickRouteToTrade } from 'state/routing/utils'
11-
import { logSwapQuoteRequest } from 'tracing/swapFlowLoggers'
125
import { trace } from 'tracing/trace'
136
import { InterfaceEventNameLocal } from 'uniswap/src/features/telemetry/constants'
147
import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
8+
import { logSwapQuoteFetch } from 'uniswap/src/features/transactions/swap/analytics'
159

1610
const UNISWAP_GATEWAY_DNS_URL = process.env.REACT_APP_UNISWAP_GATEWAY_DNS
1711
if (UNISWAP_GATEWAY_DNS_URL === undefined) {
@@ -25,7 +19,7 @@ export const quickRouteApi = createApi({
2519
getQuickRoute: build.query<PreviewTradeResult, GetQuickQuoteArgs>({
2620
queryFn(args, _api, _extraOptions, fetch) {
2721
return trace({ name: 'QuickRoute', op: 'quote.quick_route' }, async (trace) => {
28-
logSwapQuoteRequest(args.tokenInChainId, RouterPreference.API, true)
22+
logSwapQuoteFetch({ chainId: args.tokenInChainId, isQuickRoute: true })
2923
const { tokenInAddress, tokenInChainId, tokenOutAddress, tokenOutChainId, amount, tradeType } = args
3024
const type = isExactInput(tradeType) ? 'EXACT_IN' : 'EXACT_OUT'
3125

‎apps/web/src/state/routing/slice.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import {
1818
UniswapXv2Config,
1919
} from 'state/routing/types'
2020
import { isExactInput, transformQuoteToTrade } from 'state/routing/utils'
21-
import { logSwapQuoteRequest } from 'tracing/swapFlowLoggers'
2221
import { trace } from 'tracing/trace'
2322
import { InterfaceEventNameLocal } from 'uniswap/src/features/telemetry/constants'
2423
import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
24+
import { logSwapQuoteFetch } from 'uniswap/src/features/transactions/swap/analytics'
2525
import { logger } from 'utilities/src/logger/logger'
2626

2727
const UNISWAP_GATEWAY_DNS_URL = process.env.REACT_APP_UNISWAP_GATEWAY_DNS
@@ -107,7 +107,10 @@ export const routingApi = createApi({
107107
getQuote: build.query<TradeResult, GetQuoteArgs>({
108108
queryFn(args, _api, _extraOptions, fetch) {
109109
return trace({ name: 'Quote', op: 'quote', data: { ...args } }, async (trace) => {
110-
logSwapQuoteRequest(args.tokenInChainId, args.routerPreference, false)
110+
logSwapQuoteFetch({
111+
chainId: args.tokenInChainId,
112+
isUSDQuote: args.routerPreference === INTERNAL_ROUTER_PREFERENCE_PRICE,
113+
})
111114
const {
112115
tokenInAddress: tokenIn,
113116
tokenInChainId,

‎apps/web/src/tracing/swapFlowLoggers.test.ts

+13-28
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { SwapEventName } from '@uniswap/analytics-events'
2-
import { INTERNAL_ROUTER_PREFERENCE_PRICE, RouterPreference } from 'state/routing/types'
3-
import { logSwapQuoteRequest, logSwapSuccess, logUniswapXSwapSuccess } from 'tracing/swapFlowLoggers'
2+
import { SignatureType } from 'state/signatures/types'
3+
import { logSwapFinalized, logUniswapXSwapFinalized } from 'tracing/swapFlowLoggers'
4+
import { UniswapXOrderStatus } from 'types/uniswapx'
5+
import { TransactionStatus } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
46
import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
57
import { maybeLogFirstSwapAction } from 'uniswap/src/features/transactions/swap/utils/maybeLogFirstSwapAction'
68
import { TransactionOriginType } from 'uniswap/src/features/transactions/types/transactionDetails'
@@ -28,7 +30,7 @@ describe('swapFlowLoggers', () => {
2830
const mockChainId = 1
2931
const mockAnalyticsContext = { page: 'mockContext' }
3032

31-
logSwapSuccess(mockHash, mockChainId, mockAnalyticsContext)
33+
logSwapFinalized(mockHash, mockChainId, mockAnalyticsContext, TransactionStatus.Confirmed)
3234

3335
expect(sendAnalyticsEvent).toHaveBeenCalledWith(SwapEventName.SWAP_TRANSACTION_COMPLETED, {
3436
transactionOriginType: TransactionOriginType.Internal,
@@ -47,7 +49,14 @@ describe('swapFlowLoggers', () => {
4749
const mockChainId = 1
4850
const mockAnalyticsContext = { page: 'mockContext' }
4951

50-
logUniswapXSwapSuccess(mockHash, mockOrderHash, mockChainId, mockAnalyticsContext)
52+
logUniswapXSwapFinalized(
53+
mockHash,
54+
mockOrderHash,
55+
mockChainId,
56+
mockAnalyticsContext,
57+
SignatureType.SIGN_UNISWAPX_V2_ORDER,
58+
UniswapXOrderStatus.FILLED,
59+
)
5160

5261
expect(sendAnalyticsEvent).toHaveBeenCalledWith(SwapEventName.SWAP_TRANSACTION_COMPLETED, {
5362
transactionOriginType: TransactionOriginType.Internal,
@@ -71,28 +80,4 @@ describe('swapFlowLoggers', () => {
7180
...mockAnalyticsContext,
7281
})
7382
})
74-
75-
it('logSwapQuoteRequest calls sendAnalyticsEvent with correct parameters', () => {
76-
const mockChainId = 1
77-
78-
logSwapQuoteRequest(mockChainId, RouterPreference.X)
79-
80-
expect(sendAnalyticsEvent).toHaveBeenCalledWith(SwapEventName.SWAP_QUOTE_FETCH, {
81-
chainId: mockChainId,
82-
isQuickRoute: false,
83-
time_to_first_quote_request: 100,
84-
time_to_first_quote_request_since_first_input: 100,
85-
})
86-
})
87-
88-
it('logSwapQuoteRequest excludes perf metrics for price quotes', () => {
89-
const mockChainId = 1
90-
91-
logSwapQuoteRequest(mockChainId, INTERNAL_ROUTER_PREFERENCE_PRICE)
92-
93-
expect(sendAnalyticsEvent).toHaveBeenCalledWith(SwapEventName.SWAP_QUOTE_FETCH, {
94-
chainId: mockChainId,
95-
isQuickRoute: false,
96-
})
97-
})
9883
})

‎apps/web/src/tracing/swapFlowLoggers.ts

+36-31
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,29 @@
11
import { SwapEventName } from '@uniswap/analytics-events'
2-
import { INTERNAL_ROUTER_PREFERENCE_PRICE, RouterPreference } from 'state/routing/types'
2+
import { SignatureType } from 'state/signatures/types'
3+
import { ConfirmedTransactionDetails } from 'state/transactions/types'
4+
import { UniswapXOrderStatus } from 'types/uniswapx'
5+
import { TransactionStatus } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
36
import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
7+
import { SwapRouting } from 'uniswap/src/features/telemetry/types'
48
import { SwapEventType, timestampTracker } from 'uniswap/src/features/transactions/swap/utils/SwapEventTimestampTracker'
59
import { TransactionOriginType } from 'uniswap/src/features/transactions/types/transactionDetails'
610
import { ITraceContext } from 'utilities/src/telemetry/trace/TraceContext'
711

8-
export function logSwapSuccess(hash: string, chainId: number, analyticsContext: ITraceContext) {
12+
export function logSwapFinalized(
13+
hash: string,
14+
chainId: number,
15+
analyticsContext: ITraceContext,
16+
status: ConfirmedTransactionDetails['status'],
17+
) {
918
const hasSetSwapSuccess = timestampTracker.hasTimestamp(SwapEventType.FirstSwapSuccess)
1019
const elapsedTime = timestampTracker.setElapsedTime(SwapEventType.FirstSwapSuccess)
1120

12-
sendAnalyticsEvent(SwapEventName.SWAP_TRANSACTION_COMPLETED, {
21+
const event =
22+
status === TransactionStatus.Confirmed
23+
? SwapEventName.SWAP_TRANSACTION_COMPLETED
24+
: SwapEventName.SWAP_TRANSACTION_FAILED
25+
26+
sendAnalyticsEvent(event, {
1327
routing: 'classic',
1428
// We only log the time-to-swap metric for the first swap of a session,
1529
// so if it was previously set we log undefined here.
@@ -23,17 +37,32 @@ export function logSwapSuccess(hash: string, chainId: number, analyticsContext:
2337
...analyticsContext,
2438
})
2539
}
26-
export function logUniswapXSwapSuccess(
27-
hash: string,
40+
41+
const SIGNATURE_TYPE_TO_SWAP_ROUTING: Record<SignatureType, SwapRouting> = {
42+
[SignatureType.SIGN_LIMIT]: 'limit_order',
43+
[SignatureType.SIGN_PRIORITY_ORDER]: 'priority_order',
44+
[SignatureType.SIGN_UNISWAPX_V2_ORDER]: 'uniswap_x_v2',
45+
[SignatureType.SIGN_UNISWAPX_ORDER]: 'uniswap_x',
46+
}
47+
48+
export function logUniswapXSwapFinalized(
49+
hash: string | undefined,
2850
orderHash: string,
2951
chainId: number,
3052
analyticsContext: ITraceContext,
53+
signatureType: SignatureType,
54+
status: UniswapXOrderStatus.FILLED | UniswapXOrderStatus.CANCELLED | UniswapXOrderStatus.EXPIRED,
3155
) {
3256
const hasSetSwapSuccess = timestampTracker.hasTimestamp(SwapEventType.FirstSwapSuccess)
3357
const elapsedTime = timestampTracker.setElapsedTime(SwapEventType.FirstSwapSuccess)
3458

35-
sendAnalyticsEvent(SwapEventName.SWAP_TRANSACTION_COMPLETED, {
36-
routing: 'uniswap_x_v2',
59+
const event =
60+
status === UniswapXOrderStatus.FILLED
61+
? SwapEventName.SWAP_TRANSACTION_COMPLETED
62+
: SwapEventName.SWAP_TRANSACTION_FAILED
63+
64+
sendAnalyticsEvent(event, {
65+
routing: SIGNATURE_TYPE_TO_SWAP_ROUTING[signatureType],
3766
order_hash: orderHash,
3867
transactionOriginType: TransactionOriginType.Internal,
3968
// We only log the time-to-swap metric for the first swap of a session,
@@ -47,27 +76,3 @@ export function logUniswapXSwapSuccess(
4776
...analyticsContext,
4877
})
4978
}
50-
51-
export function logSwapQuoteRequest(
52-
chainId: number,
53-
routerPreference: RouterPreference | typeof INTERNAL_ROUTER_PREFERENCE_PRICE,
54-
isQuickRoute?: boolean,
55-
) {
56-
let performanceMetrics = {}
57-
if (routerPreference !== INTERNAL_ROUTER_PREFERENCE_PRICE) {
58-
const hasSetSwapQuote = timestampTracker.hasTimestamp(SwapEventType.FirstQuoteFetchStarted)
59-
const elapsedTime = timestampTracker.setElapsedTime(SwapEventType.FirstQuoteFetchStarted)
60-
performanceMetrics = {
61-
// We only log the time_to_first_quote_request metric for the first quote request of a session.
62-
time_to_first_quote_request: hasSetSwapQuote ? undefined : elapsedTime,
63-
time_to_first_quote_request_since_first_input: hasSetSwapQuote
64-
? undefined
65-
: timestampTracker.getElapsedTime(SwapEventType.FirstQuoteFetchStarted, SwapEventType.FirstSwapAction),
66-
}
67-
}
68-
sendAnalyticsEvent(SwapEventName.SWAP_QUOTE_FETCH, {
69-
chainId,
70-
isQuickRoute: isQuickRoute ?? false,
71-
...performanceMetrics,
72-
})
73-
}

‎packages/uniswap/src/components/TokenSelector/TokenSelector.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { InterfaceEventName, InterfaceModalName } from '@uniswap/analytics-events'
12
import { Currency } from '@uniswap/sdk-core'
23
import { hasStringAsync } from 'expo-clipboard'
34
import { memo, useCallback, useEffect, useMemo, useState } from 'react'
@@ -256,7 +257,11 @@ export function TokenSelectorContent({
256257
])
257258

258259
return (
259-
<>
260+
<Trace
261+
logImpression={isInterface} // TODO(WEB-5161): Deduplicate shared vs interface-only trace event
262+
eventOnTrigger={InterfaceEventName.TOKEN_SELECTOR_OPENED}
263+
modal={InterfaceModalName.TOKEN_SELECTOR}
264+
>
260265
<Trace logImpression element={currencyFieldName} section={SectionName.TokenSelector}>
261266
<Flex grow gap="$spacing8" style={scrollbarStyles}>
262267
{!isSmallScreen && (
@@ -311,7 +316,7 @@ export function TokenSelectorContent({
311316
{isSurfaceReady && <Flex grow>{tokenSelector}</Flex>}
312317
</Flex>
313318
</Trace>
314-
</>
319+
</Trace>
315320
)
316321
}
317322

‎packages/uniswap/src/components/gas/NetworkFee.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { GasFeeResult } from 'uniswap/src/features/gas/types'
1414
import { NetworkFeeWarning } from 'uniswap/src/features/transactions/swap/modals/NetworkFeeWarning'
1515
import { UniswapXGasBreakdown } from 'uniswap/src/features/transactions/swap/types/swapTxAndGasInfo'
1616
import { UniverseChainId } from 'uniswap/src/types/chains'
17+
import { isInterface } from 'utilities/src/platform'
1718

1819
export function NetworkFee({
1920
chainId,
@@ -39,6 +40,7 @@ export function NetworkFee({
3940
const uniswapXGasFeeInfo = useFormattedUniswapXGasFeeInfo(uniswapXGasBreakdown, chainId)
4041

4142
const gasFeeHighRelativeToValue = useGasFeeHighRelativeToValue(gasFeeUSD, transactionUSDValue)
43+
const showHighGasFeeUI = gasFeeHighRelativeToValue && !isInterface // Avoid high gas UI on interface
4244

4345
return (
4446
<Flex row alignItems="center" gap="$spacing12" justifyContent="space-between">
@@ -60,7 +62,7 @@ export function NetworkFee({
6062
<UniswapXFee gasFee={gasFeeFormatted} preSavingsGasFee={uniswapXGasFeeInfo?.preSavingsGasFeeFormatted} />
6163
) : (
6264
<Text
63-
color={gasFee.isLoading ? '$neutral3' : gasFeeHighRelativeToValue ? '$statusCritical' : '$neutral1'}
65+
color={gasFee.isLoading ? '$neutral3' : showHighGasFeeUI ? '$statusCritical' : '$neutral1'}
6466
variant="body3"
6567
>
6668
{gasFeeFormatted}

‎packages/uniswap/src/data/apiClients/tradingApi/useTradingApiIndicativeQuoteQuery.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { uniswapUrls } from 'uniswap/src/constants/urls'
33
import { TRADING_API_CACHE_KEY, fetchIndicativeQuote } from 'uniswap/src/data/apiClients/tradingApi/TradingApiClient'
44
import { UseQueryApiHelperHookArgs } from 'uniswap/src/data/apiClients/types'
55
import { IndicativeQuoteRequest, IndicativeQuoteResponse } from 'uniswap/src/data/tradingApi/__generated__'
6+
import { logSwapQuoteFetch } from 'uniswap/src/features/transactions/swap/analytics'
67

78
export function useTradingApiIndicativeQuoteQuery({
89
params,
@@ -16,7 +17,12 @@ export function useTradingApiIndicativeQuoteQuery({
1617
return useQuery<IndicativeQuoteResponse>({
1718
queryKey,
1819
queryFn: params
19-
? async (): ReturnType<typeof fetchIndicativeQuote> => await fetchIndicativeQuote(params)
20+
? async (): ReturnType<typeof fetchIndicativeQuote> => {
21+
if (params.tokenInChainId) {
22+
logSwapQuoteFetch({ chainId: params.tokenInChainId, isQuickRoute: true })
23+
}
24+
return await fetchIndicativeQuote(params)
25+
}
2026
: skipToken,
2127
...rest,
2228
})

0 commit comments

Comments
 (0)