Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve data fetching in Order Details, to avoid I/O performance on the main thread #14999

Merged
merged 20 commits into from
Mar 28, 2025
Merged

Improve data fetching in Order Details, to avoid I/O performance on the main thread #14999

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
19def60
update: `feeLines` property to return `order.fees` instead, while rem…
pmusolino Jan 27, 2025
4026840
Add `shippingLabels` property to `Order` which was connected in Stora…
pmusolino Jan 27, 2025
ec15b19
Merge commit 'f12dbd8aeff195fe6da618d23550f9d8d6d24b7f' into feat/bat…
pmusolino Jan 28, 2025
0311bd9
update: relese-notes
pmusolino Jan 28, 2025
0ef427b
update: add PR link to release-notes
pmusolino Jan 28, 2025
22d0a31
Merge branch 'trunk' into feat/batch-fetching-in-order-details
pmusolino Jan 30, 2025
e2d583f
Merge branch 'trunk' into feat/batch-fetching-in-order-details
pmusolino Feb 3, 2025
bfc3695
Merge branch 'trunk' into feat/batch-fetching-in-order-details
pmusolino Feb 5, 2025
85c0115
Update Order.swift and RELEASE-NOTES.txt
pmusolino Feb 5, 2025
8d6cf40
Merge branch 'trunk' into feat/batch-fetching-in-order-details
pmusolino Feb 19, 2025
e03de8d
Merge commit '7627219dad37276b64378daca7a1258fe46f90be' into feat/bat…
pmusolino Feb 27, 2025
3577381
fix: correctly update shipping labels in an order if the following se…
pmusolino Feb 28, 2025
f84f26e
Merge commit 'd231feff7094c39c56123f4fd2a065bcf459ca6f' into feat/bat…
pmusolino Mar 6, 2025
bc264a9
Merge commit 'd231feff7094c39c56123f4fd2a065bcf459ca6f' into feat/bat…
pmusolino Mar 6, 2025
85530e1
Merge branch 'feat/batch-fetching-in-order-details-take-2' into feat/…
pmusolino Mar 26, 2025
58fdc9b
Merge branch 'trunk' into feat/batch-fetching-in-order-details
pmusolino Mar 26, 2025
e6278c3
update: release-notes
pmusolino Mar 26, 2025
32dbb12
Fix issue triggering order syncing after dismissing modals
itsmeichigo Mar 27, 2025
5bc56ac
Fix unit test build failures
itsmeichigo Mar 28, 2025
bbfb18c
Improve syncing of shipping label details
itsmeichigo Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Fakes/Fakes/Networking.generated.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,8 @@ extension Networking.Order {
customFields: .fake(),
renewalSubscriptionID: .fake(),
appliedGiftCards: .fake(),
attributionInfo: .fake()
attributionInfo: .fake(),
shippingLabels: .fake()
)
}
}
Expand Down
10 changes: 10 additions & 0 deletions Networking/Networking.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,11 @@
453954D22C90D84200A3E64A /* meta-data-products-and-orders.json in Resources */ = {isa = PBXBuildFile; fileRef = 453954D12C90D84200A3E64A /* meta-data-products-and-orders.json */; };
453954D42C90E81300A3E64A /* MetaDataRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 453954D32C90E81300A3E64A /* MetaDataRemoteTests.swift */; };
453954D62C9193BC00A3E64A /* meta-data-products-orders-update.json in Resources */ = {isa = PBXBuildFile; fileRef = 453954D52C9193BC00A3E64A /* meta-data-products-orders-update.json */; };
453B33FD2D47F1F4005C05B0 /* ShippingLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C254A7256373AB00A04423 /* ShippingLabel.swift */; };
453B33FE2D47F1FB005C05B0 /* ShippingLabelStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C254AB2563781800A04423 /* ShippingLabelStatus.swift */; };
453B33FF2D47F203005C05B0 /* ShippingLabelRefund.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C2549F25636F6900A04423 /* ShippingLabelRefund.swift */; };
453B34002D47F20A005C05B0 /* ShippingLabelRefundStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C254AF256378D000A04423 /* ShippingLabelRefundStatus.swift */; };
453B34012D47F22C005C05B0 /* ShippingLabelAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C2549925636E1500A04423 /* ShippingLabelAddress.swift */; };
45551F122523E7F1007EF104 /* UserAgent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45551F112523E7F1007EF104 /* UserAgent.swift */; };
45551F142523E7FF007EF104 /* UserAgentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45551F132523E7FF007EF104 /* UserAgentTests.swift */; };
4568E2222459ADC60007E478 /* SitePostsRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4568E2212459ADC60007E478 /* SitePostsRemote.swift */; };
Expand Down Expand Up @@ -4888,11 +4893,13 @@
2680B0D22BED5A4C00E7F1D8 /* AuthenticatedRESTRequest.swift in Sources */,
2680B0D02BED5A1900E7F1D8 /* WooConstants.swift in Sources */,
2680B0CF2BED59CE00E7F1D8 /* ApplicationPasswordStorage.swift in Sources */,
453B34002D47F20A005C05B0 /* ShippingLabelRefundStatus.swift in Sources */,
2680B0CB2BED58B200E7F1D8 /* ApplicationPasswordNameAndUUID.swift in Sources */,
26373E0A2BFCEAAF008E6735 /* OrderItemTax.swift in Sources */,
2680B0CC2BED58B200E7F1D8 /* ApplicationPassword.swift in Sources */,
26373E122BFCEDB7008E6735 /* OrderFeeLine.swift in Sources */,
26F2CADD2BED579100F9A5E7 /* ApplicationPasswordUseCase.swift in Sources */,
453B33FF2D47F203005C05B0 /* ShippingLabelRefund.swift in Sources */,
26F2CADA2BED578200F9A5E7 /* RequestProcessor.swift in Sources */,
26F2CADB2BED578200F9A5E7 /* RequestAuthenticator.swift in Sources */,
26F2CADC2BED578200F9A5E7 /* RequestConverter.swift in Sources */,
Expand All @@ -4905,6 +4912,7 @@
263A6DBC2BEAA49B00C292B2 /* AnyDecodable.swift in Sources */,
263A6DBD2BEAA49B00C292B2 /* AnyEncodable.swift in Sources */,
263A6DB92BEAA46F00C292B2 /* SiteSummaryStatsMapper.swift in Sources */,
453B33FD2D47F1F4005C05B0 /* ShippingLabel.swift in Sources */,
26373E112BFCEDAE008E6735 /* OrderRefundCondensed.swift in Sources */,
263A6DBA2BEAA46F00C292B2 /* SiteSummaryStats.swift in Sources */,
263A6DB62BEAA46000C292B2 /* SiteVisitStatsMapper.swift in Sources */,
Expand Down Expand Up @@ -4963,6 +4971,7 @@
26CFDEE12C0295EA005ABC31 /* MetaContainer.swift in Sources */,
26373E152BFCEDE9008E6735 /* OrderGiftCard.swift in Sources */,
269014CB2BEA9253006056E0 /* JetpackRequest.swift in Sources */,
453B34012D47F22C005C05B0 /* ShippingLabelAddress.swift in Sources */,
269014CA2BEA924B006056E0 /* NetworkError.swift in Sources */,
26373E092BFCEA90008E6735 /* OrderItemProductAddOn.swift in Sources */,
26373E162BFCEDFD008E6735 /* OrderAttributionInfo.swift in Sources */,
Expand All @@ -4975,6 +4984,7 @@
269014C32BEA9134006056E0 /* Mapper.swift in Sources */,
269014C22BEA912D006056E0 /* Request.swift in Sources */,
26373E182BFCEF79008E6735 /* KeyedDecodingContainer+Woo.swift in Sources */,
453B33FE2D47F1FB005C05B0 /* ShippingLabelStatus.swift in Sources */,
26373E202BFCF6A7008E6735 /* EntityDateModifiedMapper.swift in Sources */,
26CFDEE02C0295E1005ABC31 /* NoteRange.swift in Sources */,
26CFDEDE2C0295CB005ABC31 /* NoteBlock.swift in Sources */,
Expand Down
7 changes: 5 additions & 2 deletions Networking/Networking/Model/Copiable/Models+Copiable.generated.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1348,7 +1348,8 @@ extension Networking.Order {
customFields: CopiableProp<[MetaData]> = .copy,
renewalSubscriptionID: NullableCopiableProp<String> = .copy,
appliedGiftCards: CopiableProp<[OrderGiftCard]> = .copy,
attributionInfo: NullableCopiableProp<OrderAttributionInfo> = .copy
attributionInfo: NullableCopiableProp<OrderAttributionInfo> = .copy,
shippingLabels: CopiableProp<[ShippingLabel]> = .copy
) -> Networking.Order {
let siteID = siteID ?? self.siteID
let orderID = orderID ?? self.orderID
Expand Down Expand Up @@ -1388,6 +1389,7 @@ extension Networking.Order {
let renewalSubscriptionID = renewalSubscriptionID ?? self.renewalSubscriptionID
let appliedGiftCards = appliedGiftCards ?? self.appliedGiftCards
let attributionInfo = attributionInfo ?? self.attributionInfo
let shippingLabels = shippingLabels ?? self.shippingLabels

return Networking.Order(
siteID: siteID,
Expand Down Expand Up @@ -1427,7 +1429,8 @@ extension Networking.Order {
customFields: customFields,
renewalSubscriptionID: renewalSubscriptionID,
appliedGiftCards: appliedGiftCards,
attributionInfo: attributionInfo
attributionInfo: attributionInfo,
shippingLabels: shippingLabels
)
}
}
Expand Down
21 changes: 17 additions & 4 deletions Networking/Networking/Model/Order.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ public struct Order: Decodable, Sendable, GeneratedCopiable, GeneratedFakeable {
///
public let attributionInfo: OrderAttributionInfo?

/// Shipping labels associated with the order
///
public let shippingLabels: [ShippingLabel]

/// Order struct initializer.
///
public init(siteID: Int64,
Expand Down Expand Up @@ -100,7 +104,8 @@ public struct Order: Decodable, Sendable, GeneratedCopiable, GeneratedFakeable {
customFields: [MetaData],
renewalSubscriptionID: String?,
appliedGiftCards: [OrderGiftCard],
attributionInfo: OrderAttributionInfo?) {
attributionInfo: OrderAttributionInfo?,
shippingLabels: [ShippingLabel]) {

self.siteID = siteID
self.orderID = orderID
Expand Down Expand Up @@ -145,6 +150,7 @@ public struct Order: Decodable, Sendable, GeneratedCopiable, GeneratedFakeable {
self.renewalSubscriptionID = renewalSubscriptionID
self.appliedGiftCards = appliedGiftCards
self.attributionInfo = attributionInfo
self.shippingLabels = shippingLabels
}


Expand Down Expand Up @@ -239,6 +245,9 @@ public struct Order: Decodable, Sendable, GeneratedCopiable, GeneratedFakeable {
return OrderAttributionInfo(metaData: allOrderMetaData)
}()

// Shipping labels
let shippingLabels = try container.decodeIfPresent([ShippingLabel].self, forKey: .shippingLabels) ?? []
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👋 @pmusolino Do we receive this shipping_labels key in orders response? Based on my testing in a Woo store with shipping labels, I don't see it being sent in wc/v3/orders.

If we do receive the shipping_labels, should we update the mock JSON and add unit tests to ensure that shipping_labels are mapped correctly?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question, @selanthiraiyan. In ShippingLabelStore, the method upsertShippingLabels connects the fetched shipping labels to the specific order, so the order doesn't return specific shipping labels, making it unnecessary to decode the Shipping Labels in the Order model. However, declaring the property (without decoding) in the networking model seems necessary to access shippingLabels, unless you have another solution in mind.

Yes, we could access the shipping labels from storage, but that's what we're trying to avoid. Do you think I can leave the shippingLabels property in Order.swift but remove the decoding? This way, by default, it would be an empty array.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @pmusolino! I don't have a solution in mind. But I think we should remove the decoding, as it will be misleading.

I'm tagging @itsmeichigo to check whether she has any other solutions.

Copy link
Contributor

@itsmeichigo itsmeichigo Feb 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the ping Sharma!

I think if the key for shipping labels is non-existent in the order response, keeping the property an empty array should be the way to go. There's no need to waste more resources to look for such a key to decode. Please also leave a comment in the code to explain why the value is empty by default, and when it's going to be updated.

However, I'm concerned about this part:

In ShippingLabelStore, the method upsertShippingLabels connects the fetched shipping labels to the specific order

In the order details screen, after syncing shipping labels, we'd need to ensure that the order in the view model is updated with the fetched label(s), just so they can be displayed on the UI.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you both! I updated the decoding here 85c0115 the comment should be clear enough.

In the order details screen, after syncing shipping labels, we'd need to ensure that the order in the view model is updated with the fetched label(s), just so they can be displayed on the UI.

Yes, this already happens from my testing. If you create or update a shipping label, or open an order detail with an existing shipping label that needs to be fetched remotely, you will see the order detail UI correctly updated.


self.init(siteID: siteID,
orderID: orderID,
parentID: parentID,
Expand Down Expand Up @@ -276,7 +285,8 @@ public struct Order: Decodable, Sendable, GeneratedCopiable, GeneratedFakeable {
customFields: customFields,
renewalSubscriptionID: renewalSubscriptionID,
appliedGiftCards: appliedGiftCards,
attributionInfo: attributionInfo)
attributionInfo: attributionInfo,
shippingLabels: shippingLabels)
}

public static var empty: Order {
Expand Down Expand Up @@ -317,7 +327,8 @@ public struct Order: Decodable, Sendable, GeneratedCopiable, GeneratedFakeable {
customFields: [],
renewalSubscriptionID: nil,
appliedGiftCards: [],
attributionInfo: nil)
attributionInfo: nil,
shippingLabels: [])
}
}

Expand Down Expand Up @@ -365,6 +376,7 @@ internal extension Order {
case taxLines = "tax_lines"
case metadata = "meta_data"
case giftCards = "gift_cards"
case shippingLabels = "shipping_labels"
}
}

Expand Down Expand Up @@ -407,7 +419,8 @@ extension Order: Equatable {
lhs.items.count == rhs.items.count &&
lhs.items.sorted() == rhs.items.sorted() &&
lhs.customerNote == rhs.customerNote &&
lhs.attributionInfo == rhs.attributionInfo
lhs.attributionInfo == rhs.attributionInfo &&
lhs.shippingLabels == rhs.shippingLabels
}
}

Expand Down
2 changes: 1 addition & 1 deletion Networking/Networking/Model/ShippingLabel/Enums/ShippingLabelRefundStatus.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import Codegen

/// The status of shipping label refund.
public enum ShippingLabelRefundStatus: GeneratedFakeable {
public enum ShippingLabelRefundStatus: Sendable, GeneratedFakeable {
case pending
case unknown
}
Expand Down
2 changes: 1 addition & 1 deletion Networking/Networking/Model/ShippingLabel/Enums/ShippingLabelStatus.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import Codegen

/// The status of shipping label.
public enum ShippingLabelStatus: GeneratedFakeable {
public enum ShippingLabelStatus: Sendable, GeneratedFakeable {
case purchased
case purchaseError
case purchaseInProgress
Expand Down
2 changes: 1 addition & 1 deletion Networking/Networking/Model/ShippingLabel/ShippingLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Codegen

/// Represents a Shipping Label.
///
public struct ShippingLabel: Equatable, GeneratedCopiable, GeneratedFakeable {
public struct ShippingLabel: Equatable, Sendable, GeneratedCopiable, GeneratedFakeable {
/// The remote ID of the site that owns this shipping label.
public let siteID: Int64

Expand Down
2 changes: 1 addition & 1 deletion Networking/Networking/Model/ShippingLabel/ShippingLabelAddress.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Codegen

/// Represents a Shipping Label Address.
///
public struct ShippingLabelAddress: GeneratedCopiable, Equatable, GeneratedFakeable {
public struct ShippingLabelAddress: GeneratedCopiable, Equatable, Sendable, GeneratedFakeable {
/// The name of the company at the address.
public let company: String

Expand Down
2 changes: 1 addition & 1 deletion Networking/Networking/Model/ShippingLabel/ShippingLabelRefund.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Codegen

/// Represents a Shipping Label Refund.
///
public struct ShippingLabelRefund: Equatable, GeneratedFakeable {
public struct ShippingLabelRefund: Equatable, Sendable, GeneratedFakeable {
/// The date of refund request.
public let dateRequested: Date

Expand Down
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
21.6
-----
- [*] Payments: Improved error handling during card payments and refunds [https://github.com/woocommerce/woocommerce-ios/pull/14980]
- [internal] Improve data fetching in Order Details, to avoid I/O performance on the main thread. [https://github.com/woocommerce/woocommerce-ios/pull/14999]

21.5
-----
Expand Down
63 changes: 2 additions & 61 deletions WooCommerce/Classes/ViewModels/Order Details/OrderDetailsResultsControllers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ final class OrderDetailsResultsControllers {
///
private lazy var productVariationResultsController: ResultsController<StorageProductVariation> = getProductVariationResultsController()

/// Fee lines Results Controller.
///
private lazy var feeLinesResultsController: ResultsController<StorageOrderFeeLine> = {
let predicate = NSPredicate(format: "order.orderID == %ld", order.orderID)
let descriptor = NSSortDescriptor(key: "feeID", ascending: true)

return ResultsController<StorageOrderFeeLine>(storageManager: storageManager, matching: predicate, sortedBy: [descriptor])
}()

/// Status Results Controller.
///
private lazy var statusResultsController: ResultsController<StorageOrderStatus> = {
Expand All @@ -63,17 +54,6 @@ final class OrderDetailsResultsControllers {
return ResultsController<StorageRefund>(storageManager: storageManager, matching: predicate, sortedBy: [descriptor])
}()

/// ShippingLabel Results Controller.
///
private lazy var shippingLabelResultsController: ResultsController<StorageShippingLabel> = {
let predicate = NSPredicate(format: "siteID = %ld AND orderID = %ld", order.siteID, order.orderID)
let dateCreatedDescriptor = NSSortDescriptor(keyPath: \StorageShippingLabel.dateCreated, ascending: false)
let shippingLabelIDDescriptor = NSSortDescriptor(keyPath: \StorageShippingLabel.shippingLabelID, ascending: false)
return ResultsController<StorageShippingLabel>(storageManager: storageManager,
matching: predicate,
sortedBy: [dateCreatedDescriptor, shippingLabelIDDescriptor])
}()

/// AddOnGroup ResultsController.
///
private lazy var addOnGroupResultsController: ResultsController<StorageAddOnGroup> = {
Expand Down Expand Up @@ -128,7 +108,7 @@ final class OrderDetailsResultsControllers {
/// Shipping labels for an Order
///
var shippingLabels: [ShippingLabel] {
return shippingLabelResultsController.fetchedObjects
return order.shippingLabels
}

/// Site's add-on groups.
Expand All @@ -142,7 +122,7 @@ final class OrderDetailsResultsControllers {
}

var feeLines: [OrderFeeLine] {
return feeLinesResultsController.fetchedObjects
return order.fees
}

/// Shipping methods list
Expand All @@ -169,10 +149,8 @@ final class OrderDetailsResultsControllers {
configureProductResultsController(onReload: onReload)
configureProductVariationResultsController(onReload: onReload)
configureRefundResultsController(onReload: onReload)
configureShippingLabelResultsController(onReload: onReload)
configureAddOnGroupResultsController(onReload: onReload)
configureSitePluginsResultsController(onReload: onReload)
configureFeeLinesResultsController(onReload: onReload)
configureShippingMethodsResultsController(onReload: onReload)
}

Expand Down Expand Up @@ -286,24 +264,6 @@ private extension OrderDetailsResultsControllers {
}
}

private func configureShippingLabelResultsController(onReload: @escaping () -> Void) {
shippingLabelResultsController.onDidChangeContent = {
onReload()
}

shippingLabelResultsController.onDidResetContent = { [weak self] in
guard let self = self else { return }
self.refetchAllResultsControllers()
onReload()
}

do {
try shippingLabelResultsController.performFetch()
} catch {
DDLogError("⛔️ Unable to fetch ShippingLabels for Site \(siteID) and Order \(order.orderID): \(error)")
}
}

private func configureAddOnGroupResultsController(onReload: @escaping () -> Void) {
addOnGroupResultsController.onDidChangeContent = {
onReload()
Expand Down Expand Up @@ -340,24 +300,6 @@ private extension OrderDetailsResultsControllers {
}
}

private func configureFeeLinesResultsController(onReload: @escaping () -> Void) {
feeLinesResultsController.onDidChangeContent = {
onReload()
}

feeLinesResultsController.onDidResetContent = { [weak self] in
guard let self = self else { return }
self.refetchAllResultsControllers()
onReload()
}

do {
try feeLinesResultsController.performFetch()
} catch {
DDLogError("⛔️ Unable to fetch Order Fee lines for Site \(siteID): \(error)")
}
}

private func configureShippingMethodsResultsController(onReload: @escaping () -> Void) {
shippingMethodsResultsController.onDidChangeContent = {
onReload()
Expand All @@ -384,7 +326,6 @@ private extension OrderDetailsResultsControllers {
try? refundResultsController.performFetch()
try? trackingResultsController.performFetch()
try? statusResultsController.performFetch()
try? shippingLabelResultsController.performFetch()
try? addOnGroupResultsController.performFetch()
try? sitePluginsResultsController.performFetch()
try? shippingMethodsResultsController.performFetch()
Expand Down
3 changes: 2 additions & 1 deletion WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/EditOrderAddressForm.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,8 @@ struct EditAddressForm_Previews: PreviewProvider {
customFields: [],
renewalSubscriptionID: nil,
appliedGiftCards: [],
attributionInfo: nil)
attributionInfo: nil,
shippingLabels: [])

static let sampleAddress = Address(firstName: "Johnny",
lastName: "Appleseed",
Expand Down
3 changes: 2 additions & 1 deletion ...hipping Label Form/Package Details/Multi-package/ShippingLabelPackagesFormViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,8 @@ extension ShippingLabelPackagesFormViewModel {
customFields: [],
renewalSubscriptionID: nil,
appliedGiftCards: [],
attributionInfo: nil)
attributionInfo: nil,
shippingLabels: [])
}

static func sampleAddress() -> Address {
Expand Down
3 changes: 2 additions & 1 deletion .../Shipping Labels/Create Shipping Label Form/Package Details/ShippingLabelSampleData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ enum ShippingLabelSampleData {
customFields: [],
renewalSubscriptionID: nil,
appliedGiftCards: [],
attributionInfo: nil)
attributionInfo: nil,
shippingLabels: [])
}

static func samplePackageDetails() -> ShippingLabelPackagesResponse {
Expand Down
3 changes: 2 additions & 1 deletion ... Labels/WooShipping Package and Rate Selection/WooShippingPackageAndRatePlaceholder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ extension Order {
customFields: [],
renewalSubscriptionID: nil,
appliedGiftCards: [],
attributionInfo: nil)
attributionInfo: nil,
shippingLabels: [])
}
#endif
Loading