Skip to content

Commit c584f5a

Browse files
hello-happy-puppyhello-happy-puppy
committed
ci(release): publish latest release
1 parent 3582f6e commit c584f5a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+181
-6472
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: `QmNryPgeKysHA94RrWHP8fND99CthjcCSUs93ejSbEMdC8`
3-
- CIDv1: `bafybeiahysggu6xwtpveh7ux7hvrc34exseqwgidnl7lob4eogww3m56au`
2+
- CIDv0: `QmPSP5cRUzNoTLLmK32mHARzj3nuNRvytqWsdDetCNMgDM`
3+
- CIDv1: `bafybeiaqkn77amn3y4aj3h2sw2epgtsgothkkowwdpm6jxogowhmbxpv3a`
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://bafybeiahysggu6xwtpveh7ux7hvrc34exseqwgidnl7lob4eogww3m56au.ipfs.dweb.link/
14-
- https://bafybeiahysggu6xwtpveh7ux7hvrc34exseqwgidnl7lob4eogww3m56au.ipfs.cf-ipfs.com/
15-
- [ipfs://QmNryPgeKysHA94RrWHP8fND99CthjcCSUs93ejSbEMdC8/](ipfs://QmNryPgeKysHA94RrWHP8fND99CthjcCSUs93ejSbEMdC8/)
13+
- https://bafybeiaqkn77amn3y4aj3h2sw2epgtsgothkkowwdpm6jxogowhmbxpv3a.ipfs.dweb.link/
14+
- https://bafybeiaqkn77amn3y4aj3h2sw2epgtsgothkkowwdpm6jxogowhmbxpv3a.ipfs.cf-ipfs.com/
15+
- [ipfs://QmPSP5cRUzNoTLLmK32mHARzj3nuNRvytqWsdDetCNMgDM/](ipfs://QmPSP5cRUzNoTLLmK32mHARzj3nuNRvytqWsdDetCNMgDM/)
1616

17-
### 5.31.1 (2024-06-06)
17+
## 5.32.0 (2024-06-10)
1818

1919

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

22-
* **web:** patch wagmi to fix MM bug - prod (#8842) 34c7bc6
22+
* **web:** Remove last of thegraph usage -prod (#8870) 910cb06
2323

2424

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web/5.31.1
1+
web/5.32.0

‎apps/web/.depcheckrc

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ ignores: [
1717
"esbuild-register",
1818
## GraphQL
1919
"@graphql-codegen/*",
20-
"get-graphql-schema",
2120
## React Scripts and subpackages used from within it
2221
"case-sensitive-paths-webpack-plugin",
2322
"react-dev-utils",

‎apps/web/.env.production

-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ REACT_APP_SENTRY_TRACES_SAMPLE_RATE=0.003
1515
REACT_APP_STATSIG_PROXY_URL="https://interface.gateway.uniswap.org/v1/statsig-proxy"
1616
REACT_APP_QUICKNODE_MAINNET_RPC_URL="https://ultra-blue-flower.quiknode.pro/770b22d5f362c537bc8fe19b034c45b22958f880"
1717
REACT_APP_QUICKNODE_ARBITRUM_RPC_URL="https://tiniest-stylish-arrow.arbitrum-mainnet.quiknode.pro/d06833352b8de605914d9e24a390d8b4d3aff7ba"
18-
THE_GRAPH_SCHEMA_ENDPOINT="https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3?source=uniswap"
1918
REACT_APP_IS_UNISWAP_INTERFACE=true

‎apps/web/codegen.yml

-6
This file was deleted.

‎apps/web/cypress/e2e/add-liquidity.test.ts

+4-35
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
1-
import { CyHttpMessages } from 'cypress/types/net-stubbing'
2-
31
import { getTestSelector, resetHardhatChain } from '../utils'
4-
import { aliasQuery, hasQuery } from '../utils/graphql-test-utils'
52

63
describe('Add Liquidity', () => {
7-
beforeEach(() => {
8-
cy.intercept('POST', '/subgraphs/name/uniswap/uniswap-v3?source=uniswap', (req) => {
9-
aliasQuery(req, 'feeTierDistribution')
10-
})
11-
})
12-
134
it('loads the token pair', () => {
145
cy.visit('/add/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984/ETH/500')
156
cy.get('#add-liquidity-input-tokena .token-symbol-container').should('contain.text', 'UNI')
@@ -44,33 +35,11 @@ describe('Add Liquidity', () => {
4435
})
4536

4637
it('loads fee tier distribution', () => {
47-
cy.fixture('feeTierDistribution.json').then((feeTierDistribution) => {
48-
cy.intercept(
49-
'POST',
50-
'/subgraphs/name/uniswap/uniswap-v3?source=uniswap',
51-
(req: CyHttpMessages.IncomingHttpRequest) => {
52-
if (hasQuery(req, 'FeeTierDistribution')) {
53-
req.alias = 'FeeTierDistribution'
54-
55-
req.reply({
56-
body: {
57-
data: {
58-
...feeTierDistribution,
59-
},
60-
},
61-
headers: {
62-
'access-control-allow-origin': '*',
63-
},
64-
})
65-
}
66-
}
67-
)
38+
cy.interceptGraphqlOperation('FeeTierDistribution', 'feeTierDistribution.json')
6839

69-
cy.visit('/add/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984/ETH')
70-
cy.wait('@FeeTierDistribution')
71-
cy.get('#add-liquidity-selected-fee .selected-fee-label').should('contain.text', '0.30% fee tier')
72-
cy.get('#add-liquidity-selected-fee .selected-fee-percentage').should('contain.text', '40% select')
73-
})
40+
cy.visit('/add/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984/ETH')
41+
cy.get('#add-liquidity-selected-fee .selected-fee-label').should('contain.text', '0.30% fee tier')
42+
cy.get('#add-liquidity-selected-fee .selected-fee-percentage').should('contain.text', '77% select')
7443
})
7544

7645
it('disables increment and decrement until initial prices are inputted', () => {

‎apps/web/cypress/fixtures/feeTierDistribution.json

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"_meta": {
3-
"block": {
4-
"number": 99999999
5-
}
6-
},
7-
"asToken0": [
8-
{
9-
"feeTier": "100",
10-
"totalValueLockedToken0": "0",
11-
"totalValueLockedToken1": "3"
12-
},
13-
{
14-
"feeTier": "500",
15-
"totalValueLockedToken0": "0",
16-
"totalValueLockedToken1": "1"
17-
},
18-
{
19-
"feeTier": "3000",
20-
"totalValueLockedToken0": "0",
21-
"totalValueLockedToken1": "4"
22-
},
23-
{
24-
"feeTier": "10000",
25-
"totalValueLockedToken0": "0",
26-
"totalValueLockedToken1": "2"
27-
}
28-
],
29-
"asToken1": []
2+
"data": {
3+
"v3PoolsForTokenPair": [
4+
{
5+
"feeTier": 3000.0,
6+
"token0Supply": 3084.78636993,
7+
"token1Supply": 76658.86823272712,
8+
"__typename": "V3Pool"
9+
},
10+
{
11+
"feeTier": 500.0,
12+
"token0Supply": 917.54087138,
13+
"token1Supply": 22788.333363067817,
14+
"__typename": "V3Pool"
15+
},
16+
{
17+
"feeTier": 10000.0,
18+
"token0Supply": 14.67505995,
19+
"token1Supply": 276.9691974507059,
20+
"__typename": "V3Pool"
21+
},
22+
{
23+
"feeTier": 100.0,
24+
"token0Supply": 0.04782301,
25+
"token1Supply": 1.677630863841559,
26+
"__typename": "V3Pool"
27+
}
28+
]
29+
}
3030
}

‎apps/web/cypress/utils/graphql-test-utils.ts

-12
This file was deleted.

‎apps/web/graphql.thegraph.codegen.config.ts

-25
This file was deleted.

‎apps/web/graphql.thegraph.config.js

-8
This file was deleted.

‎apps/web/package.json

-5
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
"ajv": "node scripts/compile-ajv-validators.js",
88
"check:deps:usage": "depcheck",
99
"check:circular": "concurrently \"../../scripts/check-circular-imports.sh ./src/pages/App.tsx 6\" \"../../scripts/check-circular-imports.sh ./src/setupTests.ts 0\"",
10-
"graphql:schema": "node scripts/fetch-schema.js",
11-
"graphql:generate:thegraph": "graphql-codegen --config graphql.thegraph.codegen.config.ts",
12-
"graphql:generate": "yarn graphql:generate:thegraph",
13-
"graphql": "yarn graphql:schema && yarn graphql:generate",
1410
"sitemap:generate": "node scripts/generate-sitemap.js",
1511
"i18n:upload": "./scripts/crowdin.sh upload",
1612
"i18n:download": "./scripts/crowdin.sh download",
@@ -230,7 +226,6 @@
230226
"fancy-canvas": "2.1.0",
231227
"focus-visible": "5.2.0",
232228
"framer-motion": "10.17.6",
233-
"get-graphql-schema": "^2.1.2",
234229
"graphql": "16.6.0",
235230
"i18next": "23.10.0",
236231
"i18next-resources-to-backend": "^1.2.0",

‎apps/web/public/csp.json

-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
"https://api.avax.network/ext/bc/C/rpc",
5151
"https://api.moonpay.com/",
5252
"https://api.opensea.io",
53-
"https://api.studio.thegraph.com/",
54-
"https://api.thegraph.com/",
5553
"https://bsc-dataseed1.binance.org/",
5654
"https://bsc-dataseed1.bnbchain.org",
5755
"https://buy.moonpay.com/",

‎apps/web/scripts/fetch-schema.js

-26
This file was deleted.

‎apps/web/src/components/NavBar/More/menuContent.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const useMenuContent = (): MenuSection[] => {
2222
items: [
2323
{ label: t('Pool'), href: '/pool', internal: true, overflow: true },
2424
{ label: t('Vote'), href: 'https://vote.uniswapfoundation.org/' },
25-
{ label: t('Analytics'), href: 'https://info.uniswap.org/' },
25+
{ label: t('Analytics'), href: '/explore', internal: true },
2626
],
2727
},
2828
{

‎apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionsTable.tsx

+3-14
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import {
1111
PoolTableTransactionType,
1212
usePoolTransactions,
1313
} from 'graphql/data/pools/usePoolTransactions'
14-
import { getSupportedGraphQlChain, supportedChainIdFromGQLChain } from 'graphql/data/util'
15-
import { OrderDirection, Transaction_OrderBy } from 'graphql/thegraph/__generated__/types-and-hooks'
14+
import { OrderDirection, getSupportedGraphQlChain, supportedChainIdFromGQLChain } from 'graphql/data/util'
1615
import { useActiveLocalCurrency } from 'hooks/useActiveLocalCurrency'
1716
import { Trans } from 'i18n'
1817
import { useMemo, useReducer, useState } from 'react'
@@ -32,11 +31,6 @@ const TableWrapper = styled.div`
3231
min-height: 256px;
3332
`
3433

35-
type PoolTxTableSortState = {
36-
sortBy: Transaction_OrderBy
37-
sortDirection: OrderDirection
38-
}
39-
4034
enum PoolTransactionColumn {
4135
Timestamp,
4236
Type,
@@ -85,10 +79,6 @@ export function PoolDetailsTransactionsTable({
8579
PoolTableTransactionType.MINT,
8680
])
8781

88-
const [sortState] = useState<PoolTxTableSortState>({
89-
sortBy: Transaction_OrderBy.Timestamp,
90-
sortDirection: OrderDirection.Desc,
91-
})
9282
const { transactions, loading, loadMore, error } = usePoolTransactions(
9383
poolAddress,
9484
chain.id,
@@ -106,8 +96,8 @@ export function PoolDetailsTransactionsTable({
10696
header: () => (
10797
<Cell minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.Timestamp]} justifyContent="flex-start">
10898
<Row gap="4px">
109-
{sortState.sortBy === Transaction_OrderBy.Timestamp && <HeaderArrow direction={OrderDirection.Desc} />}
110-
<HeaderSortText $active={sortState.sortBy === Transaction_OrderBy.Timestamp}>
99+
<HeaderArrow direction={OrderDirection.Desc} />
100+
<HeaderSortText $active>
111101
<Trans i18nKey="common.time" />
112102
</HeaderSortText>
113103
</Row>
@@ -288,7 +278,6 @@ export function PoolDetailsTransactionsTable({
288278
formatFiatPrice,
289279
formatNumber,
290280
showLoadingSkeleton,
291-
sortState.sortBy,
292281
token0,
293282
token1?.symbol,
294283
])

‎apps/web/src/components/PrivacyPolicy/index.tsx

-4
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ const EXTERNAL_APIS = [
7171
name: 'Google Analytics & Amplitude',
7272
description: <Trans i18nKey="privacy.anonymizedLogs" />,
7373
},
74-
{
75-
name: 'The Graph',
76-
description: <Trans i18nKey="privacy.theGraph" />,
77-
},
7874
]
7975

8076
export function PrivacyPolicyModal() {

‎apps/web/src/components/Table/styled.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { useAbbreviatedTimeString } from 'components/Table/utils'
88
import { MouseoverTooltip, TooltipSize } from 'components/Tooltip'
99
import { NATIVE_CHAIN_ID } from 'constants/tokens'
1010
import { OrderDirection, getTokenDetailsURL, supportedChainIdFromGQLChain, unwrapToken } from 'graphql/data/util'
11-
import { OrderDirection as TheGraphOrderDirection } from 'graphql/thegraph/__generated__/types-and-hooks'
1211
import { useCurrency } from 'hooks/Tokens'
1312
import { useActiveLocale } from 'hooks/useActiveLocale'
1413
import { Trans } from 'i18n'
@@ -164,7 +163,7 @@ export const ClickableHeaderRow = styled(Row)<{ $justify?: string }>`
164163
gap: 4px;
165164
${ClickableStyle}
166165
`
167-
export const HeaderArrow = styled(ArrowDown)<{ direction: OrderDirection | TheGraphOrderDirection }>`
166+
export const HeaderArrow = styled(ArrowDown)<{ direction: OrderDirection }>`
168167
height: 16px;
169168
width: 16px;
170169
color: ${({ theme }) => theme.neutral1};

‎apps/web/src/components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable.test.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { TokenDetailsPoolsTable } from 'components/Tokens/TokenDetails/tables/To
66
import { usePoolsFromTokenAddress } from 'graphql/data/pools/usePoolsFromTokenAddress'
77
import Router from 'react-router-dom'
88
import { mocked } from 'test-utils/mocked'
9-
import { validBEPoolToken0, validBEPoolToken1, validParams, validPoolToken0 } from 'test-utils/pools/fixtures'
9+
import { validBEPoolToken0, validBEPoolToken1, validParams } from 'test-utils/pools/fixtures'
1010
import { render, screen } from 'test-utils/render'
1111
import { ProtocolVersion } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
1212

@@ -16,7 +16,7 @@ jest.mock('react-router-dom', () => ({
1616
useParams: jest.fn(),
1717
}))
1818

19-
const mockToken = new Token(ChainId.MAINNET, validPoolToken0.id, 18)
19+
const mockToken = new Token(ChainId.MAINNET, validBEPoolToken0.id, 18)
2020

2121
describe('TDPPoolTable', () => {
2222
beforeEach(() => {
@@ -75,7 +75,7 @@ describe('TDPPoolTable', () => {
7575
})
7676

7777
const { asFragment } = render(<TokenDetailsPoolsTable chainId={ChainId.MAINNET} referenceToken={mockToken} />)
78-
expect(screen.getByTestId(`tdp-pools-table-${validPoolToken0.id}`)).not.toBeNull()
78+
expect(screen.getByTestId(`tdp-pools-table-${validBEPoolToken0.id}`)).not.toBeNull()
7979
expect(asFragment()).toMatchSnapshot()
8080
})
8181
})

0 commit comments

Comments
 (0)