Fixing and improving redirect core

2 files changed, 5 insertions, 5 deletions

diff --git a/src/pages/popup_src/Buttons.svelte b/src/pages/popup_src/Buttons.svelte
index e53a64b7..c0644ff7 100644
--- a/src/pages/popup_src/Buttons.svelte
+++ b/src/pages/popup_src/Buttons.svelte
@@ -33,7 +33,7 @@
       url = new URL(tabs[0].url)
       servicesHelper.switchInstance(url).then(r => (switchInstance = r))
       servicesHelper.reverse(url).then(r => (redirectToOriginal = r))
-      servicesHelper.redirectAsync(url, "main_frame", null, true).then(r => (redirect = r))
+      servicesHelper.redirectAsync(url, "main_frame", null, null, false, true).then(r => (redirect = r))
       servicesHelper.computeService(url).then(r => (currentService = r))
     }
   })
@@ -44,7 +44,7 @@
     <Row
       class="interactive"
       on:click={() => {
-        browser.runtime.sendMessage("redirectTab", () => {
+        browser.tabs.update({ url: redirect }, () => {
           window.close()
         })
       }}
@@ -58,7 +58,7 @@
     <Row
       class="interactive"
       on:click={async () =>
-        browser.tabs.update({ url: await servicesHelper.switchInstance(url) }, () => {
+        browser.tabs.update({ url: switchInstance }, () => {
           window.close()
         })}
     >
@@ -75,7 +75,7 @@
     <Row
       class="interactive"
       on:click={() =>
-        browser.runtime.sendMessage("reverseTab", () => {
+        browser.tabs.update({ url: redirectToOriginal }, () => {
           window.close()
         })}
     >
diff --git a/src/pages/popup_src/components/Switch.svelte b/src/pages/popup_src/components/Switch.svelte
index f76e74be..98f765b7 100644
--- a/src/pages/popup_src/components/Switch.svelte
+++ b/src/pages/popup_src/components/Switch.svelte
@@ -30,7 +30,7 @@
     class="interactive margin margin_{document.body.dir}"
     on:keydown={null}
     on:click={() =>
-      browser.tabs.create({ url: browser.runtime.getURL(_config.services[serviceKey].url) }, () => {
+      browser.tabs.create({ url: _config.services[serviceKey].url }, () => {
         window.close()
       })}
   >