Merge branch 'trunk' into feat/6966-reset-stats-sync-ts-after-orders

* trunk: (232 commits)
  Update release notes.
  Use the Woo blue color instead of the native blue.
  Update copy
  Provide formatted updated time when dispatching an entry
  Update UI for the last refreshed label
  Mock an action response to prevent the test case sending HTTP request
  Build WooFoundation framework using app extension safe APIs
  Build Networking framework using app extension safe APIs
  Build Experiments framework using app extension safe APIs
  Fix typo
  Update analytics opened event to contains a list of widgets installed
  Update Charts to 4.1.0
  Tracks when the widget has been tapped
  Add event for when a widget is tapped
  Removes trailing whitespace
  Localize widget dsplay name
  Reloads the store info widget after reloading stats in the app
  Do not transform conversion rate to percentage twice
  Maker formatting helpers static
  Add clarification for CurrencySettings Codable implementation
  ...

Author: jaclync

CHANGELOG.md

@@ -2,6 +2,11 @@
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
 
+## 10.3
+
+More love for In-Person Payments and Analytics this time around. We fixed a bug which could prevent you from collecting payments in the app. Card reader connections are more stable. And we fixed an issue where your store's analytics are sometimes not updated. 
+
+
 ## 10.2
 Even though this release doesn’t have any new features, we still put a lot of love into it! You can now enable or disable the option to take card or cash payments on collection or delivery. We also added a new Help Center page that makes it easier for you to login to the app.
 

Experiments/Experiments.xcodeproj/project.pbxproj

@@ -463,6 +463,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 2B7FCE683D4058A7A16F7946 /* Pods-Experiments.debug.xcconfig */;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
@@ -489,6 +490,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = AF72D9DB7771E7A5105C88B0 /* Pods-Experiments.release.xcconfig */;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
@@ -611,6 +613,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 8CB554DFAAD3EF41D17099C4 /* Pods-Experiments.release-alpha.xcconfig */;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -7,8 +7,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         switch featureFlag {
         case .barcodeScanner:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .couponView:
-            return true
         case .productSKUInputScanner:
             return true
         case .inbox:
@@ -17,20 +15,10 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .splitViewInOrdersTab:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .couponDeletion:
-            return true
-        case .couponEditing:
-            return true
-        case .couponCreation:
-            return true
         case .updateOrderOptimistically:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .shippingLabelsOnboardingM1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .backgroundProductImageUpload:
-            return true
-        case .appleIDAccountDeletion:
-            return true
         case .newToWooCommerceLinkInLoginPrologue:
             return true
         case .loginPrologueOnboarding:

Experiments/Experiments/FeatureFlag.swift

@@ -14,10 +14,6 @@ public enum FeatureFlag: Int {
     ///
     case reviews
 
-    /// Displays the option to view coupons
-    ///
-    case couponView
-
     /// Barcode scanner for product SKU input
     ///
     case productSKUInputScanner
@@ -34,18 +30,6 @@ public enum FeatureFlag: Int {
     ///
     case splitViewInOrdersTab
 
-    /// Displays the option to delete coupons
-    ///
-    case couponDeletion
-
-    /// Displays the option to edit a coupon
-    ///
-    case couponEditing
-
-    /// Displays the option to create a coupon
-    ///
-    case couponCreation
-
     /// Enable optimistic updates for orders
     ///
     case updateOrderOptimistically
@@ -54,18 +38,10 @@ public enum FeatureFlag: Int {
     ///
     case shippingLabelsOnboardingM1
 
-    /// Enable image upload after leaving the product form
-    ///
-    case backgroundProductImageUpload
-
     /// Enable IPP reader manuals consolidation screen
     ///
     case consolidatedCardReaderManuals
 
-    /// Apple ID account deletion
-    ///
-    case appleIDAccountDeletion
-
     /// Showing a "New to WooCommerce" link in the login prologue screen
     ///
     case newToWooCommerceLinkInLoginPrologue

Networking/Networking.xcodeproj/project.pbxproj

@@ -0,0 +1,20 @@
+import Foundation
+
+/// Mapper: Jetpack Connection URL
+///
+struct JetpackConnectionURLMapper: Mapper {
+
+    /// (Attempts) to convert the response into a URL.
+    ///
+    func map(response: Data) throws -> URL {
+        guard let escapedString = String(data: response, encoding: .utf8) else {
+            throw JetpackConnectionRemote.ConnectionError.malformedURL
+        }
+        // The API returns an escaped string with double quotes, so we need to clean it up.
+        let urlString = escapedString
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+            .replacingOccurrences(of: "\"", with: "")
+            .replacingOccurrences(of: "\\", with: "")
+        return try urlString.asURL()
+    }
+}

Networking/Networking/Mapper/JetpackConnectionURLMapper.swift

@@ -0,0 +1,24 @@
+import Foundation
+
+/// Mapper: Jetpack user
+///
+struct JetpackUserMapper: Mapper {
+
+    /// (Attempts) to extract the updated `currentUser` field from a given JSON Encoded response.
+    ///
+    func map(response: Data) throws -> JetpackUser {
+        let decoder = JSONDecoder()
+        return try decoder.decode(JetpackConnectionData.self, from: response).currentUser
+    }
+}
+
+/// JetpackConnectionData Disposable Entity:
+/// This entity allows us to parse JetpackUser with JSONDecoder.
+///
+private struct JetpackConnectionData: Decodable {
+    let currentUser: JetpackUser
+
+    private enum CodingKeys: String, CodingKey {
+        case currentUser
+    }
+}

Networking/Networking/Mapper/JetpackUserMapper.swift

@@ -169,6 +169,30 @@ extension CouponReport {
     }
 }
 
+extension DotcomUser {
+    public func copy(
+        id: CopiableProp<Int64> = .copy,
+        username: CopiableProp<String> = .copy,
+        email: CopiableProp<String> = .copy,
+        displayName: CopiableProp<String> = .copy,
+        avatar: NullableCopiableProp<String> = .copy
+    ) -> DotcomUser {
+        let id = id ?? self.id
+        let username = username ?? self.username
+        let email = email ?? self.email
+        let displayName = displayName ?? self.displayName
+        let avatar = avatar ?? self.avatar
+
+        return DotcomUser(
+            id: id,
+            username: username,
+            email: email,
+            displayName: displayName,
+            avatar: avatar
+        )
+    }
+}
+
 extension InboxAction {
     public func copy(
         id: CopiableProp<Int64> = .copy,
@@ -235,6 +259,30 @@ extension InboxNote {
     }
 }
 
+extension JetpackUser {
+    public func copy(
+        isConnected: CopiableProp<Bool> = .copy,
+        isPrimary: CopiableProp<Bool> = .copy,
+        username: CopiableProp<String> = .copy,
+        wpcomUser: NullableCopiableProp<DotcomUser> = .copy,
+        gravatar: NullableCopiableProp<String> = .copy
+    ) -> JetpackUser {
+        let isConnected = isConnected ?? self.isConnected
+        let isPrimary = isPrimary ?? self.isPrimary
+        let username = username ?? self.username
+        let wpcomUser = wpcomUser ?? self.wpcomUser
+        let gravatar = gravatar ?? self.gravatar
+
+        return JetpackUser(
+            isConnected: isConnected,
+            isPrimary: isPrimary,
+            username: username,
+            wpcomUser: wpcomUser,
+            gravatar: gravatar
+        )
+    }
+}
+
 extension Media {
     public func copy(
         mediaID: CopiableProp<Int64> = .copy,

Networking/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -0,0 +1,43 @@
+import Codegen
+import Foundation
+
+/// Basic information of a WordPress.com user
+public struct DotcomUser: Decodable, GeneratedFakeable, GeneratedCopiable {
+
+    /// User ID in WP.com
+    public let id: Int64
+
+    /// Username in WP.com
+    public let username: String
+
+    /// Registered email address with WP.com
+    public let email: String
+
+    /// Display name in WP.com
+    public let displayName: String
+
+    /// Link to avatar used in WP.com
+    public let avatar: String?
+
+    /// Member-wise initializer
+    public init(id: Int64, username: String, email: String, displayName: String, avatar: String?) {
+        self.id = id
+        self.username = username
+        self.email = email
+        self.displayName = displayName
+        self.avatar = avatar
+    }
+}
+
+/// Defines all of the `WordPressComUser` CodingKeys.
+///
+private extension DotcomUser {
+
+    enum CodingKeys: String, CodingKey {
+        case id = "ID"
+        case username = "login"
+        case email
+        case displayName = "display_name"
+        case avatar
+    }
+}

Networking/Networking/Model/DotcomUser.swift

@@ -0,0 +1,52 @@
+import Codegen
+import Foundation
+
+/// Information of a WP.com user connected to a site's Jetpack if exists
+public struct JetpackUser: Decodable, GeneratedFakeable, GeneratedCopiable {
+
+    /// Whether the user has connected a WP.com account to the site's Jetpack
+    public let isConnected: Bool
+
+    /// Whether the user is the primary account connected to the site's Jetpack
+    public let isPrimary: Bool
+
+    /// WP.org username in the site.
+    public let username: String
+
+    /// The connected WP.com user if exists
+    public let wpcomUser: DotcomUser?
+
+    /// Gravatar link of the user
+    public let gravatar: String?
+
+    /// Member-wise initializer
+    public init(isConnected: Bool, isPrimary: Bool, username: String, wpcomUser: DotcomUser?, gravatar: String?) {
+        self.isConnected = isConnected
+        self.isPrimary = isPrimary
+        self.username = username
+        self.wpcomUser = wpcomUser
+        self.gravatar = gravatar
+    }
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        isConnected = try container.decode(Bool.self, forKey: .isConnected)
+        isPrimary = try container.decode(Bool.self, forKey: .isPrimary)
+        username = try container.decode(String.self, forKey: .username)
+        wpcomUser = try? container.decode(DotcomUser.self, forKey: .wpcomUser)
+        gravatar = try? container.decode(String.self, forKey: .gravatar)
+    }
+}
+
+/// Defines all of the `JetpackUser` CodingKeys.
+///
+private extension JetpackUser {
+
+    enum CodingKeys: String, CodingKey {
+        case isConnected
+        case isPrimary = "isMaster"
+        case username
+        case wpcomUser
+        case gravatar
+    }
+}