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

fix: issue where user rejected request errors are not correctly handled in either wallet_switchEthereumChain nor wallet_addEthereumChain calls #25269

Merged
merged 1 commit into from
Jun 12, 2024
Merged

fix: issue where user rejected request errors are not correctly handled in either wallet_switchEthereumChain nor wallet_addEthereumChain calls #25269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions app/scripts/lib/rpc-method-middleware/handlers/ethereum-chain-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,19 @@ export async function switchChain(
await setActiveNetwork(networkClientId);
res.result = null;
} catch (error) {
return end(
error.code === errorCodes.provider.userRejectedRequest
? undefined
: error,
);
// We don't want to return an error if user rejects the request
// and this is a chained switch request after wallet_addEthereumChain.
// approvalFlowId is only defined when this call is of a
// wallet_addEthereumChain request so we can use it to determine
// if we should return an error
if (
error.code === errorCodes.provider.userRejectedRequest &&
approvalFlowId
) {
res.result = null;
return end();
}
return end(error);
} finally {
if (approvalFlowId) {
endApprovalFlow({ id: approvalFlowId });
Expand Down
Loading