From 8716fe60411a8b770216e1a3df56d0806135db86 Mon Sep 17 00:00:00 2001
From: Ian Bicking <ian@ianbicking.org>
Date: Mon, 9 Dec 2019 16:13:23 -0600
Subject: [PATCH] Fix #5422, remove deprecation warning

---
 server/src/promotion-strategy.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/server/src/promotion-strategy.js b/server/src/promotion-strategy.js
index 7d5e379368..f7517f6e4f 100644
--- a/server/src/promotion-strategy.js
+++ b/server/src/promotion-strategy.js
@@ -23,8 +23,14 @@ class PromotionStrategy {
   }
 
   /* Display edit tool promotion on shot page below edit button */
-  shouldShowEditToolPromotion(isOwner, enableAnnotations, hasFxaOnboardingDialog) {
+  shouldShowEditToolPromotion(
+    isOwner,
+    enableAnnotations,
+    hasFxaOnboardingDialog
+  ) {
+    return false;
     // Hide edit tool promotion when showing fxaOnboarding dialog
+    /*
     if (!isOwner || !enableAnnotations || hasFxaOnboardingDialog) {
       return false;
     }
@@ -38,6 +44,7 @@ class PromotionStrategy {
       show = true;
     }
     return show;
+    */
   }
 
   /* Highlight edit tool icon on the shot page when user lands on shot page
@@ -77,7 +84,7 @@ class PromotionStrategy {
   }
 
   shouldShowDeprecation() {
-    return true;
+    return false;
   }
 }