Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main -> develop #5255

Merged
merged 2 commits into from
Dec 24, 2024
Merged

Main -> develop #5255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b81842c
fix: fix order filled condition for permit check (#5253)
shoom3301 Dec 23, 2024
935aeda
chore: release main (#5254)
shoom3301 Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .release-please-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"apps/cowswap-frontend": "1.95.2",
"apps/cowswap-frontend": "1.95.3",
"apps/explorer": "2.41.0",
"libs/permit-utils": "0.5.0",
"libs/widget-lib": "0.18.0",
Expand Down
7 changes: 7 additions & 0 deletions apps/cowswap-frontend/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [1.95.3](https://github.com/cowprotocol/cowswap/compare/cowswap-v1.95.2...cowswap-v1.95.3) (2024-12-23)


### Bug Fixes

* fix order filled condition for permit check ([#5253](https://github.com/cowprotocol/cowswap/issues/5253)) ([b81842c](https://github.com/cowprotocol/cowswap/commit/b81842c8aed196f23a9cbcb42d637299f1e7708e))

## [1.95.2](https://github.com/cowprotocol/cowswap/compare/cowswap-v1.95.1...cowswap-v1.95.2) (2024-12-23)


Expand Down
2 changes: 1 addition & 1 deletion apps/cowswap-frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cowprotocol/cowswap",
"version": "1.95.2",
"version": "1.95.3",
"description": "CoW Swap",
"main": "index.js",
"author": "",
Expand Down
2 changes: 1 addition & 1 deletion apps/cowswap-frontend/src/modules/ordersTable/utils/getOrderParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export function getOrderParams(
sellAmount,
balance,
// If the order has been filled at least once, we should not consider the permit amount
allowance: isOrderAtLeastOnceFilled ? getBiggerAmount(allowance, permitAmount) : allowance,
allowance: !isOrderAtLeastOnceFilled ? getBiggerAmount(allowance, permitAmount) : allowance,
})

return {
Expand Down
Loading