Merge branch 'trunk' into issue/5878-enable-hub-menu-to-everyone

Author: pmusolino

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -24,7 +24,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .orderListFilters:
             return true
         case .jetpackConnectionPackageSupport:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
         case .orderCreation:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .hubMenu:

Networking/Networking/Remote/StripeRemote.swift

@@ -3,19 +3,6 @@ import Foundation
 /// Stripe (Extension): Remote Endpoints
 ///
 public class StripeRemote: Remote {
-    /// Loads a card reader connection token for a given site ID and parses the response
-    /// - Parameters:
-    ///   - siteID: Site for which we'll fetch the connection token.
-    ///   - completion: Closure to be executed upon completion.
-    public func loadConnectionToken(for siteID: Int64,
-                                    completion: @escaping(Result<ReaderConnectionToken, Error>) -> Void) {
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: Path.connectionTokens)
-
-        let mapper = ReaderConnectionTokenMapper()
-
-        enqueue(request, mapper: mapper, completion: completion)
-    }
-
     /// Loads a Stripe account for a given site ID and parses the response
     /// - Parameters:
     ///   - siteID: Site for which we'll fetch the Stripe account info.
@@ -75,6 +62,23 @@ public class StripeRemote: Remote {
 
         enqueue(request, mapper: mapper, completion: completion)
     }
+}
+
+// MARK: - CardReaderCapableRemote
+//
+extension StripeRemote {
+    /// Loads a card reader connection token for a given site ID and parses the response
+    /// - Parameters:
+    ///   - siteID: Site for which we'll fetch the connection token.
+    ///   - completion: Closure to be executed upon completion.
+    public func loadConnectionToken(for siteID: Int64,
+                                    completion: @escaping(Result<ReaderConnectionToken, Error>) -> Void) {
+        let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: Path.connectionTokens)
+
+        let mapper = ReaderConnectionTokenMapper()
+
+        enqueue(request, mapper: mapper, completion: completion)
+    }
 
     /// Load the store's location for use as a default location for a card reader
     /// The backend coordinates this with Stripe to return a proper Stripe Location object ID

Networking/Networking/Remote/WCPayRemote.swift

@@ -3,19 +3,6 @@ import Foundation
 /// WCPay: Remote Endpoints
 ///
 public class WCPayRemote: Remote {
-    /// Loads a card reader connection token for a given site ID and parses the response
-    /// - Parameters:
-    ///   - siteID: Site for which we'll fetch the connection token.
-    ///   - completion: Closure to be executed upon completion.
-    public func loadConnectionToken(for siteID: Int64,
-                                    completion: @escaping(Result<ReaderConnectionToken, Error>) -> Void) {
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: Path.connectionTokens)
-
-        let mapper = ReaderConnectionTokenMapper()
-
-        enqueue(request, mapper: mapper, completion: completion)
-    }
-
     /// Loads a WCPay account for a given site ID and parses the response
     /// - Parameters:
     ///   - siteID: Site for which we'll fetch the WCPay account info.
@@ -73,6 +60,23 @@ public class WCPayRemote: Remote {
 
         enqueue(request, mapper: mapper, completion: completion)
     }
+}
+
+// MARK: - CardReaderCapableRemote
+//
+extension WCPayRemote {
+    /// Loads a card reader connection token for a given site ID and parses the response
+    /// - Parameters:
+    ///   - siteID: Site for which we'll fetch the connection token.
+    ///   - completion: Closure to be executed upon completion.
+    public func loadConnectionToken(for siteID: Int64,
+                                    completion: @escaping(Result<ReaderConnectionToken, Error>) -> Void) {
+        let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: Path.connectionTokens)
+
+        let mapper = ReaderConnectionTokenMapper()
+
+        enqueue(request, mapper: mapper, completion: completion)
+    }
 
     /// Load the store's location for use as a default location for a card reader
     /// The backend (since WCPay plugin 3.0.0) coordinates this with Stripe to return a proper Stripe Location object ID

RELEASE-NOTES.txt

@@ -4,6 +4,7 @@
 -----
 - [***] In-Person Payments: Support for Stripe M2 card reader. [https://github.com/woocommerce/woocommerce-ios/pull/5844]
 - [***] We introduced a new tab called "Menu", a tab in the main navigation where you can browser different sub-sections of the app: Switch Store, Settings, WooCommerce Admin, View Store and Reviews. [https://github.com/woocommerce/woocommerce-ios/pull/5926]
+- [***] Store admins can now access sites with plugins that have Jetpack Connection Package (e.g. WooCommerce Payments, Jetpack Backup) in the app. These sites do not require Jetpack-the-plugin to connect anymore. Store admins can still install Jetpack-the-plugin from the app through settings or a Jetpack banner. [https://github.com/woocommerce/woocommerce-ios/pull/5924]
 - [*] Add/Edit Product screen: Fix transient product name while adding images.[https://github.com/woocommerce/woocommerce-ios/pull/5840]
 
 8.3

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift

@@ -221,6 +221,10 @@ private extension CardPresentPaymentsOnboardingUseCase {
             return .genericError
         }
 
+        // If we've gotten this far, tell the Card Present Payment Store which backend to use
+        let setAccount = CardPresentPaymentAction.use(paymentGatewayAccount: account)
+        ServiceLocator.stores.dispatch(setAccount)
+
         return .completed
     }
 }

WooCommerce/UITestsFoundation/Screens/Orders/SingleOrderScreen.swift

@@ -21,10 +21,10 @@ public final class SingleOrderScreen: ScreenObject {
         // Expects 2 instances of order.number - one in Header and one in Summary
         app.assertTextVisibilityCount(textToFind: "#\(order.number)", expectedCount: 2)
 
+        // Expects 2 instances of first_name - one in Summary and one in Shipping details
         app.assertTextVisibilityCount(textToFind: order.billing.first_name, expectedCount: 2)
         app.assertElement(matching: "summary-table-view-cell", existsOnCellWithIdentifier: "\(order.billing.first_name) \(order.billing.last_name)")
 
-        // Loops through all products on the order
         for product in order.line_items {
             XCTAssertTrue(app.staticTexts[product.name].isFullyVisibleOnScreen(), "'\(product.name)' is missing!")
         }

WooCommerce/WooCommerceScreenshots/WooCommerceScreenshots.swift

@@ -49,7 +49,8 @@ class WooCommerceScreenshots: XCTestCase {
             .cancel()
 
             // Reviews
-            .tabBar.goToReviewsScreen()
+            .tabBar.goToMenuScreen()
+            .goToReviewsScreen()
             .thenTakeScreenshot(named: "review-list")
             .selectReview(atIndex: 3)
             .thenTakeScreenshot(named: "review-details")

WooCommerce/WooCommerceTests/Tools/MockOrders.swift

@@ -42,7 +42,8 @@ final class MockOrders {
                    items: [OrderItem] = [],
                    shippingLines: [ShippingLine] = sampleShippingLines(),
                    refunds: [OrderRefundCondensed] = [],
-                   fees: [OrderFeeLine] = []) -> Order {
+                   fees: [OrderFeeLine] = [],
+                   taxes: [OrderTaxLine] = []) -> Order {
         return Order(siteID: siteID,
                      orderID: orderID,
                      parentID: 0,
@@ -70,8 +71,7 @@ final class MockOrders {
                      coupons: [],
                      refunds: refunds,
                      fees: fees,
-                     taxes: [] // TODO: 5809 - Add sampleOrderTaxLines method
-        )
+                     taxes: taxes)
     }
 
     func sampleOrder() -> Order {
@@ -118,8 +118,7 @@ final class MockOrders {
                      coupons: [],
                      refunds: [],
                      fees: [],
-                     taxes: [] // TODO: 5809 - Add sampleOrderTaxLines method
-        )
+                     taxes: [])
     }
 
     static func sampleShippingLines(cost: String = "133.00", tax: String = "0.00") -> [ShippingLine] {

WooCommerce/WooCommerceUITests/Tests/OrdersTests.swift

@@ -16,8 +16,7 @@ final class OrdersTests: XCTestCase {
     func testOrdersScreenLoads() throws {
         let orders = try GetMocks.readOrdersData()
 
-        try TabNavComponent()
-            .goToOrdersScreen()
+        try TabNavComponent().goToOrdersScreen()
             .verifyOrdersScreenLoaded()
             .verifyOrdersList(orders: orders)
             .selectOrder(byOrderNumber: orders[0].number)

WooCommerce/WooCommerceUITests/Tests/ProductsTests.swift

@@ -10,13 +10,12 @@ final class ProductsTests: XCTestCase {
         app.launchArguments = ["logout-at-launch", "disable-animations", "mocked-wpcom-api", "-ui_testing"]
         app.launch()
         try LoginFlow.logInWithWPcom()
-        try TabNavComponent().goToProductsScreen()
     }
 
     func testProductsScreenLoad() throws {
         let products = try GetMocks.readProductsData()
 
-        try ProductsScreen()
+        try TabNavComponent().goToProductsScreen()
             .verifyProductsScreenLoaded()
             .verifyProductList(products: products)
             .selectProduct(byName: products[0].name)