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

fix: wallet_addEthereumChain condition #2476

Merged
merged 7 commits into from
Jul 3, 2024
Merged

fix: wallet_addEthereumChain condition #2476

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e0b880d
fix: updates the `wallet_addEthereumChain` condition to check only if…
ganchoradkov Jun 28, 2024
f22dbd5
Merge branch 'main' into fix/ethers-switch-chain
ganchoradkov Jun 28, 2024
c8b8809
Merge branch 'main' into fix/ethers-switch-chain
ganchoradkov Jun 28, 2024
35930fc
Merge branch 'main' into fix/ethers-switch-chain
ganchoradkov Jul 1, 2024
71fdfb9
Merge branch 'main' into fix/ethers-switch-chain
ganchoradkov Jul 3, 2024
728e218
fix: lower cases error msg before regex check
ganchoradkov Jul 3, 2024
670fd99
Merge branch 'fix/ethers-switch-chain' of github.com:WalletConnect/we…
ganchoradkov Jul 3, 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
16 changes: 5 additions & 11 deletions packages/ethers/src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,19 +1255,13 @@ export class Web3Modal extends Web3ModalScaffold {
EthersStoreUtil.setChainId(chainId)
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} catch (switchError: any) {
if (
switchError.code === EthersConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID ||
switchError.code === EthersConstantsUtil.ERROR_CODE_DEFAULT ||
switchError?.data?.originalError?.code ===
EthersConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID
) {
await EthersHelpersUtil.addEthereumChain(
WalletConnectProvider as unknown as Provider,
chain
)
} else {
if (/(?<temp1>user rejected)/u.test(switchError?.message)) {
ganchoradkov marked this conversation as resolved.
Show resolved Hide resolved
throw new Error('Chain is not supported')
}
await EthersHelpersUtil.addEthereumChain(
WalletConnectProvider as unknown as Provider,
chain
)
}
}
} else if (providerType === ConstantsUtil.INJECTED_CONNECTOR_ID && chain) {
Expand Down
16 changes: 5 additions & 11 deletions packages/ethers5/src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,19 +972,13 @@ export class Web3Modal extends Web3ModalScaffold {
EthersStoreUtil.setChainId(chainId)
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} catch (switchError: any) {
if (
switchError.code === EthersConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID ||
switchError.code === EthersConstantsUtil.ERROR_CODE_DEFAULT ||
switchError?.data?.originalError?.code ===
EthersConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID
) {
await EthersHelpersUtil.addEthereumChain(
WalletConnectProvider as unknown as Provider,
chain
)
} else {
if (/(?<temp1>user rejected)/u.test(switchError?.message)) {
throw new Error('Chain is not supported')
}
await EthersHelpersUtil.addEthereumChain(
WalletConnectProvider as unknown as Provider,
chain
)
}
}
} else if (providerType === ConstantsUtil.EIP6963_CONNECTOR_ID && chain) {
Expand Down
Loading