Skip to content

Commit dc55fe2

Browse files
authored
Merge branch 'develop' into fix/eth-flow-order-status
2 parents bfe97ee + 4135404 commit dc55fe2

519 files changed

Lines changed: 4932 additions & 3475 deletions

File tree

Some content is hidden

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

.release-please-manifest.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
{
2-
"apps/cowswap-frontend": "2.5.0",
3-
"apps/explorer": "3.3.2",
4-
"libs/permit-utils": "2.3.2",
5-
"libs/widget-lib": "1.2.2",
6-
"libs/widget-react": "1.0.8",
7-
"apps/widget-configurator": "2.2.2",
8-
"libs/analytics": "2.3.2",
9-
"libs/assets": "2.0.1",
10-
"libs/common-const": "2.3.2",
11-
"libs/common-hooks": "2.3.2",
12-
"libs/common-utils": "2.3.2",
13-
"libs/core": "2.4.0",
14-
"libs/ens": "2.3.2",
15-
"libs/events": "3.3.2",
16-
"libs/snackbars": "2.0.8",
17-
"libs/tokens": "2.4.0",
18-
"libs/types": "3.3.2",
19-
"libs/ui": "2.3.2",
20-
"libs/wallet": "2.3.2",
21-
"apps/cow-fi": "2.1.5",
22-
"libs/wallet-provider": "2.1.6",
2+
"apps/cowswap-frontend": "2.6.0",
3+
"apps/explorer": "3.4.0",
4+
"libs/permit-utils": "2.4.0",
5+
"libs/widget-lib": "1.3.0",
6+
"libs/widget-react": "1.0.9",
7+
"apps/widget-configurator": "2.3.0",
8+
"libs/analytics": "2.4.0",
9+
"libs/assets": "2.1.0",
10+
"libs/common-const": "2.4.0",
11+
"libs/common-hooks": "2.4.0",
12+
"libs/common-utils": "2.4.0",
13+
"libs/core": "2.5.0",
14+
"libs/ens": "2.4.0",
15+
"libs/events": "3.4.0",
16+
"libs/snackbars": "2.0.9",
17+
"libs/tokens": "2.5.0",
18+
"libs/types": "3.4.0",
19+
"libs/ui": "2.4.0",
20+
"libs/wallet": "2.4.0",
21+
"apps/cow-fi": "2.2.0",
22+
"libs/wallet-provider": "2.1.7",
2323
"libs/ui-utils": "2.0.1",
2424
"libs/abis": "3.0.0",
25-
"libs/balances-and-allowances": "2.3.2",
26-
"libs/iframe-transport": "2.0.6",
27-
"libs/hook-dapp-lib": "2.0.6",
28-
"libs/multicall": "2.3.2"
25+
"libs/balances-and-allowances": "2.4.0",
26+
"libs/iframe-transport": "2.0.7",
27+
"libs/hook-dapp-lib": "2.0.7",
28+
"libs/multicall": "2.4.0"
2929
}

apps/cow-fi/CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,40 @@
11
# Changelog
22

3+
## [2.2.0](https://github.com/cowprotocol/cowswap/compare/cow-fi-v2.1.5...cow-fi-v2.2.0) (2026-03-10)
4+
5+
6+
### ✨ Features
7+
8+
* **explorer:** add solvers page and integrate solvers info fetching ([#7037](https://github.com/cowprotocol/cowswap/issues/7037)) ([2d14185](https://github.com/cowprotocol/cowswap/commit/2d14185ce7e0742713afbd935729d652ee31b83c))
9+
10+
11+
### 🐛 Bug Fixes
12+
13+
* use correct amounts to sign instead of afterSlippage ([#7022](https://github.com/cowprotocol/cowswap/issues/7022)) ([b1020c4](https://github.com/cowprotocol/cowswap/commit/b1020c44615b49c5f05f0a6dcf0d21b96b628846))
14+
15+
16+
### 🔧 Miscellaneous
17+
18+
* **release:** 2026-03-04 ([5612b59](https://github.com/cowprotocol/cowswap/commit/5612b59d690f9081e62d9efc5ea80774428f0366))
19+
20+
21+
### Dependencies
22+
23+
* The following workspace dependencies were updated
24+
* dependencies
25+
* @cowprotocol/analytics bumped to 2.4.0
26+
* @cowprotocol/assets bumped to 2.1.0
27+
* @cowprotocol/common-const bumped to 2.4.0
28+
* @cowprotocol/common-hooks bumped to 2.4.0
29+
* @cowprotocol/common-utils bumped to 2.4.0
30+
* @cowprotocol/core bumped to 2.5.0
31+
* @cowprotocol/events bumped to 3.4.0
32+
* @cowprotocol/types bumped to 3.4.0
33+
* @cowprotocol/ui bumped to 2.4.0
34+
* @cowprotocol/wallet bumped to 2.4.0
35+
* @cowprotocol/wallet-provider bumped to 2.1.7
36+
* @cowprotocol/widget-react bumped to 1.0.9
37+
338
## [2.1.5](https://github.com/cowprotocol/cowswap/compare/cow-fi-v2.1.4...cow-fi-v2.1.5) (2026-02-25)
439

540

apps/cow-fi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cowprotocol/cow-fi",
3-
"version": "2.1.5",
3+
"version": "2.2.0",
44
"description": "CoW DAO website",
55
"main": "index.js",
66
"author": "",

apps/cowswap-frontend/CHANGELOG.md

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,62 @@
11
# Changelog
22

3+
## [2.6.0](https://github.com/cowprotocol/cowswap/compare/cowswap-v2.5.0...cowswap-v2.6.0) (2026-03-10)
4+
5+
6+
### ✨ Features
7+
8+
* add speech bubble notifications ([#7066](https://github.com/cowprotocol/cowswap/issues/7066)) ([e3af630](https://github.com/cowprotocol/cowswap/commit/e3af630db0e0e6a27f4661ecc77c21071721b3a7))
9+
* affiliate program ([#6793](https://github.com/cowprotocol/cowswap/issues/6793)) ([7b93702](https://github.com/cowprotocol/cowswap/commit/7b937020ad4209ece2d3d38972e8aaf722e0dbcf))
10+
* **explorer:** add solvers page and integrate solvers info fetching ([#7037](https://github.com/cowprotocol/cowswap/issues/7037)) ([2d14185](https://github.com/cowprotocol/cowswap/commit/2d14185ce7e0742713afbd935729d652ee31b83c))
11+
* integrate non-evm sdk changes ([#7085](https://github.com/cowprotocol/cowswap/issues/7085)) ([674602e](https://github.com/cowprotocol/cowswap/commit/674602e19bd97197a98733da51cda186d256384e))
12+
13+
14+
### 🐛 Bug Fixes
15+
16+
* **affiliate:** ref code recovery ([#7099](https://github.com/cowprotocol/cowswap/issues/7099)) ([4d89c00](https://github.com/cowprotocol/cowswap/commit/4d89c00a377bb51502c9c0ac44d6d8a41acdea65))
17+
* empty space on the bridge confirm modal ([#7097](https://github.com/cowprotocol/cowswap/issues/7097)) ([376db96](https://github.com/cowprotocol/cowswap/commit/376db96e530be2949316ba288cae53fdd3804cc8))
18+
* Fix Hooks token and network selection ([#7086](https://github.com/cowprotocol/cowswap/issues/7086)) ([1dd236f](https://github.com/cowprotocol/cowswap/commit/1dd236fb1029aecb017c7442f86e9a59ae61a5bb))
19+
* **notifications:** fix Telegram authentication checks ([#7090](https://github.com/cowprotocol/cowswap/issues/7090)) ([4b30bc1](https://github.com/cowprotocol/cowswap/commit/4b30bc141fafd0f41ba9a6e68b6ff946e737c6a7))
20+
* recommended slippage styling ([#7096](https://github.com/cowprotocol/cowswap/issues/7096)) ([c85226b](https://github.com/cowprotocol/cowswap/commit/c85226b02d247ca721777fc8c859552f4e7712d3))
21+
* return back missing spaces ([#7091](https://github.com/cowprotocol/cowswap/issues/7091)) ([a7ecc31](https://github.com/cowprotocol/cowswap/commit/a7ecc313bbfd41b1da6f2f8bc3e85a6a0c453daa))
22+
* use correct amounts to sign instead of afterSlippage ([#7022](https://github.com/cowprotocol/cowswap/issues/7022)) ([b1020c4](https://github.com/cowprotocol/cowswap/commit/b1020c44615b49c5f05f0a6dcf0d21b96b628846))
23+
24+
25+
### ♻️ Refactoring
26+
27+
* affiliate account page styles ([#7082](https://github.com/cowprotocol/cowswap/issues/7082)) ([2732641](https://github.com/cowprotocol/cowswap/commit/2732641790dc053dc874b75d636c1428727b8cf1))
28+
29+
30+
### 🔧 Miscellaneous
31+
32+
* **release:** 2026-03-04 ([5612b59](https://github.com/cowprotocol/cowswap/commit/5612b59d690f9081e62d9efc5ea80774428f0366))
33+
34+
35+
### Dependencies
36+
37+
* The following workspace dependencies were updated
38+
* dependencies
39+
* @cowprotocol/analytics bumped to 2.4.0
40+
* @cowprotocol/assets bumped to 2.1.0
41+
* @cowprotocol/balances-and-allowances bumped to 2.4.0
42+
* @cowprotocol/common-const bumped to 2.4.0
43+
* @cowprotocol/common-hooks bumped to 2.4.0
44+
* @cowprotocol/common-utils bumped to 2.4.0
45+
* @cowprotocol/core bumped to 2.5.0
46+
* @cowprotocol/ens bumped to 2.4.0
47+
* @cowprotocol/events bumped to 3.4.0
48+
* @cowprotocol/hook-dapp-lib bumped to 2.0.7
49+
* @cowprotocol/iframe-transport bumped to 2.0.7
50+
* @cowprotocol/multicall bumped to 2.4.0
51+
* @cowprotocol/permit-utils bumped to 2.4.0
52+
* @cowprotocol/snackbars bumped to 2.0.9
53+
* @cowprotocol/tokens bumped to 2.5.0
54+
* @cowprotocol/types bumped to 3.4.0
55+
* @cowprotocol/ui bumped to 2.4.0
56+
* @cowprotocol/wallet bumped to 2.4.0
57+
* @cowprotocol/wallet-provider bumped to 2.1.7
58+
* @cowprotocol/widget-lib bumped to 1.3.0
59+
360
## [2.5.0](https://github.com/cowprotocol/cowswap/compare/cowswap-v2.4.0...cowswap-v2.5.0) (2026-02-25)
461

562

apps/cowswap-frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cowprotocol/cowswap",
3-
"version": "2.5.0",
3+
"version": "2.6.0",
44
"description": "CoW Swap",
55
"main": "index.js",
66
"author": "",
@@ -91,7 +91,7 @@
9191
"@sentry/types": "^7.80.0",
9292
"@tanstack/react-query": "^5.90.12",
9393
"@tanstack/react-virtual": "^3.0.2",
94-
"@uniswap/sdk-core": "^3.0.1",
94+
"@cowprotocol/currency": "workspace:*",
9595
"@uniswap/token-lists": "^1.0.0-beta.30",
9696
"@use-gesture/react": "^10.2.23",
9797
"@web3-react/core": "^8.2.3",

apps/cowswap-frontend/src/common/constants/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { Percent } from '@cowprotocol/currency'
12
import { BigNumber } from '@ethersproject/bignumber'
2-
import { Percent } from '@uniswap/sdk-core'
33

44
import ms from 'ms.macro'
55

apps/cowswap-frontend/src/common/constants/cosmos.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Token } from '@uniswap/sdk-core'
1+
import { Token } from '@cowprotocol/currency'
22

33
export const MOCK_TOKEN = new Token(1, '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9', 18, 'AAVE', 'Aave Token')
44

apps/cowswap-frontend/src/common/constants/priceImpact.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Percent } from '@uniswap/sdk-core'
1+
import { Percent } from '@cowprotocol/currency'
22

33
export const PRICE_IMPACT_THRESHOLD = {
44
low: new Percent(1, 100), // 1%

apps/cowswap-frontend/src/common/containers/CoWAmmBanner/index.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ import { useCallback } from 'react'
44
import { useCowAnalytics } from '@cowprotocol/analytics'
55
import { isInjectedWidget } from '@cowprotocol/common-utils'
66
import { OrderKind } from '@cowprotocol/cow-sdk'
7+
import { CurrencyAmount } from '@cowprotocol/currency'
78
import { useTokensByAddressMap } from '@cowprotocol/tokens'
89
import { ClosableBanner } from '@cowprotocol/ui'
910
import { useIsSmartContractWallet, useWalletInfo } from '@cowprotocol/wallet'
10-
import { CurrencyAmount } from '@uniswap/sdk-core'
1111

1212
import { t } from '@lingui/core/macro'
1313

1414
import { useIsDarkMode } from 'legacy/state/user/hooks'
1515

16-
import { useTradeNavigate } from 'modules/trade'
17-
import { getDefaultTradeRawState } from 'modules/trade'
16+
import { useTradeNavigate, getDefaultTradeRawState } from 'modules/trade'
1817
import { useYieldRawState } from 'modules/yield/hooks/useYieldRawState'
1918
import { useVampireAttack, useVampireAttackFirstTarget } from 'modules/yield/shared'
2019

apps/cowswap-frontend/src/common/hooks/useConfirmPriceImpactWithoutFee.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Percent } from '@uniswap/sdk-core'
1+
import { Percent } from '@cowprotocol/currency'
22

33
import { act, renderHook } from '@testing-library/react'
44

0 commit comments

Comments
 (0)