Merge pull request #7119 from woocommerce/issue/6651-auto-select-country-state

rachelmcr · web-flow · commit b52c69022da8 · 2022-06-21T22:55:50.000+01:00
[Orders] Auto-confirm the selected country and state in the address form
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -2,7 +2,7 @@
 
 9.5
 -----
-
+- [*] Orders: The customer shipping/billing address form now navigates back automatically after selecting a country or state. [https://github.com/woocommerce/woocommerce-ios/pull/7119]
 
 9.4
 -----
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/CountrySelectorCommand.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/CountrySelectorCommand.swift
@@ -31,6 +31,7 @@ final class CountrySelectorCommand: ObservableListSelectorCommand {
 
     func handleSelectedChange(selected: Country, viewController: ViewController) {
         self.selected = selected
+        viewController.navigationController?.popViewController(animated: true)
     }
 
     func isSelected(model: Country) -> Bool {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/StateSelectorCommand.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/StateSelectorCommand.swift
@@ -31,6 +31,7 @@ final class StateSelectorCommand: ObservableListSelectorCommand {
 
     func handleSelectedChange(selected: StateOfACountry, viewController: ViewController) {
         self.selected = selected
+        viewController.navigationController?.popViewController(animated: true)
     }
 
     func isSelected(model: StateOfACountry) -> Bool {

-Original file line number
+Diff line change
 .5
 -----
+-
 +- [*] Orders: The customer shipping/billing address form now navigates back automatically after selecting a country or state. [https://github.com/woocommerce/woocommerce-ios/pull/7119]
 .4
 -----
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ final class CountrySelectorCommand: ObservableListSelectorCommand {`
`31`	`31`
`32`	`32`	`func handleSelectedChange(selected: Country, viewController: ViewController) {`
`33`	`33`	`self.selected = selected`
	`34`	`+ viewController.navigationController?.popViewController(animated: true)`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`func isSelected(model: Country) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ final class StateSelectorCommand: ObservableListSelectorCommand {`
`31`	`31`
`32`	`32`	`func handleSelectedChange(selected: StateOfACountry, viewController: ViewController) {`
`33`	`33`	`self.selected = selected`
	`34`	`+ viewController.navigationController?.popViewController(animated: true)`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`func isSelected(model: StateOfACountry) -> Bool {`