fix message passing in Firefox

Emurgo · Oct 21, 2024 · c1bb4c5 · c1bb4c5
1 parent 450bd41
commit c1bb4c5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/yoroi-extension/app/api/thunk.js b/packages/yoroi-extension/app/api/thunk.js
@@ -404,9 +404,19 @@ const callbacks = Object.freeze({
   serverStatusUpdate: [],
   coinPriceUpdate: [],
 });
-chrome.runtime.onMessage.addListener(async (message, _sender, _sendResponse) => {
+chrome.runtime.onMessage.addListener(async (serializedMessage, _sender, _sendResponse) => {
   //fixme: verify sender.id/origin
-  Logger.debug('get message from background:', JSON.stringify(message, null, 2));
+  Logger.debug('get message from background:', serializedMessage);
+
+  let message;
+  try {
+    message = JSON.parse(serializedMessage);
+  } catch {
+    return;
+  }
+  if (typeof message !== 'object') {
+    return;
+  }
 
   if (message.type === 'wallet-state-update') {
     if (message.params.newTxs) {

diff --git a/packages/yoroi-extension/chrome/extension/background/subscriptionManager.js b/packages/yoroi-extension/chrome/extension/background/subscriptionManager.js
@@ -68,6 +68,6 @@ declare var chrome;
 */
 export function emitUpdateToSubscriptions(data: Object): void {
   for (const { tabId } of getSubscriptions()) {
-    chrome.tabs.sendMessage(tabId, data);
+    chrome.tabs.sendMessage(tabId, JSON.stringify(data));
   }
 }