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 ethers loading hanging state #1702

Merged
merged 5 commits into from
Jan 4, 2024
+7 −1
Merged

Fix ethers loading hanging state #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90f1f81
Merge branch 'V3' of github.com:WalletConnect/web3modal into V3
svenvoskamp Jan 3, 2024
7f4f8c3
Merge branch 'V3' of github.com:WalletConnect/web3modal into V3
svenvoskamp Jan 4, 2024
49f8b96
fix ethers loading hanging state
svenvoskamp Jan 4, 2024
b078527
Merge branch 'V3' into fix/ethers-loading-hanging
svenvoskamp Jan 4, 2024
f40b0f8
Merge branch 'V3' into fix/ethers-loading-hanging
svenvoskamp Jan 4, 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
3 changes: 3 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion packages/ethers/src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,8 +587,8 @@ export class Web3Modal extends Web3ModalScaffold {

if (this.emailProvider) {
const { address, chainId } = await this.emailProvider.connect()
super.setLoading(false)
if (address && chainId) {
super.setLoading(false)
EthersStoreUtil.setChainId(chainId)
EthersStoreUtil.setProviderType(ConstantsUtil.EMAIL_CONNECTOR_ID as 'w3mEmail')
EthersStoreUtil.setProvider(this.emailProvider as unknown as CombinedProvider)
Expand Down Expand Up @@ -1032,8 +1032,11 @@ export class Web3Modal extends Web3ModalScaffold {
const isLoginEmailUsed = this.emailProvider.getLoginEmailUsed()
super.setLoading(isLoginEmailUsed)
const isConnected = await this.emailProvider.isConnected()

if (isConnected) {
this.setEmailProvider()
} else {
super.setLoading(false)
}
}
}
Expand Down
Loading