Skip to content

Commit 0350e64

Browse files
committed
Do not prefill 2 identical addresses in expanded form
1 parent afcb2c0 commit 0350e64

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

WooCommerce/Classes/ViewRelated/Orders/Order Creation/CustomerSection/CreateOrderAddressFormViewModel.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,17 @@ final class CreateOrderAddressFormViewModel: AddressFormViewModel, AddressFormVi
2121
analytics: Analytics = ServiceLocator.analytics) {
2222
self.onAddressUpdate = onAddressUpdate
2323

24+
// don't prefill second set of fields if input addresses are identical
25+
let addressesAreDifferent = addressData.billingAddress != addressData.shippingAddress
26+
2427
super.init(siteID: siteID,
2528
address: addressData.billingAddress ?? .empty,
26-
secondaryAddress: addressData.shippingAddress ?? .empty,
29+
secondaryAddress: addressesAreDifferent ? (addressData.shippingAddress ?? .empty) : .empty,
2730
storageManager: storageManager,
2831
stores: stores,
2932
analytics: analytics)
3033

31-
if addressData.billingAddress != addressData.shippingAddress {
34+
if addressesAreDifferent {
3235
showDifferentAddressForm = true
3336
}
3437
}

0 commit comments

Comments
 (0)