Merge branch 'develop' into issue/5361-JCP-empty-store-visit-stats

Author: itsmeichigo

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -27,6 +27,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .jetpackConnectionPackageSupport:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .orderCreation:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -53,4 +53,8 @@ public enum FeatureFlag: Int {
     /// Allows sites with plugins that include Jetpack Connection Package and without Jetpack-the-plugin to connect to the app
     ///
     case jetpackConnectionPackageSupport
+
+    /// Allows new orders to be manually created
+    ///
+    case orderCreation
 }

Hardware/Hardware/CardReader/CardReaderConfigProvider.swift

@@ -10,7 +10,7 @@ public protocol ReaderLocationProvider {
     func fetchDefaultLocationID(completion: @escaping(String?, Error?) -> Void)
 }
 
-public protocol CardReaderConfigProvider: ReaderLocationProvider {
+public protocol CardReaderConfigProvider: ReaderLocationProvider, ReaderTokenProvider {
     func fetchToken(completion: @escaping(String?, Error?) -> Void)
     func fetchDefaultLocationID(completion: @escaping(String?, Error?) -> Void)
 }

Hardware/Hardware/CardReader/StripeCardReader/DefaultConnectionTokenProvider.swift

@@ -4,9 +4,9 @@ import StripeTerminal
 /// uses the networking adapter provided by clients of Hardware
 /// to fetch a connection token
 final class DefaultConnectionTokenProvider: ConnectionTokenProvider {
-    private let provider: CardReaderConfigProvider
+    private let provider: ReaderTokenProvider
 
-    init(provider: CardReaderConfigProvider) {
+    init(provider: ReaderTokenProvider) {
         self.provider = provider
     }
 

Hardware/HardwareTests/AirPrintReceipt/ReceiptRendererTest.swift

@@ -40,7 +40,7 @@ private extension ReceiptRendererTest {
                 amount: 1,
                 formattedAmount: "1",
                 currency: "USD",
-                date: .init(),
+                date: .init(timeIntervalSince1970: 1636970486),
                 storeName: "Test Store",
                 cardDetails: .init(
                     last4: "1234",

RELEASE-NOTES.txt

@@ -1,5 +1,10 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+8.1
+-----
+- [internal] Migrated Settings screen to MVVM [https://github.com/woocommerce/woocommerce-ios/pull/5393]
+
+
 8.0
 -----
 - [*] Product List: Add support for product filtering by category. [https://github.com/woocommerce/woocommerce-ios/pull/5388]

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

@@ -10,13 +10,15 @@ extension GeneralAppSettings {
         feedbacks: CopiableProp<[FeedbackType: FeedbackSettings]> = .copy,
         isViewAddOnsSwitchEnabled: CopiableProp<Bool> = .copy,
         isSimplePaymentsSwitchEnabled: CopiableProp<Bool> = .copy,
+        isOrderCreationSwitchEnabled: CopiableProp<Bool> = .copy,
         knownCardReaders: CopiableProp<[String]> = .copy,
         lastEligibilityErrorInfo: NullableCopiableProp<EligibilityErrorInfo> = .copy
     ) -> GeneralAppSettings {
         let installationDate = installationDate ?? self.installationDate
         let feedbacks = feedbacks ?? self.feedbacks
         let isViewAddOnsSwitchEnabled = isViewAddOnsSwitchEnabled ?? self.isViewAddOnsSwitchEnabled
         let isSimplePaymentsSwitchEnabled = isSimplePaymentsSwitchEnabled ?? self.isSimplePaymentsSwitchEnabled
+        let isOrderCreationSwitchEnabled = isOrderCreationSwitchEnabled ?? self.isOrderCreationSwitchEnabled
         let knownCardReaders = knownCardReaders ?? self.knownCardReaders
         let lastEligibilityErrorInfo = lastEligibilityErrorInfo ?? self.lastEligibilityErrorInfo
 
@@ -25,6 +27,7 @@ extension GeneralAppSettings {
             feedbacks: feedbacks,
             isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
             isSimplePaymentsSwitchEnabled: isSimplePaymentsSwitchEnabled,
+            isOrderCreationSwitchEnabled: isOrderCreationSwitchEnabled,
             knownCardReaders: knownCardReaders,
             lastEligibilityErrorInfo: lastEligibilityErrorInfo
         )

Storage/Storage/Model/GeneralAppSettings.swift

@@ -28,6 +28,10 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
     ///
     public let isSimplePaymentsSwitchEnabled: Bool
 
+    /// The state(`true` or `false`) for the Order Creation feature switch.
+    ///
+    public let isOrderCreationSwitchEnabled: Bool
+
     /// A list (possibly empty) of known card reader IDs - i.e. IDs of card readers that should be reconnected to automatically
     /// e.g. ["CHB204909005931"]
     ///
@@ -41,12 +45,14 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
                 feedbacks: [FeedbackType: FeedbackSettings],
                 isViewAddOnsSwitchEnabled: Bool,
                 isSimplePaymentsSwitchEnabled: Bool,
+                isOrderCreationSwitchEnabled: Bool,
                 knownCardReaders: [String],
                 lastEligibilityErrorInfo: EligibilityErrorInfo? = nil) {
         self.installationDate = installationDate
         self.feedbacks = feedbacks
         self.isViewAddOnsSwitchEnabled = isViewAddOnsSwitchEnabled
         self.isSimplePaymentsSwitchEnabled = isSimplePaymentsSwitchEnabled
+        self.isOrderCreationSwitchEnabled = isOrderCreationSwitchEnabled
         self.knownCardReaders = knownCardReaders
         self.lastEligibilityErrorInfo = lastEligibilityErrorInfo
     }
@@ -73,6 +79,7 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
             feedbacks: updatedFeedbacks,
             isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
             isSimplePaymentsSwitchEnabled: isSimplePaymentsSwitchEnabled,
+            isOrderCreationSwitchEnabled: isOrderCreationSwitchEnabled,
             knownCardReaders: knownCardReaders,
             lastEligibilityErrorInfo: lastEligibilityErrorInfo
         )
@@ -90,6 +97,7 @@ extension GeneralAppSettings {
         self.feedbacks = try container.decodeIfPresent([FeedbackType: FeedbackSettings].self, forKey: .feedbacks) ?? [:]
         self.isViewAddOnsSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isViewAddOnsSwitchEnabled) ?? false
         self.isSimplePaymentsSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isSimplePaymentsSwitchEnabled) ?? false
+        self.isOrderCreationSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isOrderCreationSwitchEnabled) ?? false
         self.knownCardReaders = try container.decodeIfPresent([String].self, forKey: .knownCardReaders) ?? []
         self.lastEligibilityErrorInfo = try container.decodeIfPresent(EligibilityErrorInfo.self, forKey: .lastEligibilityErrorInfo)
 

Storage/Storage/Protocols/StorageManagerType.swift

@@ -16,7 +16,7 @@ public protocol StorageManagerType {
     ///
     var viewStorage: StorageType { get }
 
-    /// Returns the `Storage` associated to the main thread.
+    /// Returns a shared derived storage instance dedicated for write operations.
     ///
     var writerDerivedStorage: StorageType { get }
 

Storage/StorageTests/Model/AppSettings/GeneralAppSettingsTests.swift

@@ -10,6 +10,7 @@ class GeneralAppSettingsTests: XCTestCase {
                                           feedbacks: [.general: feedback],
                                           isViewAddOnsSwitchEnabled: false,
                                           isSimplePaymentsSwitchEnabled: false,
+                                          isOrderCreationSwitchEnabled: false,
                                           knownCardReaders: [])
 
         // When
@@ -25,6 +26,7 @@ class GeneralAppSettingsTests: XCTestCase {
                                           feedbacks: [:],
                                           isViewAddOnsSwitchEnabled: false,
                                           isSimplePaymentsSwitchEnabled: false,
+                                          isOrderCreationSwitchEnabled: false,
                                           knownCardReaders: [])
 
         // When
@@ -42,6 +44,7 @@ class GeneralAppSettingsTests: XCTestCase {
             feedbacks: [.general: existingFeedback],
             isViewAddOnsSwitchEnabled: false,
             isSimplePaymentsSwitchEnabled: false,
+            isOrderCreationSwitchEnabled: false,
             knownCardReaders: []
         )
 
@@ -59,6 +62,7 @@ class GeneralAppSettingsTests: XCTestCase {
                                           feedbacks: [:],
                                           isViewAddOnsSwitchEnabled: false,
                                           isSimplePaymentsSwitchEnabled: false,
+                                          isOrderCreationSwitchEnabled: false,
                                           knownCardReaders: [])
 
         // When
@@ -79,6 +83,7 @@ class GeneralAppSettingsTests: XCTestCase {
                                                   feedbacks: feedbackSettings,
                                                   isViewAddOnsSwitchEnabled: true,
                                                   isSimplePaymentsSwitchEnabled: true,
+                                                  isOrderCreationSwitchEnabled: true,
                                                   knownCardReaders: readers,
                                                   lastEligibilityErrorInfo: eligibilityInfo)
 
@@ -97,5 +102,6 @@ class GeneralAppSettingsTests: XCTestCase {
         assertEqual(newSettings.lastEligibilityErrorInfo, eligibilityInfo)
         assertEqual(newSettings.isViewAddOnsSwitchEnabled, false)
         assertEqual(newSettings.isSimplePaymentsSwitchEnabled, true)
+        assertEqual(newSettings.isOrderCreationSwitchEnabled, true)
     }
 }