Open editing form for destination address

Author: rachelmcr

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

@@ -158,6 +158,9 @@ final class WooShippingEditAddressViewModel: ObservableObject, Identifiable {
     /// Closure called when an origin address is done being edited and the changes are confirmed.
     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)?
+
     init(type: AddressType,
          id: String,
          name: String,
@@ -176,7 +179,8 @@ final class WooShippingEditAddressViewModel: ObservableObject, Identifiable {
          stores: StoresManager = ServiceLocator.stores,
          storageManager: StorageManagerType = ServiceLocator.storageManager,
          debounceDelayInSeconds: Double = 1,
-         onOriginAddressEdited: ((WooShippingOriginAddress) -> Void)? = nil) {
+         onOriginAddressEdited: ((WooShippingOriginAddress) -> Void)? = nil,
+         onDestinationAddressEdited: ((WooShippingAddress) -> Void)? = nil) {
         self.addressType = type
         self.id = id
         self.name = WooShippingAddressField(type: .name, value: name, required: company.isEmpty, validate: { _ in return nil })
@@ -266,6 +270,31 @@ final class WooShippingEditAddressViewModel: ObservableObject, Identifiable {
                   onOriginAddressEdited: onAddressEdited)
     }
 
+    convenience init(address: WooShippingAddress?,
+                     isVerified: Bool,
+                     stores: StoresManager = ServiceLocator.stores,
+                     storageManager: StorageManagerType = ServiceLocator.storageManager,
+                     onAddressEdited: ((WooShippingAddress) -> Void)? = nil) {
+        self.init(type: .destination,
+                  id: UUID().uuidString,
+                  name: address?.name ?? "",
+                  company: address?.company ?? "",
+                  country: address?.country ?? "",
+                  address: address?.combinedAddress ?? "",
+                  city: address?.city ?? "",
+                  state: address?.state ?? "",
+                  postalCode: address?.postcode ?? "",
+                  email: "",
+                  phone: address?.phone ?? "",
+                  isDefaultAddress: false,
+                  showCompanyField: address?.company.isNotEmpty == true,
+                  isVerified: isVerified,
+                  phoneNumberRequired: false, // TODO: Check phone number requirements for destination address.
+                  stores: stores,
+                  storageManager: storageManager,
+                  onDestinationAddressEdited: onAddressEdited)
+    }
+
     /// Validates the address remotely.
     @MainActor
     func remotelyValidateAddress() async {

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

@@ -224,11 +224,18 @@ private extension WooShippingCreateLabelsView {
             }
             .frame(maxWidth: .infinity, alignment: .leading)
             PencilEditButton {
-                // TODO: Open destination address editing flow.
+                viewModel.editDestinationAddress()
             }
             .buttonStyle(TextButtonStyle())
         }
         .padding(Layout.bottomSheetPadding)
+        .sheet(item: $viewModel.addressToEdit) { addressToEdit in
+            NavigationStack {
+                WooShippingEditAddressView(viewModel: addressToEdit)
+                    .navigationTitle(Localization.BottomSheet.editDestination)
+                    .navigationBarTitleDisplayMode(.inline)
+            }
+        }
     }
 
     /// View showing the order details, such as order items and shipping costs.
@@ -431,6 +438,9 @@ private extension WooShippingCreateLabelsView {
                                                           value: "Purchase Label · %1$@",
                                                           comment: "Label for button to purchase the shipping label on the shipping label creation screen, " +
                                                           "including the label price. Reads like: 'Purchase Label · $7.63'")
+            static let editDestination = NSLocalizedString("wooShipping.createLabels.bottomSheet.editDestination",
+                                                          value: "Edit Destination",
+                                                          comment: "Title for the edit destination address screen in the shipping label creation flow")
         }
 
         enum AddressVerification {

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

@@ -8,7 +8,7 @@ import Combine
 final class WooShippingCreateLabelsViewModel: ObservableObject {
     private let currencyFormatter: CurrencyFormatter
     private let itemsDataSource: WooShippingItemsDataSource
-    private let destinationAddress: WooShippingAddress?
+    private var destinationAddress: WooShippingAddress?
     private let stores: StoresManager
     private var subscriptions: Set<AnyCancellable> = []
     private var debounceDuration: Double = 1
@@ -79,6 +79,10 @@ final class WooShippingCreateLabelsViewModel: ObservableObject {
     /// This property can be set to display a notice with the provided label about the destination address status.
     @Published var destinationAddressStatusNoticeLabel: String?
 
+    /// View model for address to edit.
+    /// Setting this property will navigate to the address edit screen.
+    @Published var addressToEdit: WooShippingEditAddressViewModel?
+
     /// Shipping lines for the order, with formatted amount.
     let shippingLines: [WooShipping_ShippingLineViewModel]
 
@@ -273,6 +277,20 @@ final class WooShippingCreateLabelsViewModel: ObservableObject {
     func onCustomsFormFilled(form: ShippingLabelCustomsForm) {
         customsForm = form
     }
+
+    /// Sets the `addressToEdit` property for editing the destination address.
+    /// After the address is edited, the destination address is replaced with the updated address.
+    func editDestinationAddress() {
+        addressToEdit = WooShippingEditAddressViewModel(address: destinationAddress,
+                                                        isVerified: destinationAddressStatus == .verified,
+                                                        onAddressEdited: { [weak self] editedAddress in
+            guard let self else {
+                return
+            }
+            destinationAddress = editedAddress
+            addressToEdit = nil // Dismisses address edit screen
+        })
+    }
 }
 
 // MARK: Remote

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

@@ -500,6 +500,17 @@ final class WooShippingCreateLabelsViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.destinationAddressStatus, .missing)
         XCTAssertNotNil(viewModel.destinationAddressStatusNoticeLabel)
     }
+
+    func test_editDestinationAddress_sets_addressToEdit_view_model() throws {
+        // Given
+        let viewModel = WooShippingCreateLabelsViewModel(order: Order.fake())
+
+        // When
+        viewModel.editDestinationAddress()
+
+        // Then
+        XCTAssertNotNil(viewModel.addressToEdit)
+    }
 }
 
 private extension WooShippingCreateLabelsViewModelTests {

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

@@ -102,6 +102,43 @@ final class WooShippingEditAddressViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.countries.count, 1, "Should only include USPS-supported countries for origin addresses")
     }
 
+    func test_destination_address_inits_with_expected_values() {
+        // Given
+        let storageManager = MockStorageManager()
+        let state = StateOfACountry(code: "NY", name: "New York")
+        let countries = [Country(code: "US", name: "United States", states: [state]), Country(code: "CA", name: "Canada", states: [])]
+        storageManager.insertSampleCountries(readOnlyCountries: countries)
+        let address = WooShippingAddress(company: "HEADQUARTERS",
+                                         name: "JANE DOE",
+                                         phone: "223-456-7890",
+                                         country: "US",
+                                         state: "NY",
+                                         address1: "15 ALGONKIN ST",
+                                         address2: "STE 100",
+                                         city: "TICONDEROGA",
+                                         postcode: "12883-1487")
+
+        // When
+        let viewModel = WooShippingEditAddressViewModel(address: address,
+                                                        isVerified: false,
+                                                        storageManager: storageManager)
+
+        // Then
+        XCTAssertEqual(viewModel.name.value, address.name)
+        XCTAssertEqual(viewModel.country.value, address.country)
+        XCTAssertEqual(viewModel.company.value, address.company)
+        XCTAssertEqual(viewModel.address.value, address.combinedAddress)
+        XCTAssertEqual(viewModel.city.value, address.city)
+        XCTAssertEqual(viewModel.state.value, address.state)
+        XCTAssertEqual(viewModel.postalCode.value, address.postcode)
+        XCTAssertEqual(viewModel.phone.value, address.phone)
+        XCTAssertEqual(viewModel.email.value, "")
+        XCTAssertTrue(viewModel.showCompanyField)
+        XCTAssertEqual(viewModel.status, .missingInformation)
+        XCTAssertFalse(viewModel.showSaveAsDefault)
+        XCTAssertEqual(viewModel.countries.count, 2, "Should include all countries for destination addresses")
+    }
+
     func test_it_validates_address_with_missing_information_and_sets_expected_status_on_init() {
         // Given & When
         let viewModel = WooShippingEditAddressViewModel(type: .destination,