Merge pull request #7769 from woocommerce/feature/7547-wrong-account-help-center-from-alert

Help button in fancy alert in "Wrong WordPress.com account error" screen

Author: selanthiraiyan

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/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/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