-
Notifications
You must be signed in to change notification settings - Fork 101
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.
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
fix(swap): handle errors from order posting API #3224
Merged
+31
−12
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
10 changes: 10 additions & 0 deletions
10
apps/cowswap-frontend/src/api/gnosisProtocol/getIsOrderBookTypedError.ts
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import { OrderBookApiError } from '@cowprotocol/cow-sdk' | ||
|
||
import { ApiErrorObject } from './errors/OperatorError' | ||
|
||
export type OrderBookTypedError = OrderBookApiError<ApiErrorObject> | ||
|
||
export function getIsOrderBookTypedError(e: any): e is OrderBookTypedError { | ||
const error = e as OrderBookTypedError | ||
return error.body.errorType !== undefined && error.body.description !== undefined | ||
} |
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
12 changes: 10 additions & 2 deletions
12
apps/cowswap-frontend/src/modules/trade/utils/swapErrorHelper.ts
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,19 @@ | ||
import { getProviderErrorMessage, isRejectRequestProviderError } from '@cowprotocol/common-utils' | ||
import { capitalizeFirstLetter, getProviderErrorMessage, isRejectRequestProviderError } from '@cowprotocol/common-utils' | ||
|
||
import { getIsOrderBookTypedError } from 'api/gnosisProtocol' | ||
|
||
export const USER_SWAP_REJECTED_ERROR = 'User rejected signing the order' | ||
|
||
export function getSwapErrorMessage(error: Error): string { | ||
if (isRejectRequestProviderError(error)) { | ||
return USER_SWAP_REJECTED_ERROR | ||
} else { | ||
return getProviderErrorMessage(error) | ||
const defaultErrorMessage = getProviderErrorMessage(error) | ||
|
||
if (getIsOrderBookTypedError(error)) { | ||
return capitalizeFirstLetter(error.body?.description) || defaultErrorMessage | ||
} | ||
|
||
return defaultErrorMessage | ||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
export function capitalizeFirstLetter(str: string): string { | ||
if (!str) return str | ||
|
||
return str.charAt(0).toUpperCase() + str.slice(1) | ||
} |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
don't we do the mapping if the type is know?
cowswap/apps/cowswap-frontend/src/api/gnosisProtocol/errors/OperatorError.ts
Line 44 in 679e9fa
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's better to show an error as it is. Having this we can change the text on backend side on flight