feat: executedSurplusFee removal #5262
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also use totalFee where applicable
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
alfetopito
commented
Dec 30, 2024
Comment on lines
10
to
16
| // TODO: get rid of this once https://github.com/cowprotocol/services/pull/3184 is complete | ||
| const HAS_BACKEND_MIGRATED = false | ||
|
|
||
| function getFeeToken(order: ParsedOrder) { | ||
| if (!HAS_BACKEND_MIGRATED) { | ||
| return order.inputToken | ||
| } |
There was a problem hiding this comment.
Until a migration is done, the fee will continue being returned in SELL token
There was a problem hiding this comment.
Actually, decided to default to inputToken when the feeToken is not set.
This flag is not needed then.
Comment on lines
18
to
28
| const { inputToken, outputToken } = order | ||
| const { executedFeeToken } = order.executionData | ||
|
|
||
| if (inputToken?.address.toLowerCase() === executedFeeToken?.toLowerCase()) { | ||
| return inputToken | ||
| } | ||
| if (outputToken?.address.toLowerCase() === executedFeeToken?.toLowerCase()) { | ||
| return outputToken | ||
| } | ||
| return undefined | ||
| } |
There was a problem hiding this comment.
I had already implemented it assuming it would be in the surplus, but that's not the case yet.
| // TODO: use the value from SDK | ||
| const totalFee = CurrencyAmount.fromRawAmount(inputToken, (executedSurplusFee ?? executedFeeAmount) || 0) | ||
| const quoteSymbol = inputToken.symbol | ||
| const totalFeeAmount = CurrencyAmount.fromRawAmount(feeToken, totalFee || 0) |
There was a problem hiding this comment.
Use the totalFee available from the API
Comment on lines
-38
to
+46
| executedSurplusFee: BigNumber | null | ||
| executedFee: BigNumber | null |
There was a problem hiding this comment.
Basically renaming the field everywhere else.
|
Removed dependencies detected. Learn more about Socket for GitHub ↗︎ 🚮 Removed packages: npm/[email protected] |
anxolin
reviewed
Dec 30, 2024
apps/cowswap-frontend/src/modules/ordersTable/pure/ReceiptModal/FeeField.tsx
Outdated
Show resolved
Hide resolved
anxolin
approved these changes
Dec 31, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Remove usages of
executedSurplusFeewithexecutedFee.Everything should remain as is, no functional changes.
SDK related changes: cowprotocol/cow-sdk#229
Backend changes depending on this: cowprotocol/services#3184
To Test
network costssectionnetwork costssection