Refactor: add FAB to parent vc regardless of MSD feature flag

Previously, we were only adding the FAB to the parent vc (MySiteViewController) if the MSD feature flag was enabled.

Author: Momo Ozawa

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+FancyAlerts.swift

@@ -20,13 +20,12 @@ extension BlogDetailsViewController {
             if let info = notification.userInfo?[QuickStartTourGuide.notificationElementKey] as? QuickStartTourElement {
                 switch info {
                 case .noSuchElement:
-                    if FeatureFlag.mySiteDashboard.enabled,
-                       let parentVC = self?.parent as? MySiteViewController {
-                        parentVC.additionalSafeAreaInsets = .zero
-                    } else {
-                        self?.additionalSafeAreaInsets = .zero
+                    guard let parentVC = self?.parent as? MySiteViewController else {
+                        return
                     }
 
+                    parentVC.additionalSafeAreaInsets = .zero
+
                 case .siteIcon, .siteTitle:
                     // handles the padding in case the element is not in the table view
                     self?.additionalSafeAreaInsets = UIEdgeInsets(top: 0, left: 0, bottom: BlogDetailsViewController.bottomPaddingForQuickStartNotices, right: 0)

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m

@@ -382,18 +382,12 @@ - (void)viewDidLoad
     [self startObservingQuickStart];
     [self addMeButtonToNavigationBarWithEmail:self.blog.account.email meScenePresenter:self.meScenePresenter];
 
-    if ([Feature enabled:FeatureFlagMySiteDashboard]) {
-        MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
-        
-        [self.createButtonCoordinator addTo:parentVC.view
-                             trailingAnchor:parentVC.view.safeAreaLayoutGuide.trailingAnchor
-                               bottomAnchor:parentVC.view.safeAreaLayoutGuide.bottomAnchor];
-    } else {
-        [self.createButtonCoordinator addTo:self.view
-                             trailingAnchor:self.view.safeAreaLayoutGuide.trailingAnchor
-                               bottomAnchor:self.view.safeAreaLayoutGuide.bottomAnchor];
-    }
+    MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
 
+    [self.createButtonCoordinator addTo:parentVC.view
+                         trailingAnchor:parentVC.view.safeAreaLayoutGuide.trailingAnchor
+                           bottomAnchor:parentVC.view.safeAreaLayoutGuide.bottomAnchor];
+
 }
 
 /// Resizes the `tableHeaderView` as necessary whenever its size changes.
@@ -419,25 +413,13 @@ - (void)viewDidLayoutSubviews {
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
+    
+    MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
 
     if ([[QuickStartTourGuide shared] currentElementInt] != NSNotFound) {
-        
-        if ([Feature enabled:FeatureFlagMySiteDashboard]) {
-            MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
-            parentVC.additionalSafeAreaInsets = UIEdgeInsetsMake(0, 0, [BlogDetailsViewController bottomPaddingForQuickStartNotices], 0);
-        } else {
-            self.additionalSafeAreaInsets = UIEdgeInsetsMake(0, 0, [BlogDetailsViewController bottomPaddingForQuickStartNotices], 0);
-        }
-        
+        parentVC.additionalSafeAreaInsets = UIEdgeInsetsMake(0, 0, [BlogDetailsViewController bottomPaddingForQuickStartNotices], 0);
     } else {
-        
-        if ([Feature enabled:FeatureFlagMySiteDashboard]) {
-            MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
-            parentVC.additionalSafeAreaInsets = UIEdgeInsetsZero;
-        } else {
-            self.additionalSafeAreaInsets = UIEdgeInsetsZero;
-        }
-        
+        parentVC.additionalSafeAreaInsets = UIEdgeInsetsZero;
     }
 
     if (self.splitViewControllerIsHorizontallyCompact) {
@@ -1717,18 +1699,10 @@ - (void)scrollToElement:(QuickStartTourElement) element
         rowCount = 0;
         for (BlogDetailsRow *row in section.rows) {
             if (row.quickStartIdentifier == element) {
-                
                 NSIndexPath *path = [NSIndexPath indexPathForRow:rowCount inSection:sectionCount];
-                
-                if ([Feature enabled:FeatureFlagMySiteDashboard]) {
-                    parentVC.additionalSafeAreaInsets = UIEdgeInsetsMake(0, 0, [BlogDetailsViewController bottomPaddingForQuickStartNotices], 0);
-                    UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:path];
-                    [parentVC.scrollView scrollToView:cell animated:true];
-                } else {
-                    self.additionalSafeAreaInsets = UIEdgeInsetsMake(0, 0, [BlogDetailsViewController bottomPaddingForQuickStartNotices], 0);
-                    [self.tableView scrollToRowAtIndexPath:path atScrollPosition:UITableViewScrollPositionTop animated:true];
-                }
-                
+                parentVC.additionalSafeAreaInsets = UIEdgeInsetsMake(0, 0, [BlogDetailsViewController bottomPaddingForQuickStartNotices], 0);
+                UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:path];
+                [parentVC.scrollView scrollToView:cell animated:true];
             }
             rowCount++;
         }
@@ -1948,12 +1922,8 @@ - (void)showViewSiteFromSource:(BlogDetailsNavigationSource)source
         [[QuickStartTourGuide shared] completeViewSiteTourForBlog:self.blog];
     }
 
-    if ([Feature enabled:FeatureFlagMySiteDashboard]) {
-        MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
-        parentVC.additionalSafeAreaInsets = UIEdgeInsetsZero;
-    } else {
-        self.additionalSafeAreaInsets = UIEdgeInsetsZero;
-    }    
+    MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
+    parentVC.additionalSafeAreaInsets = UIEdgeInsetsZero;
 }
 
 - (void)showViewAdmin