fix: message event handler (#3131)

Co-authored-by: MK <[email protected]> Co-authored-by: MK <[email protected]>
reown-com · Oct 23, 2024 · e16f0fe · e16f0fe
1 parent 8d841f0
commit e16f0fe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/.changeset/cyan-plums-speak.md b/.changeset/cyan-plums-speak.md
@@ -0,0 +1,5 @@
+---
+'@reown/appkit-wallet': minor
+---
+
+Fixed message event handler when payload type was not a string
diff --git a/packages/wallet/src/W3mFrame.ts b/packages/wallet/src/W3mFrame.ts
@@ -107,7 +107,10 @@ export class W3mFrame {
       signal: AbortSignal
     ) => {
       function eventHandler({ data }: MessageEvent) {
-        if (!data.type?.includes(W3mFrameConstants.FRAME_EVENT_KEY)) {
+        if (
+          typeof data.type !== 'string' ||
+          !data.type.includes(W3mFrameConstants.FRAME_EVENT_KEY)
+        ) {
           return
         }
         const frameEvent = W3mFrameSchema.frameEvent.parse(data)
@@ -127,7 +130,10 @@ export class W3mFrame {
     onFrameEvent: (callback: (event: W3mFrameTypes.FrameEvent) => void) => {
       if (W3mFrameHelpers.isClient) {
         window.addEventListener('message', ({ data }) => {
-          if (!data.type?.includes(W3mFrameConstants.FRAME_EVENT_KEY)) {
+          if (
+            typeof data.type !== 'string' ||
+            !data.type.includes(W3mFrameConstants.FRAME_EVENT_KEY)
+          ) {
             return
           }
           const frameEvent = W3mFrameSchema.frameEvent.parse(data)
@@ -139,7 +145,10 @@ export class W3mFrame {
     onAppEvent: (callback: (event: W3mFrameTypes.AppEvent) => void) => {
       if (W3mFrameHelpers.isClient) {
         window.addEventListener('message', ({ data }) => {
-          if (!data.type?.includes(W3mFrameConstants.APP_EVENT_KEY)) {
+          if (
+            typeof data.type !== 'string' ||
+            !data.type.includes(W3mFrameConstants.APP_EVENT_KEY)
+          ) {
             return
           }
           const appEvent = W3mFrameSchema.appEvent.parse(data)