Fix mozilla-services#4183, make onboarding behaviour consistent

testeaxeax · Apr 14, 2018 · d304b70 · d304b70
1 parent d35cc6b
commit d304b70
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/addon/webextension/background/main.js b/addon/webextension/background/main.js
@@ -116,6 +116,9 @@ this.main = (function() {
               sendEvent(event, "toolbar-button", {incognito: tab.incognito});
             }, (error) => {
               if ((!onboarded) && error.popupMessage === "UNSHOOTABLE_PAGE") {
+                senderror.showError({
+                  popupMessage: "UNSHOOTABLE_PAGE"
+                });
                 sendEvent("goto-onboarding", "selection-button", {incognito: tab.incognito});
                 return forceOnboarding();
               }
@@ -138,6 +141,8 @@ this.main = (function() {
       senderror.showError({
         popupMessage: "UNSHOOTABLE_PAGE"
       });
+      sendEvent("goto-onboarding", "selection-button", {incognito: tab.incognito});
+      forceOnboarding();
       return;
     }
     catcher.watchPromise(