fix(country selector): preselect the most likely country (#934)

openfoodfacts · Jan 13, 2022 · d403138 · d403138
1 parent 2dff9dc
commit d403138
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/packages/smooth_app/lib/pages/onboarding/country_selector.dart b/packages/smooth_app/lib/pages/onboarding/country_selector.dart
@@ -137,19 +137,15 @@ class _CountrySelectorState extends State<CountrySelector> {
     if (mostLikelyUserCountryCode == null) {
       return countries;
     }
-    Country? mostLikelyUserCountry;
     // Bring the most likely user country to top.
     for (final Country country in countries) {
-      if (country.countryCode == mostLikelyUserCountryCode) {
-        mostLikelyUserCountry = country;
-        break;
+      if (country.countryCode.toLowerCase() ==
+          mostLikelyUserCountryCode.toLowerCase()) {
+        countries.remove(country);
+        countries.insert(0, country);
+        return countries;
       }
     }
-    if (mostLikelyUserCountry == null) {
-      return countries;
-    }
-    countries.remove(mostLikelyUserCountry);
-    countries.insert(0, mostLikelyUserCountry);
     return countries;
   }
 }