fix: message conflict log

ringcentral · Jun 21, 2024 · a5ff5c0 · a5ff5c0
1 parent f82dcbc
commit a5ff5c0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/popup.js b/src/popup.js
@@ -95,7 +95,7 @@ async function showUnresolvedTabPage(path) {
     type: 'rc-adapter-register-customized-page',
     page: unresolvedLogsPage,
   }, '*');
-  if (unresolvedLogsPage.hidden && !!path && path == '/customizedTabs/unresolve') {
+  if (unresolvedLogsPage.hidden && !!path && (path == '/customizedTabs/unresolve' || path == '/messageLogger' || path == '/callLogger')) {
     document.querySelector("#rc-widget-adapter-frame").contentWindow.postMessage({
       type: 'rc-adapter-navigate-to',
       path: 'goBack',
@@ -652,7 +652,7 @@ window.addEventListener('message', async (e) => {
                         contactName: data.body.formData.newContactName === '' ? data.body.formData.contactName : data.body.formData.newContactName
                       });
                     if (!!data.body.formData.isUnresolved) {
-                      await showUnresolvedTabPage();
+                      await showUnresolvedTabPage(data.path);
                     }
                     break;
                   case 'editLog':
@@ -936,7 +936,9 @@ window.addEventListener('message', async (e) => {
                       contactName: data.body.formData.newContactName === '' ? data.body.formData.contactName : data.body.formData.newContactName
                     });
                   }
-                  await showUnresolvedTabPage();
+                  if (!!data.body.formData.isUnresolved) {
+                    await showUnresolvedTabPage(data.path);
+                  }
                   window.postMessage({ type: 'rc-log-modal-loading-off' }, '*');
                 }
               }