Merge Trunk

Author: Ecarrion

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -34,7 +34,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .stripeExtensionInPersonPayments:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .myStoreTabUpdates:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
         case .couponManagement:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .productSKUInputScanner:

Fakes/Fakes/Networking.generated.swift

@@ -187,6 +187,38 @@ extension DotcomError {
         .empty
     }
 }
+extension InboxAction {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> InboxAction {
+        .init(
+            id: .fake(),
+            name: .fake(),
+            label: .fake(),
+            status: .fake(),
+            url: .fake()
+        )
+    }
+}
+extension InboxNote {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> InboxNote {
+        .init(
+            siteID: .fake(),
+            id: .fake(),
+            name: .fake(),
+            type: .fake(),
+            status: .fake(),
+            actions: .fake(),
+            title: .fake(),
+            content: .fake(),
+            isDeleted: .fake(),
+            isRead: .fake(),
+            dateCreated: .fake()
+        )
+    }
+}
 extension Leaderboard {
     /// Returns a "ready to use" type filled with fake values.
     ///

Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift

@@ -295,7 +295,6 @@ extension StripeCardReaderService: CardReaderService {
         let batteryLevel = reader.batteryLevel?.doubleValue
 
         return Future { [weak self] promise in
-
             guard let self = self else {
                 promise(.failure(CardReaderServiceError.connection()))
                 return

Hardware/Hardware/CardReader/StripeCardReader/UnderlyingError+Stripe.swift

@@ -36,6 +36,8 @@ extension UnderlyingError {
             self = .bluetoothScanTimedOut
         case ErrorCode.Code.bluetoothLowEnergyUnsupported.rawValue:
             self = .bluetoothLowEnergyUnsupported
+        case ErrorCode.Code.bluetoothConnectionFailedBatteryCriticallyLow.rawValue:
+            self = .bluetoothConnectionFailedBatteryCriticallyLow
         case ErrorCode.Code.readerSoftwareUpdateFailedBatteryLow.rawValue:
             self = .readerSoftwareUpdateFailedBatteryLow
         case ErrorCode.Code.readerSoftwareUpdateFailedInterrupted.rawValue:

Hardware/Hardware/CardReader/UnderlyingError.swift

@@ -48,6 +48,9 @@ public enum UnderlyingError: Error, Equatable {
     /// Bluetooth Low Energy is unsupported on this iOS device. Use a different iOS device that supports BLE (also known as Bluetooth 4.0)
     case bluetoothLowEnergyUnsupported
 
+    /// The reader has a critically low battery and cannot connect to the iOS device. Charge the reader before trying again.
+    case bluetoothConnectionFailedBatteryCriticallyLow
+
     /// Updating the reader software failed because the reader’s battery is too low. Charge the reader before trying again.
     case readerSoftwareUpdateFailedBatteryLow
 
@@ -224,6 +227,9 @@ extension UnderlyingError: LocalizedError {
         case .bluetoothLowEnergyUnsupported:
             return NSLocalizedString("Unable to search for card readers - Bluetooth Low Energy is not supported on this device - please use a different device",
                                      comment: "Error message when Bluetooth Low Energy is not supported on the user device.")
+        case .bluetoothConnectionFailedBatteryCriticallyLow:
+            return NSLocalizedString("Unable to connect to reader - the reader has a critically low battery - charge the reader and try again.",
+                                     comment: "Error message the card reader battery level is too low to connect to the phone or tablet.")
         case .readerSoftwareUpdateFailedBatteryLow:
             return NSLocalizedString("Unable to update card reader software - the reader battery is too low",
                                      comment: "Error message when the card reader battery level is too low to safely perform a software update.")

Hardware/HardwareTests/ErrorCodesTests.swift

@@ -70,6 +70,10 @@ final class CardReaderServiceErrorTests: XCTestCase {
         XCTAssertEqual(.readerSoftwareUpdateFailedInterrupted, domainError(stripeCode: 2660))
     }
 
+    func test_stripe_unable_to_connect_to_reader_the_reader_has_a_critically_low_battery() {
+        XCTAssertEqual(.bluetoothConnectionFailedBatteryCriticallyLow, domainError(stripeCode: 2680))
+    }
+
     func test_stripe_software_update_failed_maps_to_expected_error() {
         XCTAssertEqual(.readerSoftwareUpdateFailed, domainError(stripeCode: 3800))
     }

Networking/Networking.xcodeproj/project.pbxproj

@@ -276,6 +276,11 @@
 		45B204B82489095100FE6526 /* ProductCategoryMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B204B72489095100FE6526 /* ProductCategoryMapper.swift */; };
 		45B204BA24890A8C00FE6526 /* ProductCategoryMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B204B924890A8C00FE6526 /* ProductCategoryMapperTests.swift */; };
 		45B204BC24890B1200FE6526 /* category.json in Resources */ = {isa = PBXBuildFile; fileRef = 45B204BB24890B1200FE6526 /* category.json */; };
+		45CCFCE227A2C9BF0012E8CB /* InboxNote.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45CCFCE127A2C9BF0012E8CB /* InboxNote.swift */; };
+		45CCFCE427A2DC270012E8CB /* InboxAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45CCFCE327A2DC270012E8CB /* InboxAction.swift */; };
+		45CCFCE627A2E3710012E8CB /* InboxNoteListMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45CCFCE527A2E3710012E8CB /* InboxNoteListMapper.swift */; };
+		45CCFCE827A2E5020012E8CB /* InboxNoteListMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45CCFCE727A2E5020012E8CB /* InboxNoteListMapperTests.swift */; };
+		45CCFCEA27A2E59B0012E8CB /* inbox-note-list.json in Resources */ = {isa = PBXBuildFile; fileRef = 45CCFCE927A2E59B0012E8CB /* inbox-note-list.json */; };
 		45CDAFAB2434CA9300F83C22 /* ProductCatalogVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45CDAFAA2434CA9300F83C22 /* ProductCatalogVisibility.swift */; };
 		45D1CF4923BACA6500945A36 /* ProductTaxStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45D1CF4823BACA6500945A36 /* ProductTaxStatus.swift */; };
 		45D685F823D0BC78005F87D0 /* ProductSkuMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45D685F723D0BC78005F87D0 /* ProductSkuMapper.swift */; };
@@ -922,6 +927,11 @@
 		45B204B72489095100FE6526 /* ProductCategoryMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductCategoryMapper.swift; sourceTree = "<group>"; };
 		45B204B924890A8C00FE6526 /* ProductCategoryMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductCategoryMapperTests.swift; sourceTree = "<group>"; };
 		45B204BB24890B1200FE6526 /* category.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = category.json; sourceTree = "<group>"; };
+		45CCFCE127A2C9BF0012E8CB /* InboxNote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InboxNote.swift; sourceTree = "<group>"; };
+		45CCFCE327A2DC270012E8CB /* InboxAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InboxAction.swift; sourceTree = "<group>"; };
+		45CCFCE527A2E3710012E8CB /* InboxNoteListMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InboxNoteListMapper.swift; sourceTree = "<group>"; };
+		45CCFCE727A2E5020012E8CB /* InboxNoteListMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InboxNoteListMapperTests.swift; sourceTree = "<group>"; };
+		45CCFCE927A2E59B0012E8CB /* inbox-note-list.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "inbox-note-list.json"; sourceTree = "<group>"; };
 		45CDAFAA2434CA9300F83C22 /* ProductCatalogVisibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductCatalogVisibility.swift; sourceTree = "<group>"; };
 		45D1CF4823BACA6500945A36 /* ProductTaxStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductTaxStatus.swift; sourceTree = "<group>"; };
 		45D685F723D0BC78005F87D0 /* ProductSkuMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductSkuMapper.swift; sourceTree = "<group>"; };
@@ -1688,6 +1698,8 @@
 				45150A9B2683417A006922EA /* StateOfACountry.swift */,
 				B53EF53721813806003E146F /* DotcomError.swift */,
 				24F98C552502EA4800F49B68 /* FeatureFlag.swift */,
+				45CCFCE127A2C9BF0012E8CB /* InboxNote.swift */,
+				45CCFCE327A2DC270012E8CB /* InboxAction.swift */,
 				B5A2417C217F9ECC00595DEF /* MetaContainer.swift */,
 				B59325C6217E22FC000B0E8E /* Note.swift */,
 				B59325D0217E4206000B0E8E /* NoteBlock.swift */,
@@ -1953,6 +1965,7 @@
 				02A26F1A2744F5FC008E4EDB /* wp-site-settings.json */,
 				DEC51AEC2768A0AD009F3DF4 /* systemStatusWithPluginsOnly.json */,
 				077F39D726A58EB600ABEADC /* systemStatus.json */,
+				45CCFCE927A2E59B0012E8CB /* inbox-note-list.json */,
 			);
 			path = Responses;
 			sourceTree = "<group>";
@@ -1972,6 +1985,7 @@
 				B524193E21AC5FE400D6FC0A /* DotcomDeviceMapper.swift */,
 				24F98C572502EA8800F49B68 /* FeatureFlagMapper.swift */,
 				AEF9458A27297FF6001DCCFB /* IgnoringResponseMapper.swift */,
+				45CCFCE527A2E3710012E8CB /* InboxNoteListMapper.swift */,
 				26B2F74424C5573F0065CCC8 /* LeaderboardListMapper.swift */,
 				020D07BD23D8570800FD9580 /* MediaListMapper.swift */,
 				D823D904223746CE00C90817 /* NewShipmentTrackingMapper.swift */,
@@ -2113,6 +2127,7 @@
 				45150A9F26837357006922EA /* CountryListMapperTests.swift */,
 				B524194221AC622500D6FC0A /* DotcomDeviceMapperTests.swift */,
 				AED8AEBB272A997500663FCC /* IgnoringResponseMapperTests.swift */,
+				45CCFCE727A2E5020012E8CB /* InboxNoteListMapperTests.swift */,
 				B554FA922180C17200C54DFF /* NoteHashListMapperTests.swift */,
 				B5C151BF217EE3FB00C7BDC1 /* NoteListMapperTests.swift */,
 				B5C6FCCC20A34B8300A4F8E4 /* OrderListMapperTests.swift */,
@@ -2448,6 +2463,7 @@
 				45B204BC24890B1200FE6526 /* category.json in Resources */,
 				022902D422E2436400059692 /* stats_module_disabled_error.json in Resources */,
 				31A451D227863A2E00FE81AA /* stripe-account-restricted-pending.json in Resources */,
+				45CCFCEA27A2E59B0012E8CB /* inbox-note-list.json in Resources */,
 				025CA2C8238F4FF400B05C81 /* product-shipping-classes-load-all.json in Resources */,
 				74046E21217A73D0007DD7BF /* settings-general.json in Resources */,
 				31054724262E2FC600C5C02B /* wcpay-payment-intent-requires-capture.json in Resources */,
@@ -2798,6 +2814,7 @@
 				B518662220A097C200037A38 /* Network.swift in Sources */,
 				B572F69A21AC475C003EEFF0 /* DevicesRemote.swift in Sources */,
 				3192F220260D33BB0067FEF9 /* WCPayAccount.swift in Sources */,
+				45CCFCE227A2C9BF0012E8CB /* InboxNote.swift in Sources */,
 				311D412C2783BF7400052F64 /* StripeAccount.swift in Sources */,
 				B518662420A099BF00037A38 /* AlamofireNetwork.swift in Sources */,
 				311D412E2783C07D00052F64 /* StripeAccountMapper.swift in Sources */,
@@ -2857,6 +2874,7 @@
 				CE17C6B1229462C000AACE1C /* ProductStockStatus.swift in Sources */,
 				B557DA0420975500005962F4 /* OrdersRemote.swift in Sources */,
 				CE43066C2347C5F90073CBFF /* OrderItemRefund.swift in Sources */,
+				45CCFCE427A2DC270012E8CB /* InboxAction.swift in Sources */,
 				B5C6FCD420A373BB00A4F8E4 /* OrderMapper.swift in Sources */,
 				D88D5A49230BC8C7007B6E01 /* ProductReviewStatus.swift in Sources */,
 				451A97C92609FF050059D135 /* ShippingLabelPackagesResponse.swift in Sources */,
@@ -2883,6 +2901,7 @@
 				02BDB83523EA98C800BCC63E /* String+HTML.swift in Sources */,
 				B505F6CF20BEE38B00BB1B69 /* Account.swift in Sources */,
 				743E84EA22171C5800FAC9D7 /* ShipmentsRemote.swift in Sources */,
+				45CCFCE627A2E3710012E8CB /* InboxNoteListMapper.swift in Sources */,
 				B59325D5217E4206000B0E8E /* NoteRange.swift in Sources */,
 				26B2F74324C545D50065CCC8 /* Leaderboard.swift in Sources */,
 				458C6DE425AC72A1009B300D /* StoredProductSettings.swift in Sources */,
@@ -2987,6 +3006,7 @@
 				D8FBFF0F22D3B25E006E3336 /* WooAPIVersionTests.swift in Sources */,
 				45152831257A8E1A0076B03C /* ProductAttributeMapperTests.swift in Sources */,
 				26B2F74924C55ACE0065CCC8 /* LeaderboardsRemoteTests.swift in Sources */,
+				45CCFCE827A2E5020012E8CB /* InboxNoteListMapperTests.swift in Sources */,
 				74002D6C2118B88200A63C19 /* SiteVisitStatsRemoteTests.swift in Sources */,
 				0212683524C046CB00F8A892 /* MockNetwork+Path.swift in Sources */,
 				B554FA932180C17200C54DFF /* NoteHashListMapperTests.swift in Sources */,

Networking/Networking/Mapper/InboxNoteListMapper.swift

@@ -0,0 +1,22 @@
+import Foundation
+
+/// Mapper: Inbox Note List
+///
+struct InboxNoteListMapper: Mapper {
+
+    /// Site we're parsing `InboxNote`s for
+    /// We're injecting this field by copying it in after parsing responses, because `siteID` is not returned in any of the Inbox Note endpoints.
+    ///
+    let siteID: Int64
+
+    /// (Attempts) to convert a dictionary into an Inbox Note Array.
+    ///
+    func map(response: Data) throws -> [InboxNote] {
+        let decoder = JSONDecoder()
+        decoder.dateDecodingStrategy = .formatted(DateFormatter.Defaults.dateTimeFormatter)
+        decoder.userInfo = [
+            .siteID: siteID
+        ]
+        return try decoder.decode([InboxNote].self, from: response)
+    }
+}

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

@@ -169,6 +169,72 @@ extension CouponReport {
     }
 }
 
+extension InboxAction {
+    public func copy(
+        id: CopiableProp<Int64> = .copy,
+        name: CopiableProp<String> = .copy,
+        label: CopiableProp<String> = .copy,
+        status: CopiableProp<String> = .copy,
+        url: CopiableProp<String> = .copy
+    ) -> InboxAction {
+        let id = id ?? self.id
+        let name = name ?? self.name
+        let label = label ?? self.label
+        let status = status ?? self.status
+        let url = url ?? self.url
+
+        return InboxAction(
+            id: id,
+            name: name,
+            label: label,
+            status: status,
+            url: url
+        )
+    }
+}
+
+extension InboxNote {
+    public func copy(
+        siteID: CopiableProp<Int64> = .copy,
+        id: CopiableProp<Int64> = .copy,
+        name: CopiableProp<String> = .copy,
+        type: CopiableProp<String> = .copy,
+        status: CopiableProp<String> = .copy,
+        actions: CopiableProp<[InboxAction]> = .copy,
+        title: CopiableProp<String> = .copy,
+        content: CopiableProp<String> = .copy,
+        isDeleted: CopiableProp<Bool> = .copy,
+        isRead: CopiableProp<Bool> = .copy,
+        dateCreated: CopiableProp<Date> = .copy
+    ) -> InboxNote {
+        let siteID = siteID ?? self.siteID
+        let id = id ?? self.id
+        let name = name ?? self.name
+        let type = type ?? self.type
+        let status = status ?? self.status
+        let actions = actions ?? self.actions
+        let title = title ?? self.title
+        let content = content ?? self.content
+        let isDeleted = isDeleted ?? self.isDeleted
+        let isRead = isRead ?? self.isRead
+        let dateCreated = dateCreated ?? self.dateCreated
+
+        return InboxNote(
+            siteID: siteID,
+            id: id,
+            name: name,
+            type: type,
+            status: status,
+            actions: actions,
+            title: title,
+            content: content,
+            isDeleted: isDeleted,
+            isRead: isRead,
+            dateCreated: dateCreated
+        )
+    }
+}
+
 extension Order {
     public func copy(
         siteID: CopiableProp<Int64> = .copy,

Networking/Networking/Model/InboxAction.swift

@@ -0,0 +1,55 @@
+import Foundation
+import Codegen
+
+/// Represents an Inbox Action entity.
+/// Doc: p91TBi-6o2
+///
+public struct InboxAction: GeneratedCopiable, GeneratedFakeable, Equatable {
+
+    /// Action ID in WP database.
+    ///
+    public let id: Int64
+
+    /// Name of the action.
+    ///
+    public let name: String
+
+    /// Label of the action.
+    ///
+    public let label: String
+
+    /// All values: `unactioned`, `actioned`, `snoozed`. It seems there isn't a way to snooze a notification at the moment.
+    ///
+    public let status: String
+
+    /// URL where the action points.
+    ///
+    public let url: String
+
+
+    public init(id: Int64,
+                name: String,
+                label: String,
+                status: String,
+                url: String) {
+        self.id = id
+        self.name = name
+        self.label = label
+        self.status = status
+        self.url = url
+    }
+}
+
+
+// MARK: - Codable Conformance
+
+/// Defines all of the InboxNote CodingKeys
+extension InboxAction: Codable {
+    enum CodingKeys: String, CodingKey {
+        case id
+        case name
+        case label
+        case status
+        case url
+    }
+}