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 state issue #1696

Merged
merged 2 commits into from
Jan 3, 2024
Merged

fix ethers loading state issue #1696

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61c8900
fix ethers loading state issue
svenvoskamp Jan 2, 2024
5a1d6f2
Merge branch 'V3' into fix/ethers-loading-state
svenvoskamp Jan 2, 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
30 changes: 14 additions & 16 deletions packages/ethers/src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,6 @@ export class Web3Modal extends Web3ModalScaffold {

if (ethersConfig.email) {
this.syncEmailConnector(w3mOptions.projectId)
this.listenEmailConnector()
}

if (ethersConfig.injected) {
Expand Down Expand Up @@ -589,6 +588,7 @@ export class Web3Modal extends Web3ModalScaffold {
if (this.emailProvider) {
const { address, chainId } = await this.emailProvider.connect()
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 @@ -752,6 +752,9 @@ export class Web3Modal extends Web3ModalScaffold {
this.emailProvider.onRpcResponse(() => {
super.close()
})
this.emailProvider.onIsConnected(() => {
super.setLoading(false)
})
}
}

Expand Down Expand Up @@ -1017,27 +1020,22 @@ export class Web3Modal extends Web3ModalScaffold {
private async syncEmailConnector(projectId: string) {
if (typeof window !== 'undefined') {
this.emailProvider = new W3mFrameProvider(projectId)

this.addConnector({
id: ConstantsUtil.EMAIL_CONNECTOR_ID,
type: 'EMAIL',
name: 'Email',
provider: this.emailProvider
})

super.setLoading(true)
const isLoginEmailUsed = this.emailProvider.getLoginEmailUsed()
super.setLoading(isLoginEmailUsed)
const isConnected = await this.emailProvider.isConnected()
if (isConnected) {
this.setEmailProvider()
}
}

this.addConnector({
id: ConstantsUtil.EMAIL_CONNECTOR_ID,
type: 'EMAIL',
name: 'Email',
provider: this.emailProvider
})
}

private listenEmailConnector() {
if (this.emailProvider) {
this.emailProvider.onIsConnected(() => {
super.setLoading(false)
})
}
}

private eip6963EventHandler(event: CustomEventInit<Wallet>) {
Expand Down
Loading