Merge branch 'trunk' into fix/shipping-lines-crash-async-rows

# Conflicts:
#	WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Details/OrderDetailsDataSourceTests.swift

Author: iamgabrielma

Modules/Sources/Yosemite/Actions/WooShippingAction.swift

@@ -99,6 +99,14 @@ public enum WooShippingAction: Action {
                     orderID: Int64,
                     completion: (Result<WooShippingConfig, Error>) -> Void)
 
+    /// Sync shipping labels for a given order.
+    /// This uses the same endpoint as `loadConfig` but also stores shipping labels to the storage
+    /// and returns them in the completion closure.
+    ///
+    case syncShippingLabels(siteID: Int64,
+                            orderID: Int64,
+                            completion: (Result<[ShippingLabel], Error>) -> Void)
+
     /// Updates shipments for given order
     ///
     case updateShipment(siteID: Int64,

Modules/Sources/Yosemite/Model/Storage/Order+ReadOnlyConvertible.swift

@@ -123,51 +123,6 @@ extension Storage.Order: ReadOnlyConvertible {
 
     }
 
-    /// Returns a lightweight ReadOnly version of the receiver without any relationships populated.
-    ///
-    public func toLightweightReadOnly() -> Yosemite.Order {
-        Order(siteID: siteID,
-              orderID: orderID,
-              parentID: parentID,
-              customerID: customerID,
-              orderKey: orderKey,
-              isEditable: isEditable,
-              needsPayment: needsPayment,
-              needsProcessing: needsPayment,
-              number: number ?? "",
-              status: OrderStatusEnum(rawValue: statusKey),
-              currency: currency ?? "",
-              currencySymbol: "", // Not stored in the Storage Layer, only used in the notifications extension.
-              customerNote: customerNote ?? "",
-              dateCreated: dateCreated ?? Date(),
-              dateModified: dateModified ?? Date(),
-              datePaid: datePaid,
-              discountTotal: discountTotal ?? "",
-              discountTax: discountTax ?? "",
-              shippingTotal: shippingTotal ?? "",
-              shippingTax: shippingTax ?? "",
-              total: total ?? "",
-              totalTax: totalTax ?? "",
-              paymentMethodID: paymentMethodID ?? "",
-              paymentMethodTitle: paymentMethodTitle ?? "",
-              paymentURL: paymentURL as URL?,
-              chargeID: chargeID,
-              items: [],
-              billingAddress: createReadOnlyBillingAddress(),
-              shippingAddress: createReadOnlyShippingAddress(),
-              shippingLines: [],
-              coupons: [],
-              refunds: [],
-              fees: [],
-              taxes: [],
-              customFields: [],
-              renewalSubscriptionID: renewalSubscriptionID,
-              appliedGiftCards: [],
-              attributionInfo: attributionInfo?.toReadOnly(),
-              shippingLabels: [])
-
-    }
-
 
     // MARK: - Private Helpers
 

Modules/Sources/Yosemite/Model/Storage/Product+ReadOnlyConvertible.swift

@@ -200,93 +200,6 @@ extension Storage.Product: ReadOnlyConvertible {
                        customFields: productCustomFields.sorted { $0.metadataID < $1.metadataID })
     }
 
-    /// Returns a lightweight ReadOnly version of the receiver.
-    /// No relationships are populated except for images.
-    ///
-    public func toLightweightReadOnly() -> Yosemite.Product {
-
-        let productImages = imagesArray.map { $0.toReadOnly() }
-
-        return Product(siteID: siteID,
-                       productID: productID,
-                       name: name,
-                       slug: slug,
-                       permalink: permalink,
-                       date: date ?? Date(timeIntervalSince1970: 0),
-                       dateCreated: dateCreated ?? Date(timeIntervalSince1970: 0),
-                       dateModified: dateModified,
-                       dateOnSaleStart: dateOnSaleStart,
-                       dateOnSaleEnd: dateOnSaleEnd,
-                       productTypeKey: productTypeKey,
-                       statusKey: statusKey,
-                       featured: featured,
-                       catalogVisibilityKey: catalogVisibilityKey,
-                       fullDescription: fullDescription,
-                       shortDescription: briefDescription,
-                       sku: sku,
-                       globalUniqueID: globalUniqueID,
-                       price: price,
-                       regularPrice: regularPrice,
-                       salePrice: salePrice,
-                       onSale: onSale,
-                       purchasable: purchasable,
-                       totalSales: Int(totalSales),
-                       virtual: virtual,
-                       downloadable: downloadable,
-                       downloads: [],
-                       downloadLimit: downloadLimit,
-                       downloadExpiry: downloadExpiry,
-                       buttonText: buttonText,
-                       externalURL: externalURL,
-                       taxStatusKey: taxStatusKey,
-                       taxClass: taxClass,
-                       manageStock: manageStock,
-                       stockQuantity: nil,
-                       stockStatusKey: stockStatusKey,
-                       backordersKey: backordersKey,
-                       backordersAllowed: backordersAllowed,
-                       backordered: backordered,
-                       soldIndividually: soldIndividually,
-                       weight: weight,
-                       dimensions: createReadOnlyDimensions(),
-                       shippingRequired: shippingRequired,
-                       shippingTaxable: shippingTaxable,
-                       shippingClass: shippingClass,
-                       shippingClassID: shippingClassID,
-                       productShippingClass: nil,
-                       reviewsAllowed: reviewsAllowed,
-                       averageRating: averageRating,
-                       ratingCount: Int(ratingCount),
-                       relatedIDs: convertIDArray(relatedIDs),
-                       upsellIDs: convertIDArray(upsellIDs),
-                       crossSellIDs: convertIDArray(crossSellIDs),
-                       parentID: parentID,
-                       purchaseNote: purchaseNote,
-                       categories: [],
-                       tags: [],
-                       images: productImages,
-                       attributes: [],
-                       defaultAttributes: [],
-                       variations: variations ?? [],
-                       groupedProducts: groupedProducts ?? [],
-                       menuOrder: Int(menuOrder),
-                       addOns: [],
-                       isSampleItem: isSampleItem,
-                       bundleStockStatus: nil,
-                       bundleStockQuantity: bundleStockQuantity as? Int64,
-                       bundleMinSize: bundleMinSize?.decimalValue,
-                       bundleMaxSize: bundleMaxSize?.decimalValue,
-                       bundledItems: [],
-                       password: password,
-                       compositeComponents: [],
-                       subscription: subscription?.toReadOnly(),
-                       minAllowedQuantity: minAllowedQuantity,
-                       maxAllowedQuantity: maxAllowedQuantity,
-                       groupOfQuantity: groupOfQuantity,
-                       combineVariationQuantities: combineVariationQuantities?.boolValue,
-                       customFields: [])
-    }
-
     // MARK: - Private Helpers
 
     private func createReadOnlyDimensions() -> Yosemite.ProductDimensions {

Modules/Sources/Yosemite/SnapshotsProvider/FetchResultSnapshotsProvider.swift

@@ -179,16 +179,6 @@ public final class FetchResultSnapshotsProvider<MutableType: FetchResultSnapshot
             return nil
         }
     }
-
-    /// The lightweight version of `object(withID:)` method. Returns readonly objects without relationships.
-    ///
-    public func lightweightObject(withID objectID: FetchResultSnapshotObjectID) -> MutableType.ReadOnlyType? {
-        if let storageOrder = storage.loadObject(ofType: MutableType.self, with: objectID) {
-            return storageOrder.toLightweightReadOnly()
-        } else {
-            return nil
-        }
-    }
 }
 
 // MARK: - FetchedResultsController Activation

Modules/Sources/Yosemite/Stores/WooShippingStore.swift

@@ -82,6 +82,8 @@ public final class WooShippingStore: Store {
             updateDestinationAddress(siteID: siteID, orderID: orderID, address: address, completion: completion)
         case let .loadConfig(siteID, orderID, completion):
             loadConfig(siteID: siteID, orderID: orderID, completion: completion)
+        case let .syncShippingLabels(siteID, orderID, completion):
+            syncShippingLabels(siteID: siteID, orderID: orderID, completion: completion)
         case let .updateShipment(siteID, orderID, shipmentToUpdate, completion):
             updateShipment(siteID: siteID,
                            orderID: orderID,
@@ -247,6 +249,28 @@ private extension WooShippingStore {
                                  completion: @escaping (Result<Bool, Error>) -> Void) {
         remote.acceptUPSTermsOfService(siteID: siteID, originAddress: originAddress, completion: completion)
     }
+
+    func syncShippingLabels(siteID: Int64,
+                            orderID: Int64,
+                            completion: @escaping (Result<[ShippingLabel], Error>) -> Void) {
+        remote.loadConfig(siteID: siteID, orderID: orderID, completion: { [weak self] result in
+            guard let self else { return }
+
+            switch result {
+            case .failure(let error):
+                completion(.failure(error))
+            case .success(let config):
+                guard let labels = config.shippingLabelData?.currentOrderLabels else {
+                    return completion(.success([]))
+                }
+                upsertShippingLabelsInBackground(siteID: siteID,
+                                                 orderID: orderID,
+                                                 shippingLabels: labels) {
+                    completion(.success(labels))
+                }
+            }
+        })
+    }
 }
 
 // MARK: Helpers
@@ -602,7 +626,7 @@ private extension WooShippingStore {
 
     /// Updates order's `dateModified` locally
     /// Used as temp workaround to reflect that the order instance was updated
-    private func setLastModifiedDateForOrder(siteID: Int64, orderID: Int64) {
+    func setLastModifiedDateForOrder(siteID: Int64, orderID: Int64) {
         storageManager.performAndSave({ derivedStorage in
             guard let storedOrder = derivedStorage.loadOrder(
                 siteID: siteID,
@@ -614,6 +638,70 @@ private extension WooShippingStore {
             storedOrder.dateModified = Date()
         }, completion: nil, on: .main)
     }
+
+    /// Updates/inserts the specified readonly shipping label entities *in a background thread*.
+    /// `onCompletion` will be called on the main thread!
+    func upsertShippingLabelsInBackground(siteID: Int64,
+                                          orderID: Int64,
+                                          shippingLabels: [ShippingLabel],
+                                          onCompletion: @escaping () -> Void) {
+        if shippingLabels.isEmpty {
+            return onCompletion()
+        }
+
+        storageManager.performAndSave ({ [weak self] storage in
+            guard let self else { return }
+            guard let order = storage.loadOrder(siteID: siteID, orderID: orderID) else {
+                return
+            }
+            upsertShippingLabels(siteID: siteID, orderID: orderID, shippingLabels: shippingLabels, storageOrder: order, using: storage)
+        }, completion: onCompletion, on: .main)
+    }
+
+    /// Updates/inserts the specified readonly ShippingLabel entities in the current thread.
+    func upsertShippingLabels(siteID: Int64,
+                              orderID: Int64,
+                              shippingLabels: [ShippingLabel],
+                              storageOrder: StorageOrder,
+                              using storage: StorageType) {
+        let storedLabels = storage.loadAllShippingLabels(siteID: siteID, orderID: orderID)
+        for shippingLabel in shippingLabels {
+            let storageShippingLabel = storedLabels.first(where: { $0.shippingLabelID == shippingLabel.shippingLabelID }) ??
+            storage.insertNewObject(ofType: Storage.ShippingLabel.self)
+            storageShippingLabel.update(with: shippingLabel)
+            storageShippingLabel.order = storageOrder
+
+            update(storageShippingLabel: storageShippingLabel, refund: shippingLabel.refund, using: storage)
+
+            let originAddress = storageShippingLabel.originAddress ?? storage.insertNewObject(ofType: Storage.ShippingLabelAddress.self)
+            originAddress.update(with: shippingLabel.originAddress)
+            storageShippingLabel.originAddress = originAddress
+
+            let destinationAddress = storageShippingLabel.destinationAddress ?? storage.insertNewObject(ofType: Storage.ShippingLabelAddress.self)
+            destinationAddress.update(with: shippingLabel.destinationAddress)
+            storageShippingLabel.destinationAddress = destinationAddress
+        }
+
+        // Now, remove any objects that exist in storage but not in shippingLabels
+        let shippingLabelIDs = shippingLabels.map(\.shippingLabelID)
+        storedLabels.filter {
+            !shippingLabelIDs.contains($0.shippingLabelID)
+        }.forEach {
+            storage.deleteObject($0)
+        }
+    }
+
+    func update(storageShippingLabel: StorageShippingLabel,
+                refund: ShippingLabelRefund?,
+                using storage: StorageType) {
+        if let refund {
+            let storageRefund = storageShippingLabel.refund ?? storage.insertNewObject(ofType: Storage.ShippingLabelRefund.self)
+            storageRefund.update(with: refund)
+            storageShippingLabel.refund = storageRefund
+        } else {
+            storageShippingLabel.refund = nil
+        }
+    }
 }
 
 /// Represents errors that can be returned when purchasing a shipping label

Modules/Sources/Yosemite/Tools/ReadOnlyConvertible.swift

@@ -17,10 +17,6 @@ public protocol ReadOnlyConvertible: TypeErasedReadOnlyConvertible {
     /// Returns a ReadOnly version of the receiver.
     ///
     func toReadOnly() -> ReadOnlyType
-
-    /// Returns a lightweight ReadOnly version of the receiver.
-    ///
-    func toLightweightReadOnly() -> ReadOnlyType
 }
 
 
@@ -44,10 +40,4 @@ extension ReadOnlyConvertible {
     public func toTypeErasedReadOnly() -> Any {
         return toReadOnly()
     }
-
-    /// Default implementation is the same result with `toReadOnly()`
-    ///
-    public func toLightweightReadOnly() -> ReadOnlyType {
-        toReadOnly()
-    }
 }

Modules/Sources/Yosemite/Tools/ResultsController.swift

@@ -143,12 +143,6 @@ public class ResultsController<T: ResultsControllerMutableType> {
         return controller.object(at: indexPath).toReadOnly()
     }
 
-    /// Returns the lightweight fetched object at a given indexPath.
-    ///
-    public func lightweightObject(at indexPath: IndexPath) -> T.ReadOnlyType {
-        return controller.object(at: indexPath).toLightweightReadOnly()
-    }
-
     /// Returns the fetched object at the given `indexPath`. Returns `nil` if the `indexPath`
     /// does not exist.
     ///
@@ -209,17 +203,6 @@ public class ResultsController<T: ResultsControllerMutableType> {
         return readOnlyObjects ?? []
     }
 
-    /// Returns an array of all of the (ReadOnly) Fetched Objects with no relationships populated.
-    /// Suitable for list views.
-    ///
-    public var lightweightFetchedObjects: [T.ReadOnlyType] {
-        let readOnlyObjects = controller.fetchedObjects?.compactMap { mutableObject in
-            mutableObject.toLightweightReadOnly()
-        }
-
-        return readOnlyObjects ?? []
-    }
-
     /// Returns an array of SectionInfo Entitites.
     ///
     public var sections: [SectionInfo] {

RELEASE-NOTES.txt

@@ -3,13 +3,14 @@
 
 22.7
 -----
+- [*] Shipping Labels: Fixed an issue where the purchase button would display a stale price after changing the origin address. [https://github.com/woocommerce/woocommerce-ios/pull/15795]
 - [*] Order Details: Fix crash when reloading data [https://github.com/woocommerce/woocommerce-ios/pull/15764]
 - [*] Shipping Labels: Improved shipment management UI by hiding remove/merge options instead of disabling them, hiding merge option for orders with 2 or fewer unfulfilled shipments, and hiding the ellipsis menu when no remove/merge actions are available [https://github.com/woocommerce/woocommerce-ios/pull/15760]
-- [*] Improve app performance by fetching lightweight objects when necessary [https://github.com/woocommerce/woocommerce-ios/pull/15774]
 - [**] POS: a POS tab in the tab bar is now available in the app for stores eligible for Point of Sale, instead of the previous entry point in the Menu tab. [https://github.com/woocommerce/woocommerce-ios/pull/15766]
 - [***] POS: Barcode scanning using Bluetooth scanners in Point of Sale (HID-based scanners are supported) [https://github.com/woocommerce/woocommerce-ios/pull/15776]
 - [*] POS: Support refreshing product list when it's empty [https://github.com/woocommerce/woocommerce-ios/pull/15782]
 - [*] Shipping Labels: Fixed issue displaying fulfilled shipment after purchasing a label and quickly navigating back to the purchase form. [https://github.com/woocommerce/woocommerce-ios/pull/15790]
+- [*] Shipping Labels: Fixed mismatched indices of purchased labels on the order details screen. [https://github.com/woocommerce/woocommerce-ios/pull/15800]
 - [*] POS: Prevent card reader connection success alert flashing when connecting during a payment [https://github.com/woocommerce/woocommerce-ios/pull/15784]
 
 22.6

WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift

@@ -11,8 +11,8 @@ final class POSTabViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        tabBarItem.title = NSLocalizedString("pos.tab.title", value: "Point of Sale", comment: "Title for the Point of Sale tab.")
-        tabBarItem.image = .creditCardImage
+        tabBarItem.title = NSLocalizedString("pos.tab.title", value: "POS", comment: "Title for the Point of Sale tab.")
+        tabBarItem.image = UIImage(systemName: "cart")
         tabBarItem.accessibilityIdentifier = "tab-bar-pos-item"
     }
 }

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsDataSource.swift

@@ -1331,7 +1331,13 @@ extension OrderDetailsDataSource {
             }
 
             let sections = shippingLabels.enumerated().map { index, shippingLabel -> Section in
-                let title = String.localizedStringWithFormat(Title.shippingLabelPackageFormat, index + 1)
+                let title = {
+                    guard let shipmentID = shippingLabel.shipmentID,
+                          let intID = Int(shipmentID) else {
+                        return String.localizedStringWithFormat(Title.shippingLabelPackageFormat, index + 1)
+                    }
+                    return String.localizedStringWithFormat(Title.shippingLabelPackageFormat, intID + 1)
+                }()
                 let isRefunded = shippingLabel.refund != nil
                 let rows: [Row]
                 let headerStyle: Section.HeaderStyle