Merge branch 'trunk' into issue/7745-remove-jetpackconnectionerrorviewmodel

Author: itsmeichigo

Fakes/Fakes/Networking.generated.swift

@@ -188,6 +188,19 @@ extension DotcomError {
         .empty
     }
 }
+extension DotcomUser {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> DotcomUser {
+        .init(
+            id: .fake(),
+            username: .fake(),
+            email: .fake(),
+            displayName: .fake(),
+            avatar: .fake()
+        )
+    }
+}
 extension InboxAction {
     /// Returns a "ready to use" type filled with fake values.
     ///
@@ -220,6 +233,19 @@ extension InboxNote {
         )
     }
 }
+extension JetpackUser {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> JetpackUser {
+        .init(
+            isConnected: .fake(),
+            isPrimary: .fake(),
+            username: .fake(),
+            wpcomUser: .fake(),
+            gravatar: .fake()
+        )
+    }
+}
 extension Leaderboard {
     /// Returns a "ready to use" type filled with fake values.
     ///

Podfile

@@ -52,8 +52,8 @@ 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', '~> 3.1.0'
-   pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '6ddbf0aa1a2df30d1411bfe481a1119b79ea0bb5'
+  pod 'WordPressAuthenticator', '~> 3.2.0-beta.1'
+#   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 (3.2.0-beta.1):
+  - WordPressAuthenticator (3.2.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 (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `6ddbf0aa1a2df30d1411bfe481a1119b79ea0bb5`)
+  - WordPressAuthenticator (~> 3.2.0-beta.1)
   - WordPressKit (~> 4.49.0)
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.5)
@@ -102,6 +102,8 @@ DEPENDENCIES:
   - ZendeskSupportSDK (~> 5.0)
 
 SPEC REPOS:
+  https://github.com/wordpress-mobile/cocoapods-specs.git:
+    - WordPressAuthenticator
   trunk:
     - Alamofire
     - AppAuth
@@ -139,16 +141,6 @@ SPEC REPOS:
     - ZendeskSupportProvidersSDK
     - ZendeskSupportSDK
 
-EXTERNAL SOURCES:
-  WordPressAuthenticator:
-    :commit: 6ddbf0aa1a2df30d1411bfe481a1119b79ea0bb5
-    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
-
-CHECKOUT OPTIONS:
-  WordPressAuthenticator:
-    :commit: 6ddbf0aa1a2df30d1411bfe481a1119b79ea0bb5
-    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
-
 SPEC CHECKSUMS:
   Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
   AppAuth: 8fca6b5563a5baef2c04bee27538025e4ceb2add
@@ -171,7 +163,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: 434bafe7338f9e52a86ef13f7a84e4da7c4f620f
+  WordPressAuthenticator: 74f808d6cef4e261843f50d9378dc8bdb5ef1299
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -187,6 +179,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 2fcc754eb5ea18bdfafac83851133c65ec13a777
+PODFILE CHECKSUM: c8a3ba7544776c3fac1ba06550b2597fc5a03ba6
 
 COCOAPODS: 1.11.3

RELEASE-NOTES.txt

@@ -4,7 +4,9 @@
 -----
 - [**] Products: Now you can duplicate products from the More menu of the product detail screen. [https://github.com/woocommerce/woocommerce-ios/pull/7727]
 - [**] Login: Added Jetpack connection support from the Account Mismatch error screen. [https://github.com/woocommerce/woocommerce-ios/pull/7748]
-
+- [*] Orders: We are bringing back the ability to add/edit customer notes and addresses from the main order screen [https://github.com/woocommerce/woocommerce-ios/pull/7750]
+- [*] Help center: Added help center web page with FAQs for "Wrong WordPress.com account error" screen. [https://github.com/woocommerce/woocommerce-ios/pull/7747]
+- [*] Widgets: The Today's Stat Widget adds support for bigger fonts. [https://github.com/woocommerce/woocommerce-ios/pull/7752]
 
 10.4
 -----

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

@@ -58,6 +58,7 @@ final class ULAccountMismatchViewController: UIViewController {
         super.viewDidLoad()
 
         configureAccountHeader()
+        configureRightBarButtonItem()
         configureImageView()
         configureErrorMessage()
         configureExtraInfoButton()
@@ -85,6 +86,16 @@ final class ULAccountMismatchViewController: UIViewController {
 
 // MARK: - View configuration
 private extension ULAccountMismatchViewController {
+    func configureRightBarButtonItem() {
+        guard let rightBarButtonTitle = viewModel.rightBarButtonItemTitle else {
+            return
+        }
+        navigationItem.rightBarButtonItem = UIBarButtonItem(title: rightBarButtonTitle,
+                                                            style: .plain,
+                                                            target: self,
+                                                            action: #selector(didTapRightBarButtonItem))
+    }
+
     func configureAccountHeader() {
         configureGravatar()
         configureUserNameLabel()
@@ -231,6 +242,10 @@ private extension ULAccountMismatchViewController {
     func didTapLogOutButton() {
         viewModel.didTapLogOutButton(in: self)
     }
+
+    @objc func didTapRightBarButtonItem() {
+        viewModel.didTapRightBarButtonItem(in: self)
+    }
 }
 
 

WooCommerce/Classes/Authentication/Navigation Exceptions/ULAccountMismatchViewController.xib

@@ -144,12 +144,12 @@
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="10Z-y1-ZQ6" secondAttribute="trailing" id="3Fe-tr-bmb"/>
-                <constraint firstItem="jIt-xb-rrN" firstAttribute="top" relation="greaterThanOrEqual" secondItem="fnl-2z-Ty3" secondAttribute="top" id="4vu-ll-3S2"/>
                 <constraint firstAttribute="trailing" secondItem="jIt-xb-rrN" secondAttribute="trailing" constant="34" id="Z7E-hC-lbB"/>
                 <constraint firstItem="jIt-xb-rrN" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="34" id="jMe-jj-6Bt"/>
-                <constraint firstItem="10Z-y1-ZQ6" firstAttribute="top" secondItem="jIt-xb-rrN" secondAttribute="bottom" id="puI-lL-LT9"/>
                 <constraint firstItem="10Z-y1-ZQ6" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="r9Z-y5-j3W"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="10Z-y1-ZQ6" secondAttribute="bottom" id="rPP-rT-zVR"/>
+                <constraint firstItem="10Z-y1-ZQ6" firstAttribute="top" relation="greaterThanOrEqual" secondItem="jIt-xb-rrN" secondAttribute="bottom" id="yet-32-SBz"/>
+                <constraint firstItem="jIt-xb-rrN" firstAttribute="centerY" secondItem="fnl-2z-Ty3" secondAttribute="centerY" priority="250" constant="-20" id="z5R-69-jBg"/>
             </constraints>
             <point key="canvasLocation" x="137.68115942028987" y="86.383928571428569"/>
         </view>

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

@@ -65,4 +65,27 @@ protocol ULAccountMismatchViewModel {
     /// Executes action associated to a tap in the view controller auxiliary button
     /// - Parameter viewController: usually the view controller sending the tap
     func didTapAuxiliaryButton(in viewController: UIViewController?)
+
+    // MARK: Navigation bar - right bar button item
+    //
+
+    /// Title of the right bar button item in the navigation bar
+    ///  return `nil` if you don't want a `rightBarButtonItem`
+    ///
+    var rightBarButtonItemTitle: String? { get }
+
+    /// Executes action associated to a tap on the right bar button item in the navigation bar
+    /// - Parameter viewController: usually the view controller sending the tap
+    ///
+    func didTapRightBarButtonItem(in viewController: UIViewController?)
+}
+
+// MARK: Default implementation for optional right bar button item
+//
+extension ULAccountMismatchViewModel {
+    var rightBarButtonItemTitle: String? { nil }
+
+    func didTapRightBarButtonItem(in viewController: UIViewController?) {
+        // NO-OP
+    }
 }

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

@@ -16,6 +16,7 @@ final class WrongAccountErrorViewModel: ULAccountMismatchViewModel {
     private let storesManager: StoresManager
     private let analytics: Analytics
     private let jetpackSetupCompletionHandler: (_ email: String, _ xmlrpc: String) -> Void
+    private let authentication: Authentication
 
     private var storePickerCoordinator: StorePickerCoordinator?
     private var siteXMLRPC: String = ""
@@ -26,18 +27,22 @@ final class WrongAccountErrorViewModel: ULAccountMismatchViewModel {
     private let primaryButtonLoadingSubject = CurrentValueSubject<Bool, Never>(false)
     private let activityIndicatorLoadingSubject = CurrentValueSubject<Bool, Never>(false)
 
+    private var primaryButtonSubscription: AnyCancellable?
+
     init(siteURL: String?,
          showsConnectedStores: Bool,
          siteCredentials: WordPressOrgCredentials?,
          sessionManager: SessionManagerProtocol =  ServiceLocator.stores.sessionManager,
          storesManager: StoresManager = ServiceLocator.stores,
          analytics: Analytics = ServiceLocator.analytics,
+         authentication: Authentication = ServiceLocator.authenticationManager,
          onJetpackSetupCompletion: @escaping (String, String) -> Void) {
         self.siteURL = siteURL ?? Localization.yourSite
         self.showsConnectedStores = showsConnectedStores
         self.defaultAccount = sessionManager.defaultAccount
         self.storesManager = storesManager
         self.analytics = analytics
+        self.authentication = authentication
         self.jetpackSetupCompletionHandler = onJetpackSetupCompletion
 
         if let credentials = siteCredentials {
@@ -50,15 +55,15 @@ final class WrongAccountErrorViewModel: ULAccountMismatchViewModel {
 
     // MARK: - Data and configuration
     var userEmail: String {
-        return defaultAccount?.email ?? ""
+        defaultAccount?.email ?? ""
     }
 
     var userName: String {
-        return defaultAccount?.displayName ?? siteUsername
+        defaultAccount?.displayName ?? siteUsername
     }
 
     var signedInText: String {
-        return String.localizedStringWithFormat(Localization.signedInMessageFormat,
+        String.localizedStringWithFormat(Localization.signedInMessageFormat,
                                                 defaultAccount?.username ?? siteUsername)
     }
 
@@ -103,9 +108,19 @@ final class WrongAccountErrorViewModel: ULAccountMismatchViewModel {
         activityIndicatorLoadingSubject.eraseToAnyPublisher()
     }
 
+    // Configures `Help` button title
+    var rightBarButtonItemTitle: String? {
+        Localization.helpBarButtonItemTitle
+    }
+
     // MARK: - Actions
     func viewDidLoad(_ viewController: UIViewController?) {
-        analytics.track(event: .LoginJetpackConnection.jetpackConnectionErrorShown(selfHostedSite: true))
+        primaryButtonSubscription = primaryButtonHiddenSubject
+            .dropFirst() // ignores first element
+            .sink { [weak self] isHidden in
+                // if the button is hidden, the site is not self-hosted.
+                self?.analytics.track(event: .LoginJetpackConnection.jetpackConnectionErrorShown(selfHostedSite: !isHidden))
+            }
 
         // Fetches site info if we're not sure whether the site is self-hosted.
         if siteXMLRPC.isEmpty {
@@ -150,12 +165,19 @@ final class WrongAccountErrorViewModel: ULAccountMismatchViewModel {
         storesManager.deauthenticate()
         viewController?.navigationController?.popToRootViewController(animated: true)
     }
+
+    func didTapRightBarButtonItem(in viewController: UIViewController?) {
+        guard let viewController = viewController else {
+            return
+        }
+        authentication.presentSupport(from: viewController, screen: .wrongAccountError)
+    }
 }
 
 // MARK: - Private helpers
 private extension WrongAccountErrorViewModel {
     /// Fetches the site info and show the primary button if the site is self-hosted.
-    /// This will enables Jetpack connection support for self-hosted sites.
+    /// If the site is self-hosted, make the Connect Jetpack button visible.
     ///
     func fetchSiteInfo() {
         activityIndicatorLoadingSubject.send(true)
@@ -167,6 +189,8 @@ private extension WrongAccountErrorViewModel {
             case .success(let siteInfo):
                 if siteInfo.isWPCom == false {
                     self.primaryButtonHiddenSubject.send(false)
+                } else {
+                    self.primaryButtonHiddenSubject.send(true)
                 }
             case .failure(let error):
                 DDLogWarn("⚠️ Error fetching site info: \(error)")
@@ -344,6 +368,8 @@ private extension WrongAccountErrorViewModel {
             comment: "Error message displayed when failed to check for Jetpack connection."
         )
 
+        static let helpBarButtonItemTitle = NSLocalizedString("Help",
+                                                       comment: "Help button on account mismatch error screen.")
     }
 
     enum Strings {

WooCommerce/Classes/Model/CustomHelpCenterContent.swift

@@ -69,6 +69,10 @@ extension CustomHelpCenterContent {
         /// Store picker screen - `StorePickerViewController`
         ///
         case storePicker
+
+        /// Account mismatch / Wrong WordPress.com account screen - `WrongAccountErrorViewModel`
+        ///
+        case wrongAccountError
     }
 
     init(screen: Screen, flow: AuthenticatorAnalyticsTracker.Flow) {
@@ -80,6 +84,9 @@ extension CustomHelpCenterContent {
         case .storePicker:
             step = "site_list" // Matching Android `Step` value
             url = WooConstants.URLs.helpCenterForStorePicker.asURL()
+        case .wrongAccountError:
+            step = "wrong_wordpress_account" // Matching Android `Step` value
+            url = WooConstants.URLs.helpCenterForWrongAccountError.asURL()
         }
 
         trackingProperties = [

WooCommerce/Classes/System/WooConstants.swift

@@ -123,6 +123,10 @@ extension WooConstants {
         ///
         case helpCenterForJetpackRequiredError = "https://woocommerce.com/document/android-ios-apps-login-help-faq/#jetpack-required"
 
+        /// Help Center for "Wrong Account error" screen
+        ///
+        case helpCenterForWrongAccountError = "https://woocommerce.com/document/android-ios-apps-login-help-faq/#wrong-account"
+
         /// Help Center for "Store picker" screen
         ///
         case helpCenterForStorePicker = "https://woocommerce.com/document/android-ios-apps-login-help-faq/#pick-store-after-entering-password"