Merge branch 'develop' into jl/mmp-1033/preferences-controller-networ…

…k-meta
MetaMask · Sep 21, 2023 · f6a8325 · f6a8325
2 parents d9a9103 + 48184fe
commit f6a8325
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -3203,7 +3203,7 @@ export default class MetamaskController extends EventEmitter {
   }
 
   _startUISync() {
-    // Message startUISync is used in MV3 to start syncing state with UI
+    // Message startUISync is used to start syncing state with UI
     // Sending this message after login is completed helps to ensure that incomplete state without
     // account details are not flushed to UI.
     this.emit('startUISync');

diff --git a/app/scripts/ui.js b/app/scripts/ui.js
@@ -257,7 +257,13 @@ async function start() {
     extensionPort.onMessage.addListener(messageListener);
     extensionPort.onDisconnect.addListener(resetExtensionStreamAndListeners);
   } else {
-    initializeUiWithTab(activeTab);
+    const messageListener = async (message) => {
+      if (message?.data?.method === 'startUISync') {
+        initializeUiWithTab(activeTab);
+        extensionPort.onMessage.removeListener(messageListener);
+      }
+    };
+    extensionPort.onMessage.addListener(messageListener);
   }
 
   function initializeUiWithTab(tab) {