Merge branch 'main' into feat/appkit-auth

.changeset/calm-phones-joke.md

@@ -0,0 +1,23 @@
+---
+'@reown/appkit-wallet': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@apps/laboratory': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-core': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-ui': patch
+---
+
+Refactored frame timeouts

packages/wallet/src/W3mFrameProvider.ts

@@ -526,6 +526,9 @@ export class W3mFrameProvider {
           }
           resolve(undefined as unknown as W3mFrameTypes.Responses[`Frame${T}Response`])
         } else if (framEvent.type === `@w3m-frame/${type}_ERROR`) {
+          if (timer) {
+            clearTimeout(timer)
+          }
           if ('payload' in framEvent) {
             reject(new Error(framEvent.payload?.message || 'An error occurred'))
           }

packages/wallet/tests/W3mFrameProvider.test.ts

@@ -8,11 +8,13 @@ import { SecureSiteMock } from './mocks/SecureSite.mock.js'
 import { W3mFrameConstants } from '../src/W3mFrameConstants.js'
 
 describe('W3mFrameProvider', () => {
+  const mockTimeout = vi.fn
+
   const projectId = 'test-project-id'
-  let provider = new W3mFrameProvider(projectId)
+  let provider = new W3mFrameProvider({ projectId, onTimeout: mockTimeout })
 
   beforeEach(() => {
-    provider = new W3mFrameProvider(projectId)
+    provider = new W3mFrameProvider({ projectId })
     provider['w3mFrame'].frameLoadPromise = Promise.resolve()
     window.postMessage = vi.fn()
   })
@@ -99,4 +101,20 @@ describe('W3mFrameProvider', () => {
     expect(response).toEqual(responsePayload)
     expect(postAppEventSpy).toHaveBeenCalled()
   })
+
+  it(
+    'should timeout after 30 seconds',
+    async () => {
+      const postAppEventSpy = vi.spyOn(provider['w3mFrame'].events, 'postAppEvent')
+
+      const mockTimeoutSpy = vi.spyOn(provider, 'onTimeout')
+
+      await expect(provider.getFarcasterUri()).rejects.toThrow()
+
+      expect(postAppEventSpy).toHaveBeenCalled()
+
+      expect(mockTimeoutSpy).toHaveBeenCalled()
+    },
+    { timeout: 35_000 }
+  )
 })