Merge branch 'dejal' into catalyst

clients/ios/Classes/FeedsObjCViewController.m

@@ -252,7 +252,10 @@ static NSArray<NSString *> *NewsBlurTopSectionNames;
 //        [self.feedTitlesTable selectRowAtIndexPath:self.currentRowAtIndexPath
 //                                          animated:NO 
 //                                    scrollPosition:UITableViewScrollPositionNone];
-        [self hideNotifier];
+        
+        if (self.notifier.pendingHide) {
+            [self hideNotifier];
+        }
     }
     
     if (self.searchFeedIds) {

clients/ios/Classes/NBNotifier.h

@@ -35,6 +35,7 @@ typedef enum {
 @property (nonatomic, strong) UIView *accessoryView;
 @property (nonatomic, strong) NSString *title;
 @property (nonatomic, assign) BOOL showing;
+@property (nonatomic, assign) BOOL pendingHide;
 @property (nonatomic, retain) UIView *progressBar;
 @property (nonatomic) NSLayoutConstraint *topOffsetConstraint;
 

clients/ios/Classes/NBNotifier.m

@@ -223,7 +223,8 @@
         return;
     }
     
-    showing = YES;
+    self.showing = YES;
+    self.pendingHide = NO;
 //    CGRect frame = self.frame;
 //    frame.size.width = self.view.frame.size.width;
 //    self.frame = frame;
@@ -252,6 +253,7 @@
 
 - (void)hideIn:(float)seconds {
     if (!self.window) {
+        self.pendingHide = YES;
         return;
     }
     
@@ -267,7 +269,8 @@
 //        self.hidden = YES;
     }];
     
-    showing = NO;
+    self.showing = NO;
+    self.pendingHide = NO;
 }
 
 - (void)drawRect:(CGRect)rect{