From 81aa143f4b2e19349a8859faf11b4ec011f0be76 Mon Sep 17 00:00:00 2001
From: joewalsh <joewalsh@users.noreply.github.com>
Date: Fri, 15 Dec 2017 16:53:40 -0500
Subject: [PATCH 1/2] don't dismiss VCs when cancelling W icon popover display

---
 Wikipedia/Code/WMFArticleViewController.m | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Wikipedia/Code/WMFArticleViewController.m b/Wikipedia/Code/WMFArticleViewController.m
index e472225b59..411b611deb 100644
--- a/Wikipedia/Code/WMFArticleViewController.m
+++ b/Wikipedia/Code/WMFArticleViewController.m
@@ -1886,9 +1886,6 @@ - (void)showWIconPopoverIfNecessary {
 
 - (void)cancelWIconPopoverDisplay {
     [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(showWIconPopover) object:nil];
-    if (self.presentedViewController) {
-        [self dismissViewControllerAnimated:NO completion:NULL];
-    }
 }
 
 - (void)showWIconPopover {

From cd654c8470f0e2824986d8324988d378d554d2d9 Mon Sep 17 00:00:00 2001
From: joewalsh <joewalsh@users.noreply.github.com>
Date: Fri, 15 Dec 2017 17:14:23 -0500
Subject: [PATCH 2/2] disable the W icon popover until re-implemented

---
 Wikipedia/Code/WMFArticleViewController.m | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Wikipedia/Code/WMFArticleViewController.m b/Wikipedia/Code/WMFArticleViewController.m
index 411b611deb..0e845e60d1 100644
--- a/Wikipedia/Code/WMFArticleViewController.m
+++ b/Wikipedia/Code/WMFArticleViewController.m
@@ -1869,11 +1869,12 @@ - (NSString *)analyticsName {
 #pragma mark - One-time toolbar item popover tips
 
 - (BOOL)shouldShowWIconPopover {
-    if (!self.navigationController || [[NSUserDefaults standardUserDefaults] wmf_didShowWIconPopover]) {
-        return NO;
-    } else {
-        return YES;
-    }
+    return NO;
+    //    if (!self.navigationController || [[NSUserDefaults standardUserDefaults] wmf_didShowWIconPopover]) {
+    //        return NO;
+    //    } else {
+    //        return YES;
+    //    }
 }
 
 - (void)showWIconPopoverIfNecessary {