Merge branch 'trunk' into merge/10.4-final-to-trunk

Author: spencertransier

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -33,6 +33,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .promptToEnableCodInIppOnboarding:
             return true
+        case .orderCreationSearchCustomers:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -69,4 +69,8 @@ public enum FeatureFlag: Int {
     /// Whether to include the Cash on Delivery enable step in In-Person Payment onboarding
     ///
     case promptToEnableCodInIppOnboarding
+
+    /// Enables the Search Customers functionality in the Order Creation screen
+    ///
+    case orderCreationSearchCustomers
 }

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,7 +52,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', '~> 3.1.0'
+  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.1.0):
+  - 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 (~> 3.1.0)
+  - WordPressAuthenticator (~> 3.2.0-beta.1)
   - 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: 6e20b44d9743aa26e5089c16fbec35cd55748642
+  WordPressAuthenticator: 74f808d6cef4e261843f50d9378dc8bdb5ef1299
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: a49b41520538bf9a2976016136166162186d972a
+PODFILE CHECKSUM: c8a3ba7544776c3fac1ba06550b2597fc5a03ba6
 
 COCOAPODS: 1.11.3

RELEASE-NOTES.txt

@@ -2,7 +2,11 @@
 
 10.5
 -----
-
+- [**] 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/Analytics/WooAnalyticsStat.swift

@@ -407,6 +407,10 @@ public enum WooAnalyticsStat: String {
     case addProductSuccess = "add_product_success"
     case addProductFailed = "add_product_failed"
 
+    // MARK: Duplicate Product events
+    case duplicateProductSuccess = "duplicate_product_success"
+    case duplicateProductFailed = "duplicate_product_failed"
+
     // MARK: Edit Product Events
     //
     case productDetailLoaded = "product_detail_loaded"
@@ -512,6 +516,7 @@ public enum WooAnalyticsStat: String {
     // MARK: Product Settings
     //
     case productDetailViewSettingsButtonTapped = "product_detail_view_settings_button_tapped"
+    case productDetailDuplicateButtonTapped = "product_detail_duplicate_button_tapped"
     case productSettingsDoneButtonTapped = "product_settings_done_button_tapped"
     case productSettingsStatusTapped = "product_settings_status_tapped"
     case productSettingsVisibilityTapped = "product_settings_visibility_tapped"

WooCommerce/Classes/Authentication/AuthenticationManager.swift

@@ -195,14 +195,8 @@ class AuthenticationManager: Authentication {
 
         /// Account mismatched case
         guard matcher.match(originalURL: siteURL) else {
-            /// Account mismatch experiment iteration 1: show jetpack connection error
-            /// if the error happens during site credential login.
-            if let credentials = credentials?.wporg {
-                DDLogWarn("⚠️ Present Jetpack connection error for site: \(String(describing: siteURL))")
-                return jetpackConnectionUI(for: siteURL, with: credentials, in: navigationController)
-            }
             DDLogWarn("⚠️ Present account mismatch error for site: \(String(describing: siteURL))")
-            return accountMismatchUI(for: siteURL, with: matcher)
+            return accountMismatchUI(for: siteURL, siteCredentials: credentials?.wporg, with: matcher, in: navigationController)
         }
 
         /// No Woo found
@@ -618,30 +612,29 @@ private extension AuthenticationManager {
         return ULErrorViewController(viewModel: viewModel)
     }
 
-    /// The error screen to be displayed when the user tries to enter as site
-    /// whose Jetpack is not connected to their WP.com account.
-    /// This screen is currently displayed when user logged in with site credentials.
-    ///
-    func jetpackConnectionUI(for siteURL: String,
-                             with credentials: WordPressOrgCredentials,
-                             in navigationController: UINavigationController) -> UIViewController {
-        let viewModel = JetpackConnectionErrorViewModel(siteURL: siteURL, credentials: credentials, onJetpackSetupCompletion: { email in
-            return WordPressAuthenticator.showVerifyEmailForWPCom(
+    /// The error screen to be displayed when the user tries to enter a site
+    /// whose Jetpack is not associated with their account.
+    /// - Parameters:
+    ///     - siteURL: URL for the site to log in to.
+    ///     - siteCredentials: WP.org credentials used to log in to the site if available.
+    ///     - matcher: the matcher used to check for matching sites.
+    ///     - navigationController: the controller that will present the view.
+    ///
+    func accountMismatchUI(for siteURL: String,
+                           siteCredentials: WordPressOrgCredentials?,
+                           with matcher: ULAccountMatcher,
+                           in navigationController: UINavigationController) -> UIViewController {
+        let viewModel = WrongAccountErrorViewModel(siteURL: siteURL,
+                                                   showsConnectedStores: matcher.hasConnectedStores,
+                                                   siteCredentials: siteCredentials,
+                                                   onJetpackSetupCompletion: { email, xmlrpc in
+            WordPressAuthenticator.showVerifyEmailForWPCom(
                 from: navigationController,
-                xmlrpc: credentials.xmlrpc,
+                xmlrpc: xmlrpc,
                 connectedEmail: email,
                 siteURL: siteURL
             )
         })
-        return ULErrorViewController(viewModel: viewModel)
-    }
-
-    /// The error screen to be displayed when the user tries to enter a site
-    /// whose Jetpack is not associated with their account.
-    /// This screen is currently displayed when user logged in with a WP.com account.
-    ///
-    func accountMismatchUI(for siteURL: String, with matcher: ULAccountMatcher) -> UIViewController {
-        let viewModel = WrongAccountErrorViewModel(siteURL: siteURL, showsConnectedStores: matcher.hasConnectedStores)
         let mismatchAccountUI = ULAccountMismatchViewController(viewModel: viewModel)
         return mismatchAccountUI
     }
@@ -682,15 +675,15 @@ private extension AuthenticationManager {
 
         guard !site.isWPCom else {
             // The site doesn't belong to the current account since it was not included in the site picker.
-            return accountMismatchUI(for: site.url, with: matcher)
+            return accountMismatchUI(for: site.url, siteCredentials: nil, with: matcher, in: navigationController)
         }
 
         /// Jetpack is required. Present an error if we don't detect a valid installation.
-        guard site.isJetpackConnected == true else {
+        guard site.isJetpackConnected else {
             return jetpackErrorUI(for: site.url, with: matcher, in: navigationController)
         }
 
-        return accountMismatchUI(for: site.url, with: matcher)
+        return accountMismatchUI(for: site.url, siteCredentials: nil, with: matcher, in: navigationController)
     }
 }
 

WooCommerce/Classes/Authentication/Epilogue/Authenticator.swift

@@ -0,0 +1,28 @@
+import Foundation
+import WordPressAuthenticator
+
+/// An interface used for mocking `WordPressAuthenticator` in unit tests.
+/// It's not complete for now since this is used for testing `WrongAccountErrorViewModel` only at the time of writing.
+/// Update this further if necessary.
+///
+protocol Authenticator {
+    /// Used to present the site credential login flow directly from the delegate.
+    ///
+    /// - Parameters:
+    ///     - presenter: The view controller that presents the site credential login flow.
+    ///     - siteURL: The URL of the site to log in to.
+    ///     - onCompletion: The closure to be trigged when the login succeeds with the input credentials.
+    ///
+    static func showSiteCredentialLogin(from presenter: UIViewController, siteURL: String, onCompletion: @escaping (WordPressOrgCredentials) -> Void)
+
+    /// A helper method to fetch site info for a given URL.
+    /// - Parameters:
+    ///     - siteURL: The URL of the site to fetch information for.
+    ///     - onCompletion: The closure to be triggered when fetching site info is done.
+    ///
+    static func fetchSiteInfo(for siteURL: String, onCompletion: @escaping (Result<WordPressComSiteInfo, Error>) -> Void)
+}
+
+/// Makes `WordPressAuthenticator` conform to the interface for mocking.
+///
+extension WordPressAuthenticator: Authenticator {}