fix: wagmi not showing loading indicator on email reconnection (#2682)

reown-com · Aug 9, 2024 · d49161a · d49161a
1 parent fc8a93b
commit d49161a
Show file tree

Hide file tree

Showing 4 changed files with 13,864 additions and 10,377 deletions.
diff --git a/apps/laboratory/tests/email.spec.ts b/apps/laboratory/tests/email.spec.ts
@@ -86,6 +86,11 @@ emailTest('it should switch network and sign', async () => {
   await validator.expectAcceptedSign()
 })
 
+emailTest.only('it should show loading on page refresh', async () => {
+  await page.page.reload()
+  await validator.expectConnectButtonLoading()
+})
+
 emailTest('it should disconnect correctly', async () => {
   await page.openAccount()
   await page.openProfileView()

diff --git a/apps/laboratory/tests/shared/validators/ModalValidator.ts b/apps/laboratory/tests/shared/validators/ModalValidator.ts
@@ -171,4 +171,9 @@ export class ModalValidator {
     const networkOptions = this.page.getByTestId(`w3m-network-switch-${name}`)
     await expect(networkOptions).toBeDisabled()
   }
+
+  async expectConnectButtonLoading() {
+    const connectButton = this.page.getByTestId('connect-button')
+    await expect(connectButton).toContainText('Connecting...')
+  }
 }
diff --git a/packages/wagmi/src/client.ts b/packages/wagmi/src/client.ts
@@ -450,11 +450,18 @@ export class Web3Modal extends Web3ModalScaffold {
     isDisconnected,
     chainId,
     connector,
-    addresses
+    addresses,
+    status
   }: Partial<
     Pick<
       GetAccountReturnType,
-      'address' | 'isConnected' | 'isDisconnected' | 'chainId' | 'connector' | 'addresses'
+      | 'address'
+      | 'isConnected'
+      | 'isDisconnected'
+      | 'chainId'
+      | 'connector'
+      | 'addresses'
+      | 'status'
     >
   >) {
     const caipAddress: CaipAddress = `${ConstantsUtil.EIP155}:${chainId}:${address}`
@@ -463,7 +470,9 @@ export class Web3Modal extends Web3ModalScaffold {
       return
     }
 
-    if (isConnected && address && chainId) {
+    const connected = isConnected && status === 'connected'
+
+    if (connected && address && chainId) {
       this.resetAccount()
       this.syncNetwork(address, chainId, isConnected)
       this.setIsConnected(isConnected)