Add support for editing the destination email

Author: rachelmcr

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShippingAddresses/WooShippingEditAddressViewModel.swift

@@ -159,7 +159,8 @@ final class WooShippingEditAddressViewModel: ObservableObject, Identifiable {
     private(set) var onOriginAddressEdited: ((WooShippingOriginAddress) -> Void)?
 
     /// Closure called when a destination address is done being edited and the changes are confirmed.
-    private(set) var onDestinationAddressEdited: ((WooShippingAddress) -> Void)?
+    /// Returns the updated address and email address.
+    private(set) var onDestinationAddressEdited: ((WooShippingAddress, String?) -> Void)?
 
     init(type: AddressType,
          id: String,
@@ -180,7 +181,7 @@ final class WooShippingEditAddressViewModel: ObservableObject, Identifiable {
          storageManager: StorageManagerType = ServiceLocator.storageManager,
          debounceDelayInSeconds: Double = 1,
          onOriginAddressEdited: ((WooShippingOriginAddress) -> Void)? = nil,
-         onDestinationAddressEdited: ((WooShippingAddress) -> Void)? = nil) {
+         onDestinationAddressEdited: ((WooShippingAddress, String?) -> Void)? = nil) {
         self.addressType = type
         self.id = id
         self.name = WooShippingAddressField(type: .name, value: name, required: company.isEmpty, validate: { _ in return nil })
@@ -271,10 +272,11 @@ final class WooShippingEditAddressViewModel: ObservableObject, Identifiable {
     }
 
     convenience init(address: WooShippingAddress?,
+                     email: String?,
                      isVerified: Bool,
                      stores: StoresManager = ServiceLocator.stores,
                      storageManager: StorageManagerType = ServiceLocator.storageManager,
-                     onAddressEdited: ((WooShippingAddress) -> Void)? = nil) {
+                     onAddressEdited: ((WooShippingAddress, String?) -> Void)? = nil) {
         self.init(type: .destination,
                   id: UUID().uuidString,
                   name: address?.name ?? "",
@@ -284,7 +286,7 @@ final class WooShippingEditAddressViewModel: ObservableObject, Identifiable {
                   city: address?.city ?? "",
                   state: address?.state ?? "",
                   postalCode: address?.postcode ?? "",
-                  email: "",
+                  email: email ?? "",
                   phone: address?.phone ?? "",
                   isDefaultAddress: false,
                   showCompanyField: address?.company.isNotEmpty == true,

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShippingCreateLabelsViewModel.swift

@@ -9,6 +9,7 @@ final class WooShippingCreateLabelsViewModel: ObservableObject {
     private let currencyFormatter: CurrencyFormatter
     private let itemsDataSource: WooShippingItemsDataSource
     private var destinationAddress: WooShippingAddress?
+    private var destinationEmail: String?
     private let stores: StoresManager
     private var subscriptions: Set<AnyCancellable> = []
     private var debounceDuration: Double = 1
@@ -182,6 +183,7 @@ final class WooShippingCreateLabelsViewModel: ObservableObject {
         self.currencyFormatter = CurrencyFormatter(currencySettings: currencySettings)
         self.onLabelPurchase = onLabelPurchase
         self.destinationAddress = Self.getDestinationAddress(order: order, address: order.shippingAddress)
+        self.destinationEmail = order.shippingAddress?.email ?? order.billingAddress?.email
         self.shippingLines = order.shippingLines.map({ WooShipping_ShippingLineViewModel(shippingLine: $0, currency: order.currency) })
         self.selectedOriginAddress = selectedOriginAddress
         self.selectedPackage = selectedPackage
@@ -282,12 +284,14 @@ final class WooShippingCreateLabelsViewModel: ObservableObject {
     /// After the address is edited, the destination address is replaced with the updated address.
     func editDestinationAddress() {
         addressToEdit = WooShippingEditAddressViewModel(address: destinationAddress,
+                                                        email: destinationEmail,
                                                         isVerified: destinationAddressStatus == .verified,
-                                                        onAddressEdited: { [weak self] editedAddress in
+                                                        onAddressEdited: { [weak self] editedAddress, editedEmail in
             guard let self else {
                 return
             }
             destinationAddress = editedAddress
+            destinationEmail = editedEmail
             addressToEdit = nil // Dismisses address edit screen
         })
     }

WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShippingEditAddressViewModelTests.swift

@@ -117,9 +117,11 @@ final class WooShippingEditAddressViewModelTests: XCTestCase {
                                          address2: "STE 100",
                                          city: "TICONDEROGA",
                                          postcode: "12883-1487")
+        let email = "[email protected]"
 
         // When
         let viewModel = WooShippingEditAddressViewModel(address: address,
+                                                        email: email,
                                                         isVerified: false,
                                                         storageManager: storageManager)
 
@@ -132,9 +134,9 @@ final class WooShippingEditAddressViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.state.value, address.state)
         XCTAssertEqual(viewModel.postalCode.value, address.postcode)
         XCTAssertEqual(viewModel.phone.value, address.phone)
-        XCTAssertEqual(viewModel.email.value, "")
+        XCTAssertEqual(viewModel.email.value, email)
         XCTAssertTrue(viewModel.showCompanyField)
-        XCTAssertEqual(viewModel.status, .missingInformation)
+        XCTAssertEqual(viewModel.status, .unverified)
         XCTAssertFalse(viewModel.showSaveAsDefault)
         XCTAssertEqual(viewModel.countries.count, 2, "Should include all countries for destination addresses")
     }