feat(permit): allowance warning #3184
Merged
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
alfetopito
commented
Oct 6, 2023
apps/cowswap-frontend/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx
Outdated
Show resolved
Hide resolved
| const recoveredOwner = await recoverPermitOwnerPromise | ||
|
|
||
| // Permit is valid when recovered owner matches order owner | ||
| return recoveredOwner.toLowerCase() === order.owner.toLowerCase() |
There was a problem hiding this comment.
This is it.
If recovered owner matches order owner, permit is still valid!
Comment on lines
51
to
70
| // TODO: Any way to make this typing mess any cleaner? | ||
| if (decodedValues && typeof decodedValues === 'object') { | ||
| const copy: Record<string, any> = {} | ||
|
|
||
| Object.keys(decodedValues).forEach((key) => { | ||
| // eslint-disable-next-line @typescript-eslint/ban-ts-comment | ||
| // @ts-ignore | ||
| const value = decodedValues[key] | ||
| if (BigNumber.isBigNumber(value)) { | ||
| // eslint-disable-next-line @typescript-eslint/ban-ts-comment | ||
| // @ts-ignore | ||
| copy[key] = value.toHexString() | ||
| } else { | ||
| copy[key] = value | ||
| } | ||
| }) | ||
| console.log(`bug--decodeABIParameters`, decodedValues, copy) | ||
|
|
||
| return copy as T | ||
| } |
There was a problem hiding this comment.
Open to suggestions on how to make this better/with no @ts-ignores
alfetopito
commented
Oct 9, 2023
apps/cowswap-frontend/src/modules/ordersTable/containers/OrdersTableWidget/index.tsx
Outdated
Show resolved
Hide resolved
| @@ -29,3 +29,5 @@ export const ORDER_TYPE_SUPPORTS_PERMIT: Record<TradeType, boolean> = { | |||
| [TradeType.LIMIT_ORDER]: true, | |||
| [TradeType.ADVANCED_ORDERS]: false, | |||
| } | |||
|
|
|||
| export const PENDING_ORDER_PERMIT_CHECK_INTERVAL = ms`1min` | |||
There was a problem hiding this comment.
Should we do it more often?
alfetopito
force-pushed
the
permit/3146_allowance-warning
branch
from
73fb2c1 to
a432bf6
Compare
shoom3301
reviewed
Oct 11, 2023
apps/cowswap-frontend/src/modules/permit/state/ordersPermitStatusAtom.ts
Outdated
Show resolved
Hide resolved
shoom3301
reviewed
Oct 11, 2023
apps/cowswap-frontend/src/modules/ordersTable/containers/OrdersTableWidget/index.tsx
Outdated
Show resolved
Hide resolved
shoom3301
reviewed
Oct 11, 2023
| @@ -410,6 +412,10 @@ export function OrdersTable({ | |||
| if (isParsedOrder(item)) { | |||
| const order = item | |||
|
|
|||
| const orderParams = getOrderParams(chainId, balancesAndAllowances, order) | |||
There was a problem hiding this comment.
Aha, there is a key of the changes
shoom3301
approved these changes
Oct 11, 2023
shoom3301
approved these changes
Oct 11, 2023
|
Merging, please post merge review |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
Fixes #3146
Update allowance warning check for limit orders
Now the UI will take into account permits still not executed when calculating whether the allowance warning should be displayed:
Before:
After:
TODO:
Move to jotai/updater
Check periodically
Test more use cases
Add it to Activity modal (SWAP orders)
To Test