Merge pull request mozilla#1421 from chuckharmston/1419-onboarding-re…

…start Improve forced first-run restart behavior
howij1995 · Sep 23, 2016 · bd66e14 · bd66e14
2 parents 97834e6 + d35d58c
commit bd66e14
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/addon/index.js b/addon/index.js
@@ -334,11 +334,11 @@ exports.main = function(options) {
   ToolbarButton.init(settings);
   ExperimentNotifications.init();
   SharePrompt.init(settings);
-  FirstRun.setup(options.reason, settings);
 
-  if (reason === 'install') {
+  if (reason === 'install' || (reason === 'startup' && FirstRun.isFirstRun())) {
     openOnboardingTab();
   }
+  FirstRun.setup(options.reason, settings);
 
   const installedCount = (store.installedAddons) ? Object.keys(store.installedAddons).length : 0;
   Metrics.sendGAEvent({

diff --git a/addon/lib/first-run.js b/addon/lib/first-run.js
@@ -39,7 +39,7 @@ module.exports = {
 
   openTestPilot(settings) {
     tabs.open({
-      url: `${settings.BASE_URL}?${this.utm}`
+      url: `${settings.BASE_URL}/experiments/?${this.utm}`
     });
   },
 

diff --git a/frontend/src/app/components/ExperimentsListPage.js b/frontend/src/app/components/ExperimentsListPage.js
@@ -13,7 +13,8 @@ export default class ExperimentsListPage extends React.Component {
     super(props);
 
     let showEmailDialog = false;
-    if (cookies.get('first-run')) {
+    if (cookies.get('first-run') ||
+        window.location.search.indexOf('utm_campaign=restart-required') > -1) {
       cookies.remove('first-run');
       showEmailDialog = true;
     }

diff --git a/frontend/src/app/lib/addon.js b/frontend/src/app/lib/addon.js
@@ -54,11 +54,10 @@ export function installAddon(store, eventCategory, experimentTitle) {
       }
     });
   } else {
+    cookies.set('first-run', 'true');
     gaEvent.outboundURL = downloadUrl;
     sendToGA('event', gaEvent);
   }
-
-  cookies.set('first-run', 'true');
 }
 
 export function uninstallAddon() {