Merge branch 'trunk' into feat/3157-search-sku

* trunk:
  Fix unit tests build failures.
  Simplify code using map.
  DI `LoggedOutAppSettingsProtocol` to `Authentication.initialize` to freeze the value for feature carousel visibility.
  Remove extra space from release notes.
  Update release notes.
  Pass in custom help center `Screen` value for the help button in `FancyAlertViewController`
  Create `CustomHelpCenterContent` for help screen when screen is non nil.
  Take `CustomHelpCenterContent.Screen` as optional param.
  Take `CustomHelpCenterContent` as optional param and use custom init to initialise `HelpAndSupportViewController`

Author: jaclync

RELEASE-NOTES.txt

@@ -4,7 +4,7 @@
 -----
 
 - [*] Fixed a rare crash when selecting a store in the store picker. [https://github.com/woocommerce/woocommerce-ios/pull/7765]
-- [*] Help center: Added help center web page with FAQs for "Not a WooCommerce site" error screen. [https://github.com/woocommerce/woocommerce-ios/pull/7767]
+- [*] Help center: Added help center web page with FAQs for "Not a WooCommerce site" and "Wrong WordPress.com account" error screens. [https://github.com/woocommerce/woocommerce-ios/pull/7767, https://github.com/woocommerce/woocommerce-ios/pull/7769]
 
 10.5
 -----

WooCommerce/Classes/Authentication/AuthenticationManager.swift

@@ -43,10 +43,12 @@ class AuthenticationManager: Authentication {
 
     /// Initializes the WordPress Authenticator.
     ///
-    func initialize() {
+    func initialize(loggedOutAppSettings: LoggedOutAppSettingsProtocol) {
         let isWPComMagicLinkPreferredToPassword = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.loginMagicLinkEmphasis)
         let isWPComMagicLinkShownAsSecondaryActionOnPasswordScreen = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.loginMagicLinkEmphasisM2)
         let continueWithSiteAddressFirst = ABTest.loginPrologueButtonOrder.variation == .control
+        let isFeatureCarouselShown = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.loginPrologueOnboarding) == false
+        || loggedOutAppSettings.hasFinishedOnboarding == true
         let configuration = WordPressAuthenticatorConfiguration(wpcomClientId: ApiCredentials.dotcomAppId,
                                                                 wpcomSecret: ApiCredentials.dotcomSecret,
                                                                 wpcomScheme: ApiCredentials.dotcomAuthScheme,
@@ -97,7 +99,8 @@ class AuthenticationManager: Authentication {
                                                 navBarImage: StyleManager.navBarImage,
                                                 navBarBadgeColor: .primary,
                                                 navBarBackgroundColor: .appBar,
-                                                prologueTopContainerChildViewController: LoginPrologueViewController(),
+                                                prologueTopContainerChildViewController:
+                                                    LoginPrologueViewController(isFeatureCarouselShown: isFeatureCarouselShown),
                                                 statusBarStyle: .default)
 
         let displayStrings = WordPressAuthenticatorDisplayStrings(emailLoginInstructions: AuthenticationConstants.emailInstructions,

WooCommerce/Classes/Authentication/Navigation Exceptions/WrongAccountErrorViewModel.swift

@@ -156,7 +156,7 @@ final class WrongAccountErrorViewModel: ULAccountMismatchViewModel {
     }
 
     func didTapAuxiliaryButton(in viewController: UIViewController?) {
-        let fancyAlert = FancyAlertViewController.makeNeedHelpFindingEmailAlertController()
+        let fancyAlert = FancyAlertViewController.makeNeedHelpFindingEmailAlertController(screen: .wrongAccountError)
         fancyAlert.modalPresentationStyle = .custom
         fancyAlert.transitioningDelegate = AppDelegate.shared.tabBarController
         viewController?.present(fancyAlert, animated: true)

WooCommerce/Classes/Authentication/Prologue/LoginPrologueViewController.swift

@@ -8,7 +8,8 @@ import Experiments
 ///
 final class LoginPrologueViewController: UIViewController {
     private let isNewToWooCommerceButtonShown: Bool
-    private let isOnboardingFeatureShown: Bool
+    /// The feature carousel is not shown right after finishing the onboarding.
+    private let isFeatureCarouselShown: Bool
     private let analytics: Analytics
 
     /// Background View, to be placed surrounding the bottom area.
@@ -36,10 +37,10 @@ final class LoginPrologueViewController: UIViewController {
     // MARK: - Overridden Methods
 
     init(analytics: Analytics = ServiceLocator.analytics,
-         loggedOutAppSettings: LoggedOutAppSettingsProtocol = LoggedOutAppSettings(userDefaults: .standard),
+         isFeatureCarouselShown: Bool,
          featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService) {
         isNewToWooCommerceButtonShown = featureFlagService.isFeatureFlagEnabled(.newToWooCommerceLinkInLoginPrologue)
-        isOnboardingFeatureShown = featureFlagService.isFeatureFlagEnabled(.loginPrologueOnboarding) && loggedOutAppSettings.hasFinishedOnboarding == false
+        self.isFeatureCarouselShown = isFeatureCarouselShown
         self.analytics = analytics
         super.init(nibName: nil, bundle: nil)
     }
@@ -91,8 +92,8 @@ private extension LoginPrologueViewController {
     /// This is contained in a child view so that this view's background doesn't scroll.
     ///
     func setupCarousel(isNewToWooCommerceButtonShown: Bool) {
-        let pageTypes: [LoginProloguePageType] = isOnboardingFeatureShown ? [.getStarted] : [.stats, .orderManagement, .products, .reviews]
-        let carousel = LoginProloguePageViewController(pageTypes: pageTypes, showsSubtitle: isOnboardingFeatureShown)
+        let pageTypes: [LoginProloguePageType] = isFeatureCarouselShown ? [.stats, .orderManagement, .products, .reviews]: [.getStarted]
+        let carousel = LoginProloguePageViewController(pageTypes: pageTypes, showsSubtitle: !isFeatureCarouselShown)
         carousel.view.translatesAutoresizingMaskIntoConstraints = false
 
         addChild(carousel)

WooCommerce/Classes/ServiceLocator/Authentication.swift

@@ -28,7 +28,7 @@ protocol Authentication {
 
     /// Initializes the WordPress Authenticator.
     ///
-    func initialize()
+    func initialize(loggedOutAppSettings: LoggedOutAppSettingsProtocol)
 
     /// Injects `loggedOutAppSettings`
     ///

WooCommerce/Classes/ViewRelated/AppCoordinator.swift

@@ -155,7 +155,7 @@ private extension AppCoordinator {
 
     /// Configures the WPAuthenticator for usage in both logged-in and logged-out states.
     func configureAuthenticator() {
-        authenticationManager.initialize()
+        authenticationManager.initialize(loggedOutAppSettings: loggedOutAppSettings)
         appleIDCredentialChecker.observeLoggedInStateForAppleIDObservations()
     }
 

WooCommerce/Classes/ViewRelated/Fancy Alerts/FancyAlertViewController+UnifiedLogin.swift

@@ -1,5 +1,6 @@
 import WordPressUI
 import SafariServices
+import WordPressAuthenticator
 
 extension FancyAlertViewController {
     static func makeWhatIsJetpackAlertController(analytics: Analytics) -> FancyAlertViewController {
@@ -21,9 +22,10 @@ extension FancyAlertViewController {
         return controller
     }
 
-    static func makeNeedHelpFindingEmailAlertController() -> FancyAlertViewController {
+    static func makeNeedHelpFindingEmailAlertController(screen: CustomHelpCenterContent.Screen? = nil) -> FancyAlertViewController {
         let dismissButton = makeDismissButtonConfig()
-        let moreHelpButton = makeNeedMoreHelpButton()
+        let customHelpCenterContent = screen.map { CustomHelpCenterContent(screen: $0, flow: AuthenticatorAnalyticsTracker.shared.state.lastFlow) }
+        let moreHelpButton = makeNeedMoreHelpButton(customHelpCenterContent: customHelpCenterContent)
         let config = FancyAlertViewController.Config(titleText: Localization.whatEmailDoIUse,
                                                      bodyText: Localization.whatEmailDoIUseLongDescription,
                                                      headerImage: nil,
@@ -108,14 +110,20 @@ private extension FancyAlertViewController {
         }
     }
 
-    static func makeNeedMoreHelpButton() -> FancyAlertViewController.Config.ButtonConfig {
+    static func makeNeedMoreHelpButton(customHelpCenterContent: CustomHelpCenterContent? = nil) -> FancyAlertViewController.Config.ButtonConfig {
         return FancyAlertViewController.Config.ButtonConfig(Localization.needMoreHelp) { controller, _ in
             let identifier = HelpAndSupportViewController.classNameWithoutNamespaces
-            guard let supportViewController = UIStoryboard
-                    .dashboard
-                    .instantiateViewController(withIdentifier: identifier) as? HelpAndSupportViewController else {
-                return
-            }
+            let supportViewController = UIStoryboard.dashboard.instantiateViewController(identifier: identifier,
+                                                                                         creator: { coder -> HelpAndSupportViewController? in
+                guard let customHelpCenterContent = customHelpCenterContent else {
+                    /// Returning nil as we don't need to customise the HelpAndSupportViewController
+                    /// In this case `instantiateViewController` method will use the default `HelpAndSupportViewController` created from storyboard.
+                    ///
+                    return nil
+                }
+
+                return HelpAndSupportViewController(customHelpCenterContent: customHelpCenterContent, coder: coder)
+            })
 
             supportViewController.displaysDismissAction = true
 

WooCommerce/WooCommerceTests/AppCoordinatorTests.swift

@@ -23,7 +23,7 @@ final class AppCoordinatorTests: XCTestCase {
         stores = MockStoresManager(sessionManager: sessionManager)
         storageManager = MockStorageManager()
         authenticationManager = AuthenticationManager()
-        authenticationManager.initialize()
+        authenticationManager.initialize(loggedOutAppSettings: MockLoggedOutAppSettings())
     }
 
     override func tearDown() {

WooCommerce/WooCommerceTests/Mocks/MockAuthentication.swift

@@ -23,7 +23,7 @@ final class MockAuthentication: Authentication {
         UIViewController()
     }
 
-    func initialize() {
+    func initialize(loggedOutAppSettings: LoggedOutAppSettingsProtocol) {
         // no-op
     }
 

WooCommerce/WooCommerceTests/ViewRelated/CardPresentPayments/CardPresentPaymentsModalViewControllerTests.swift

@@ -5,7 +5,7 @@ final class CardPresentPaymentsModalViewControllerTests: XCTestCase {
     override func setUp() {
         super.setUp()
         // The NUX buttons require WordPressAuthenticator to be initialized
-        AuthenticationManager().initialize()
+        AuthenticationManager().initialize(loggedOutAppSettings: MockLoggedOutAppSettings())
     }
 
     func test_viewcontroller_presents_top_title_provided_by_viewmodel() throws {