Update expo rn sdk to match bare

magiclabs · Mar 4, 2024 · 466d5b3 · 466d5b3
1 parent c9c56e6
commit 466d5b3
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/packages/@magic-sdk/react-native-expo/src/react-native-webview-controller.tsx b/packages/@magic-sdk/react-native-expo/src/react-native-webview-controller.tsx
@@ -229,17 +229,20 @@ export class ReactNativeWebViewController extends ViewController {
   }
 
   protected async _post(data: any) {
-    const methodType = data.payload.method;
-    const messageId = data.payload.id;
+    // Safely access `method` and `id` from `payload`, defaulting to undefined if not present
+    const methodType = data.payload?.method;
+    const messageId = data.payload?.id;
 
     if (this.webView && (this.webView as any).postMessage) {
       // Setup timeout for message response
-      const timeout = setTimeout(() => {
-        this.messageTimeouts.delete(messageId);
-        throw createResponseTimeoutError(methodType, messageId);
-      }, 10000); // 10-second timeout
+      if (methodType && messageId) {
+        const timeout = setTimeout(() => {
+          this.messageTimeouts.delete(messageId);
+          throw createResponseTimeoutError(methodType, messageId);
+        }, 10000); // 10-second timeout
 
-      this.messageTimeouts.set(messageId, timeout);
+        this.messageTimeouts.set(messageId, timeout);
+      }
 
       (this.webView as any).postMessage(
         JSON.stringify(data, (key, value) => {