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

Jump to bottom

Swap failed events: only reject committed txs with code !== 0 #3301

Merged
merged 4 commits into from
Jun 6, 2024
Merged

Swap failed events: only reject committed txs with code !== 0 #3301

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de16f7c
check for tx code for rejecting promise
jonator Jun 6, 2024
a5cf7f7
only reject with failed txs
jonator Jun 6, 2024
5ea2c22
make error handling more consistent
jonator Jun 6, 2024
2c73f13
fixes
jonator Jun 6, 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
8 changes: 2 additions & 6 deletions packages/web/components/swap-tool/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,8 @@ export const SwapTool: FunctionComponent<SwapToolProps> = observer(
});
}
})
.catch((error) => {
console.error("swap failed", error);
if (error instanceof Error && error.message === "Request rejected") {
// don't log when the user rejects in wallet
return;
}
.catch(() => {
console.log("reject sig");
logEvent([EventName.Swap.swapFailed, baseEvent]);
})
.finally(() => {
Expand Down
21 changes: 15 additions & 6 deletions packages/web/hooks/use-swap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,12 +373,15 @@ export function useSwap(
tokenOutMinAmount,
undefined,
signOptions,
() => {
resolve(pools.length === 1 ? "exact-in" : "multihop");
({ code }) => {
if (code)
reject("Failed to send swap exact amount in message");
else resolve(pools.length === 1 ? "exact-in" : "multihop");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor error handling for clarity and maintainability.

The error handling in the sendTradeTokenInTx function could be made clearer by using a more descriptive error message. Consider including details about the error code when the transaction fails.

- reject("Failed to send swap exact amount in message");
+ reject(`Failed to send swap exact amount in message with error code: ${code}`);
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
({ code }) => {
if (code)
reject("Failed to send swap exact amount in message");
else resolve(pools.length === 1 ? "exact-in" : "multihop");
({ code }) => {
if (code)
reject(`Failed to send swap exact amount in message with error code: ${code}`);
else resolve(pools.length === 1 ? "exact-in" : "multihop");

}
)
.catch((reason) => {
reject(reason);
// broadcast error or tx rejection
console.error(reason);
});
return pools.length === 1 ? "exact-in" : "multihop";
} else if (routes.length > 1) {
Expand All @@ -389,14 +392,20 @@ export function useSwap(
tokenOutMinAmount,
undefined,
signOptions,
() => {
resolve("multiroute");
({ code }) => {
if (code)
reject(
"Failed to send split route swap exact amount in message"
);
else resolve("multiroute");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor error handling for clarity and maintainability.

Similar to the previous comment, the error handling here can be improved by providing more information about the failure.

- reject("Failed to send split route swap exact amount in message");
+ reject(`Failed to send split route swap exact amount in message with error code: ${code}`);
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
({ code }) => {
if (code)
reject(
"Failed to send split route swap exact amount in message"
);
else resolve("multiroute");
({ code }) => {
if (code)
reject(`Failed to send split route swap exact amount in message with error code: ${code}`);
else resolve("multiroute");

}
)
.catch((reason) => {
reject(reason);
// broadcast error or tx rejection
console.error(reason);
});
} else {
// should not be possible because button should be disabled
jonator marked this conversation as resolved.
Show resolved Hide resolved
reject("No routes given");
}
}
Expand Down
Loading