Merge pull request #6662 from woocommerce/issue/6644-order-country-keyboard-suggestion-bug

[Order Creation] Handle keyboard predictive text entry for country and state selectors

Author: toupper

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/CountrySelectorCommand.swift

@@ -48,6 +48,7 @@ final class CountrySelectorCommand: ObservableListSelectorCommand {
             return data = countries
         }
 
-        data = countries.filter { $0.name.localizedCaseInsensitiveContains(term) }
+        // Trim the search term to remove newlines or whitespaces (e.g added from the keyboard predictive text) from both ends
+        data = countries.filter { $0.name.localizedCaseInsensitiveContains(term.trim()) }
     }
 }

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/StateSelectorCommand.swift

@@ -48,6 +48,7 @@ final class StateSelectorCommand: ObservableListSelectorCommand {
             return data = states
         }
 
-        data = states.filter { $0.name.localizedCaseInsensitiveContains(term) }
+        // Trim the search term to remove newlines or whitespaces (e.g added from the keyboard predictive text) from both ends
+        data = states.filter { $0.name.localizedCaseInsensitiveContains(term.trim()) }
     }
 }

WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Details/Addresses/CountrySelector/CountrySelectorViewModelTests.swift

@@ -40,6 +40,36 @@ final class CountrySelectorViewModelTests: XCTestCase {
         ])
     }
 
+    func test_filter_term_with_last_character_whitespace_return_expected_result() {
+        // Given
+        let binding = Binding<Country?>(get: { nil }, set: { _ in })
+        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: binding)
+
+        // When
+        viewModel.searchTerm = "Indonesia "
+        let countries = viewModel.command.data.map { $0.name }
+
+        // Then
+        assertEqual(countries, [
+            "Indonesia"
+        ])
+    }
+
+    func test_filter_term_with_last_character_newline_return_expected_result() {
+        // Given
+        let binding = Binding<Country?>(get: { nil }, set: { _ in })
+        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: binding)
+
+        // When
+        viewModel.searchTerm = "Indonesia\n"
+        let countries = viewModel.command.data.map { $0.name }
+
+        // Then
+        assertEqual(countries, [
+            "Indonesia"
+        ])
+    }
+
     func test_filter_countries_with_uppercase_letters_return_expected_results() {
         // Given
         let binding = Binding<Country?>(get: { nil }, set: { _ in })