2 files changed, 17 insertions, 5 deletions
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index aef21cd3..16083ebe 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -239,6 +239,7 @@ browser.contextMenus.onClicked.addListener(
   }
 );
 
-browser.runtime.onMessage.addListener(message => {
-  if (message.function === 'unify') utils.unify();
-});
+browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
+  if (message.function === 'unify') utils.unify(false).then(r => sendResponse({ response: r }))
+  return true;
+});
\ No newline at end of file
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 84dbab04..73890b07 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -90,11 +90,22 @@ utils.copyRaw(true).then(r => {
   }
 })
 
+
 utils.unify(true).then(r => {
   if (!r) document.getElementById('unify_div').style.display = 'none';
   else {
     const unify = document.getElementById('unify');
-    unify.addEventListener("click", () => browser.runtime.sendMessage({ function: 'unify' }));
+    unify.addEventListener("click", () =>
+      browser.runtime.sendMessage({ function: 'unify' },
+        response => {
+          if (response && response.response) {
+            const textElement = document.getElementById('unify').getElementsByTagName('h4')[0]
+            const oldHtml = textElement.innerHTML;
+            textElement.innerHTML = 'Unified';
+            setTimeout(() => textElement.innerHTML = oldHtml, 1000);
+          }
+        })
+    );
   }
 })
 
@@ -113,7 +124,7 @@ browser.storage.local.get(
 
 for (const a of document.getElementsByTagName('a')) {
   a.addEventListener('click', e => {
-    if (!a.classList.includes('button')) {
+    if (!a.classList.contains('button')) {
       browser.tabs.create({ url: a.getAttribute('href') });
       e.preventDefault();
     }