Merge branch 'trunk' into issue/6969_filter_for_email_followers

Author: leandroalonso

RELEASE-NOTES.txt

@@ -3,6 +3,8 @@
 * [**] Some of the screens of the app has a new, fresh and more modern visual, including the initial one: My Site. [#17812]
 * [**] Notifications: added a button to mark all notifications in the selected filter as read. [#17840]
 * [**] People: you can now manage Email Followers on the People section! [#17854]
+* [*] Stats: fix navigation between Stats tab. [#17856]
+* [*] Quick Start: Fixed a bug where a user logging in via a self-hosted site not connected to Jetpack would see Quick Start when selecting "No thanks" on the Quick Start prompt. [#17855] 
 
 19.1
 -----

WordPress/Classes/ViewRelated/Blog/QuickStartSettings.swift

@@ -35,9 +35,7 @@ final class QuickStartSettings {
     }
 
     private func promptWasDismissedKey(for blog: Blog) -> String? {
-        guard let siteID = blog.dotComID?.intValue else {
-            return nil
-        }
+        let siteID = blog.dotComID?.intValue ?? 0
         return "QuickStartPromptWasDismissed-\(siteID)"
     }
 

WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift

@@ -194,10 +194,11 @@ private extension SiteStatsDashboardViewController {
         let selectedPeriodChanged = currentSelectedPeriod != oldSelectedPeriod
         let previousSelectedPeriodWasInsights = oldSelectedPeriod == .insights
         let pageViewControllerIsEmpty = pageViewController?.viewControllers?.isEmpty ?? true
+        let isGrowAudienceShowingOnInsights = insightsTableViewController.isGrowAudienceShowing
 
         switch currentSelectedPeriod {
         case .insights:
-            if selectedPeriodChanged || pageViewControllerIsEmpty {
+            if selectedPeriodChanged || pageViewControllerIsEmpty || isGrowAudienceShowingOnInsights {
                 pageViewController?.setViewControllers([insightsTableViewController],
                                                        direction: .forward,
                                                        animated: false)