Merge pull request #7573 from woocommerce/feat/7547-enter-wpcom-email-help-page

Custom help content for "Enter WordPress.com email" screen

Author: selanthiraiyan

Podfile

@@ -42,7 +42,7 @@ target 'WooCommerce' do
   pod 'Gridicons', '~> 1.2.0'
 
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  pod 'WordPressAuthenticator', '~> 2.4.0-beta.1'
+  pod 'WordPressAuthenticator', '~> 2.4.0-beta.2'
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
   # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'

Podfile.lock

@@ -42,7 +42,7 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (2.4.0-beta.1):
+  - WordPressAuthenticator (2.4.0-beta.2):
     - Alamofire (~> 4.8)
     - CocoaLumberjack (~> 3.5)
     - GoogleSignIn (~> 6.0.1)
@@ -92,7 +92,7 @@ DEPENDENCIES:
   - Sourcery (~> 1.0.3)
   - StripeTerminal (~> 2.7)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 2.4.0-beta.1)
+  - WordPressAuthenticator (~> 2.4.0-beta.2)
   - WordPressKit (~> 4.49.0)
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.5)
@@ -163,7 +163,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: 2f32568a4af71b5b464f65706ac64040e2e7775b
+  WordPressAuthenticator: 7ce9bd63949c9684a07ff547f80fd40bbdd9d8b4
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 87786ee269bb59fb815d859df9cbe54bb00dac3d
+PODFILE CHECKSUM: 9f2faf915539665343e6d18bbab3710def723697
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -3,7 +3,7 @@
 10.1
 -----
 - [*] In-Person Payments: The onboarding notice on the In-Person Payments menu is correctly dismissed after multiple prompts are shown. [https://github.com/woocommerce/woocommerce-ios/pull/7543]
-- [*] Help center: Added custom help center web page with FAQs for "Enter Store Address" screen. [https://github.com/woocommerce/woocommerce-ios/pull/7553]
+- [*] Help center: Added custom help center web page with FAQs for "Enter Store Address" and "Enter WordPress.com email" screens. [https://github.com/woocommerce/woocommerce-ios/pull/7553, https://github.com/woocommerce/woocommerce-ios/pull/7573]
 - [*] In-Person Payments: The plugin selection is saved correctly after multiple onboarding prompts. [https://github.com/woocommerce/woocommerce-ios/pull/7544]
 - [*] In-Person Payments: A new prompt to enable `Pay in Person` for your store's checkout, to accept In-Person Payments for website orders [https://github.com/woocommerce/woocommerce-ios/issues/7474]
 

WooCommerce/Classes/Model/CustomHelpCenterContent.swift

@@ -27,8 +27,10 @@ extension CustomHelpCenterContent {
     ///
     init?(step: AuthenticatorAnalyticsTracker.Step, flow: AuthenticatorAnalyticsTracker.Flow) {
         switch step {
-        case .start where flow == .loginWithSiteAddress:
+        case .start where flow == .loginWithSiteAddress: // Enter Store Address screen
             url = WooConstants.URLs.helpCenterForEnterStoreAddress.asURL()
+        case .enterEmailAddress where flow == .loginWithSiteAddress: // Enter WordPress.com email screen from store address flow
+            url = WooConstants.URLs.helpCenterForWPCOMEmailFromSiteAddressFlow.asURL()
         default:
             return nil
         }

WooCommerce/Classes/System/WooConstants.swift

@@ -81,6 +81,11 @@ extension WooConstants {
         ///
         case helpCenterForEnterStoreAddress = "https://woocommerce.com/document/android-ios-apps-login-help-faq/#enter-store-address"
 
+        /// Help Center for "Enter WordPress.com email" screen
+        ///
+        // swiftlint:disable:next line_length
+        case helpCenterForWPCOMEmailFromSiteAddressFlow = "https://woocommerce.com/document/android-ios-apps-login-help-faq/#enter-wordpress-com-email-address-login-using-store-address-flow"
+
         /// URL used for Learn More button in Orders empty state.
         ///
         case blog = "https://woocommerce.com/blog/"

WooCommerce/WooCommerceTests/Model/CustomHelpCenterContentTests.swift

@@ -4,6 +4,8 @@ import XCTest
 
 final class CustomHelpCenterContentTests: XCTestCase {
 
+    // MARK: CustomHelpCenterContent.Key
+    //
     func test_step_key_has_correct_rawValue() {
         let sut = CustomHelpCenterContent.Key.step
         XCTAssertEqual(sut.rawValue, "source_step")
@@ -19,6 +21,17 @@ final class CustomHelpCenterContentTests: XCTestCase {
         XCTAssertEqual(sut.rawValue, "help_content_url")
     }
 
+    // MARK: Invalid `Step` and `Flow`
+    //
+    func test_init_using_invalid_step_and_flow_returns_nil() {
+        let step: AuthenticatorAnalyticsTracker.Step = .magicLinkRequested
+        let flow: AuthenticatorAnalyticsTracker.Flow = .prologue
+
+        XCTAssertNil(CustomHelpCenterContent(step: step, flow: flow))
+    }
+
+    // MARK: Enter Store Address screen
+    //
     func test_init_using_step_and_flow_returns_valid_instance_for_enter_store_address_screen() throws {
         // Given
         let step: AuthenticatorAnalyticsTracker.Step = .start
@@ -37,10 +50,23 @@ final class CustomHelpCenterContentTests: XCTestCase {
         XCTAssertEqual(sut.trackingProperties[CustomHelpCenterContent.Key.url.rawValue], helpContentURL.absoluteString)
     }
 
-    func test_init_using_invalid_step_and_flow_returns_nil() {
-        let step: AuthenticatorAnalyticsTracker.Step = .magicLinkRequested
-        let flow: AuthenticatorAnalyticsTracker.Flow = .prologue
+    // MARK: Enter WordPress.com email screen from store address flow
+    //
+    func test_init_using_step_and_flow_returns_valid_instance_for_enter_WPCOM_email_address_screen() throws {
+        // Given
+        let step: AuthenticatorAnalyticsTracker.Step = .enterEmailAddress
+        let flow: AuthenticatorAnalyticsTracker.Flow = .loginWithSiteAddress
+        let helpContentURL = WooConstants.URLs.helpCenterForWPCOMEmailFromSiteAddressFlow.asURL()
 
-        XCTAssertNil(CustomHelpCenterContent(step: step, flow: flow))
+        // When
+        let sut = try XCTUnwrap(CustomHelpCenterContent(step: step, flow: flow))
+
+        // Then
+        XCTAssertEqual(sut.url, helpContentURL)
+
+        // Test the `trackingProperties` dictionary values
+        XCTAssertEqual(sut.trackingProperties[CustomHelpCenterContent.Key.step.rawValue], step.rawValue)
+        XCTAssertEqual(sut.trackingProperties[CustomHelpCenterContent.Key.flow.rawValue], flow.rawValue)
+        XCTAssertEqual(sut.trackingProperties[CustomHelpCenterContent.Key.url.rawValue], helpContentURL.absoluteString)
     }
 }