Merge branch 'trunk' into issue/17764-fix-navigation-between-insights-and-other-tabs

leandroalonso · web-flow · commit 0561cbc9ab7d · 2022-02-01T11:59:21.000-03:00
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -3,6 +3,7 @@
 * [**] 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]
 * [*] 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
 -----
diff --git a/WordPress/Classes/ViewRelated/Blog/QuickStartSettings.swift b/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)"
     }
 

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,7 @@ final class QuickStartSettings {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`private func promptWasDismissedKey(for blog: Blog) -> String? {`
`38`		`- guard let siteID = blog.dotComID?.intValue else {`
`39`		`- return nil`
`40`		`- }`
	`38`	`+ let siteID = blog.dotComID?.intValue ?? 0`
`41`	`39`	`return "QuickStartPromptWasDismissed-\(siteID)"`
`42`	`40`	`}`
`43`	`41`