Merge pull request #18457 from wordpress-mobile/fix/18388-wrong-tour-for-self-hosted

hassaanelgarem · web-flow · commit da25f3eeafa5 · 2022-04-27T15:46:25.000+02:00
Quick Start for Existing Users: Respect feature flag when logging into a self-hosted site
diff --git a/WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift b/WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift
@@ -335,7 +335,8 @@ extension WordPressAuthenticationManager: WordPressAuthenticatorDelegate {
         // If adding a self-hosted site, skip the Epilogue
         if let wporg = credentials.wporg,
            let blog = Blog.lookup(username: wporg.username, xmlrpc: wporg.xmlrpc, in: ContextManager.shared.mainContext) {
-            presentQuickStartPrompt(for: blog, in: navigationController, onDismiss: onDismissQuickStartPromptForExistingSiteHandler)
+            let onDismissHandler = FeatureFlag.quickStartForExistingUsers.enabled ? onDismissQuickStartPromptForExistingSiteHandler : onDismissQuickStartPromptForNewSiteHandler
+            presentQuickStartPrompt(for: blog, in: navigationController, onDismiss: onDismissHandler)
             return
         }
 

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,8 @@ extension WordPressAuthenticationManager: WordPressAuthenticatorDelegate {`
`335`	`335`	`// If adding a self-hosted site, skip the Epilogue`
`336`	`336`	`if let wporg = credentials.wporg,`
`337`	`337`	`let blog = Blog.lookup(username: wporg.username, xmlrpc: wporg.xmlrpc, in: ContextManager.shared.mainContext) {`
`338`		`- presentQuickStartPrompt(for: blog, in: navigationController, onDismiss: onDismissQuickStartPromptForExistingSiteHandler)`
	`338`	`+ let onDismissHandler = FeatureFlag.quickStartForExistingUsers.enabled ? onDismissQuickStartPromptForExistingSiteHandler : onDismissQuickStartPromptForNewSiteHandler`
	`339`	`+ presentQuickStartPrompt(for: blog, in: navigationController, onDismiss: onDismissHandler)`
`339`	`340`	`return`
`340`	`341`	`}`
`341`	`342`