From 908c08bfcad0131bf50d071c3f47032292d840f3 Mon Sep 17 00:00:00 2001
From: Ed Lee <edilee@mozilla.com>
Date: Wed, 1 May 2019 17:30:30 -0400
Subject: [PATCH] (nobug) - Prevent old cards from showing up and use new sync
 icon (#4969)

---
 lib/OnboardingMessageProvider.jsm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/OnboardingMessageProvider.jsm b/lib/OnboardingMessageProvider.jsm
index aed4f03c2..d5b69fc40 100644
--- a/lib/OnboardingMessageProvider.jsm
+++ b/lib/OnboardingMessageProvider.jsm
@@ -99,7 +99,7 @@ const ONBOARDING_MESSAGES = async () => ([
         },
       },
     },
-    targeting: "attributionData.campaign != 'non-fx-button' && attributionData.source != 'addons.mozilla.org'",
+    targeting: "trailheadCohort == 0 && attributionData.campaign != 'non-fx-button' && attributionData.source != 'addons.mozilla.org'",
     trigger: {id: "showOnboarding"},
   },
   {
@@ -119,7 +119,7 @@ const ONBOARDING_MESSAGES = async () => ([
         },
       },
     },
-    targeting: "providerCohorts.onboarding == 'ghostery'",
+    targeting: "trailheadCohort == 0 && providerCohorts.onboarding == 'ghostery'",
     trigger: {id: "showOnboarding"},
   },
   {
@@ -139,7 +139,7 @@ const ONBOARDING_MESSAGES = async () => ([
         },
       },
     },
-    targeting: "attributionData.campaign == 'non-fx-button' && attributionData.source == 'addons.mozilla.org'",
+    targeting: "trailheadCohort == 0 && attributionData.campaign == 'non-fx-button' && attributionData.source == 'addons.mozilla.org'",
     trigger: {id: "showOnboarding"},
   },
   {
@@ -234,7 +234,7 @@ const ONBOARDING_MESSAGES = async () => ([
     content: {
       title: {string_id: "onboarding-data-sync-title"},
       text: {string_id: "onboarding-data-sync-text"},
-      icon: "sync",
+      icon: "devices",
       primary_button: {
         label: {string_id: "onboarding-data-sync-button"},
         action: {