From c49dd19a17e2788752127c804f3e9d00097edb71 Mon Sep 17 00:00:00 2001
From: Oscar Spruit <oscar.spruit@adyen.com>
Date: Wed, 24 Apr 2024 13:05:54 +0200
Subject: [PATCH 1/4] Replace flags with ISO codes

COAND-849
---
 .../core/internal/util/CountryUtils.kt        | 483 +++++++++---------
 .../econtext/internal/ui/view/EContextView.kt |   9 +-
 .../mbway/internal/ui/view/MbWayView.kt       |   1 -
 .../ui/core/internal/ui/CountryViewHolder.kt  |   4 +-
 .../ui/core/internal/ui/model/CountryModel.kt |   3 +-
 ui-core/src/main/res/layout/country_view.xml  |   4 +-
 6 files changed, 250 insertions(+), 254 deletions(-)

diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/util/CountryUtils.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/util/CountryUtils.kt
index e9c9fbbf46..a146dc16ac 100644
--- a/components-core/src/main/java/com/adyen/checkout/components/core/internal/util/CountryUtils.kt
+++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/util/CountryUtils.kt
@@ -41,247 +41,247 @@ object CountryUtils {
     }
 
     private val countries = listOf(
-        CountryInfo(isoCode = "AF", callingCode = "+93", emoji = "🇦🇫"),
-        CountryInfo(isoCode = "AL", callingCode = "+355", emoji = "🇦🇱"),
-        CountryInfo(isoCode = "DZ", callingCode = "+213", emoji = "🇩🇿"),
-        CountryInfo(isoCode = "AS", callingCode = "+1684", emoji = "🇦🇸"),
-        CountryInfo(isoCode = "AD", callingCode = "+376", emoji = "🇦🇩"),
-        CountryInfo(isoCode = "AO", callingCode = "+244", emoji = "🇦🇴"),
-        CountryInfo(isoCode = "AI", callingCode = "+1264", emoji = "🇦🇮"),
-        CountryInfo(isoCode = "AG", callingCode = "+1268", emoji = "🇦🇬"),
-        CountryInfo(isoCode = "AR", callingCode = "+54", emoji = "🇦🇷"),
-        CountryInfo(isoCode = "AM", callingCode = "+374", emoji = "🇦🇲"),
-        CountryInfo(isoCode = "AW", callingCode = "+297", emoji = "🇦🇼"),
-        CountryInfo(isoCode = "AU", callingCode = "+61", emoji = "🇦🇺"),
-        CountryInfo(isoCode = "AT", callingCode = "+43", emoji = "🇦🇹"),
-        CountryInfo(isoCode = "AZ", callingCode = "+994", emoji = "🇦🇿"),
-        CountryInfo(isoCode = "BS", callingCode = "+1242", emoji = "🇧🇸"),
-        CountryInfo(isoCode = "BH", callingCode = "+973", emoji = "🇧🇭"),
-        CountryInfo(isoCode = "BD", callingCode = "+880", emoji = "🇧🇩"),
-        CountryInfo(isoCode = "BB", callingCode = "+1246", emoji = "🇧🇧"),
-        CountryInfo(isoCode = "BY", callingCode = "+375", emoji = "🇧🇾"),
-        CountryInfo(isoCode = "BE", callingCode = "+32", emoji = "🇧🇪"),
-        CountryInfo(isoCode = "BZ", callingCode = "+501", emoji = "🇧🇿"),
-        CountryInfo(isoCode = "BJ", callingCode = "+229", emoji = "🇧🇯"),
-        CountryInfo(isoCode = "BM", callingCode = "+1441", emoji = "🇧🇲"),
-        CountryInfo(isoCode = "BT", callingCode = "+975", emoji = "🇧🇹"),
-        CountryInfo(isoCode = "BA", callingCode = "+387", emoji = "🇧🇦"),
-        CountryInfo(isoCode = "BW", callingCode = "+267", emoji = "🇧🇼"),
-        CountryInfo(isoCode = "BR", callingCode = "+55", emoji = "🇧🇷"),
-        CountryInfo(isoCode = "IO", callingCode = "+246", emoji = "🇮🇴"),
-        CountryInfo(isoCode = "BG", callingCode = "+359", emoji = "🇧🇬"),
-        CountryInfo(isoCode = "BF", callingCode = "+226", emoji = "🇧🇫"),
-        CountryInfo(isoCode = "BI", callingCode = "+257", emoji = "🇧🇮"),
-        CountryInfo(isoCode = "KH", callingCode = "+855", emoji = "🇰🇭"),
-        CountryInfo(isoCode = "CM", callingCode = "+237", emoji = "🇨🇲"),
-        CountryInfo(isoCode = "CA", callingCode = "+1", emoji = "🇨🇦"),
-        CountryInfo(isoCode = "CV", callingCode = "+238", emoji = "🇨🇻"),
-        CountryInfo(isoCode = "KY", callingCode = "+345", emoji = "🇰🇾"),
-        CountryInfo(isoCode = "CF", callingCode = "+236", emoji = "🇨🇫"),
-        CountryInfo(isoCode = "TD", callingCode = "+235", emoji = "🇹🇩"),
-        CountryInfo(isoCode = "CL", callingCode = "+56", emoji = "🇨🇱"),
-        CountryInfo(isoCode = "CN", callingCode = "+86", emoji = "🇨🇳"),
-        CountryInfo(isoCode = "CX", callingCode = "+61", emoji = "🇨🇽"),
-        CountryInfo(isoCode = "CO", callingCode = "+57", emoji = "🇨🇴"),
-        CountryInfo(isoCode = "KM", callingCode = "+269", emoji = "🇰🇲"),
-        CountryInfo(isoCode = "CG", callingCode = "+242", emoji = "🇨🇬"),
-        CountryInfo(isoCode = "CK", callingCode = "+682", emoji = "🇨🇰"),
-        CountryInfo(isoCode = "CR", callingCode = "+506", emoji = "🇨🇷"),
-        CountryInfo(isoCode = "HR", callingCode = "+385", emoji = "🇭🇷"),
-        CountryInfo(isoCode = "CU", callingCode = "+53", emoji = "🇨🇺"),
-        CountryInfo(isoCode = "CY", callingCode = "+537", emoji = "🇨🇾"),
-        CountryInfo(isoCode = "CZ", callingCode = "+420", emoji = "🇨🇿"),
-        CountryInfo(isoCode = "DK", callingCode = "+45", emoji = "🇩🇰"),
-        CountryInfo(isoCode = "DJ", callingCode = "+253", emoji = "🇩🇯"),
-        CountryInfo(isoCode = "DM", callingCode = "+1767", emoji = "🇩🇲"),
-        CountryInfo(isoCode = "DO", callingCode = "+1849", emoji = "🇩🇴"),
-        CountryInfo(isoCode = "EC", callingCode = "+593", emoji = "🇪🇨"),
-        CountryInfo(isoCode = "EG", callingCode = "+20", emoji = "🇪🇬"),
-        CountryInfo(isoCode = "SV", callingCode = "+503", emoji = "🇸🇻"),
-        CountryInfo(isoCode = "GQ", callingCode = "+240", emoji = "🇬🇶"),
-        CountryInfo(isoCode = "ER", callingCode = "+291", emoji = "🇪🇷"),
-        CountryInfo(isoCode = "EE", callingCode = "+372", emoji = "🇪🇪"),
-        CountryInfo(isoCode = "ET", callingCode = "+251", emoji = "🇪🇹"),
-        CountryInfo(isoCode = "FO", callingCode = "+298", emoji = "🇫🇴"),
-        CountryInfo(isoCode = "FJ", callingCode = "+679", emoji = "🇫🇯"),
-        CountryInfo(isoCode = "FI", callingCode = "+358", emoji = "🇫🇮"),
-        CountryInfo(isoCode = "FR", callingCode = "+33", emoji = "🇫🇷"),
-        CountryInfo(isoCode = "GF", callingCode = "+594", emoji = "🇬🇫"),
-        CountryInfo(isoCode = "PF", callingCode = "+689", emoji = "🇵🇫"),
-        CountryInfo(isoCode = "GA", callingCode = "+241", emoji = "🇬🇦"),
-        CountryInfo(isoCode = "GM", callingCode = "+220", emoji = "🇬🇲"),
-        CountryInfo(isoCode = "GE", callingCode = "+995", emoji = "🇬🇪"),
-        CountryInfo(isoCode = "DE", callingCode = "+49", emoji = "🇩🇪"),
-        CountryInfo(isoCode = "GH", callingCode = "+233", emoji = "🇬🇭"),
-        CountryInfo(isoCode = "GI", callingCode = "+350", emoji = "🇬🇮"),
-        CountryInfo(isoCode = "GR", callingCode = "+30", emoji = "🇬🇷"),
-        CountryInfo(isoCode = "GL", callingCode = "+299", emoji = "🇬🇱"),
-        CountryInfo(isoCode = "GD", callingCode = "+1473", emoji = "🇬🇩"),
-        CountryInfo(isoCode = "GP", callingCode = "+590", emoji = "🇬🇵"),
-        CountryInfo(isoCode = "GU", callingCode = "+1671", emoji = "🇬🇺"),
-        CountryInfo(isoCode = "GT", callingCode = "+502", emoji = "🇬🇹"),
-        CountryInfo(isoCode = "GN", callingCode = "+224", emoji = "🇬🇳"),
-        CountryInfo(isoCode = "GW", callingCode = "+245", emoji = "🇬🇼"),
-        CountryInfo(isoCode = "GY", callingCode = "+595", emoji = "🇬🇾"),
-        CountryInfo(isoCode = "HT", callingCode = "+509", emoji = "🇭🇹"),
-        CountryInfo(isoCode = "HN", callingCode = "+504", emoji = "🇭🇳"),
-        CountryInfo(isoCode = "HU", callingCode = "+36", emoji = "🇭🇺"),
-        CountryInfo(isoCode = "IS", callingCode = "+354", emoji = "🇮🇸"),
-        CountryInfo(isoCode = "IN", callingCode = "+91", emoji = "🇮🇳"),
-        CountryInfo(isoCode = "ID", callingCode = "+62", emoji = "🇮🇩"),
-        CountryInfo(isoCode = "IQ", callingCode = "+964", emoji = "🇮🇶"),
-        CountryInfo(isoCode = "IE", callingCode = "+353", emoji = "🇮🇪"),
-        CountryInfo(isoCode = "IL", callingCode = "+972", emoji = "🇮🇱"),
-        CountryInfo(isoCode = "IT", callingCode = "+39", emoji = "🇮🇹"),
-        CountryInfo(isoCode = "JM", callingCode = "+1876", emoji = "🇯🇲"),
-        CountryInfo(isoCode = "JP", callingCode = "+81", emoji = "🇯🇵"),
-        CountryInfo(isoCode = "JO", callingCode = "+962", emoji = "🇯🇴"),
-        CountryInfo(isoCode = "KZ", callingCode = "+77", emoji = "🇰🇿"),
-        CountryInfo(isoCode = "KE", callingCode = "+254", emoji = "🇰🇪"),
-        CountryInfo(isoCode = "KI", callingCode = "+686", emoji = "🇰🇮"),
-        CountryInfo(isoCode = "KW", callingCode = "+965", emoji = "🇰🇼"),
-        CountryInfo(isoCode = "KG", callingCode = "+996", emoji = "🇰🇬"),
-        CountryInfo(isoCode = "LV", callingCode = "+371", emoji = "🇱🇻"),
-        CountryInfo(isoCode = "LB", callingCode = "+961", emoji = "🇱🇧"),
-        CountryInfo(isoCode = "LS", callingCode = "+266", emoji = "🇱🇸"),
-        CountryInfo(isoCode = "LR", callingCode = "+231", emoji = "🇱🇷"),
-        CountryInfo(isoCode = "LI", callingCode = "+423", emoji = "🇱🇮"),
-        CountryInfo(isoCode = "LT", callingCode = "+370", emoji = "🇱🇹"),
-        CountryInfo(isoCode = "LU", callingCode = "+352", emoji = "🇱🇺"),
-        CountryInfo(isoCode = "MG", callingCode = "+261", emoji = "🇲🇬"),
-        CountryInfo(isoCode = "MW", callingCode = "+265", emoji = "🇲🇼"),
-        CountryInfo(isoCode = "MY", callingCode = "+60", emoji = "🇲🇾"),
-        CountryInfo(isoCode = "MV", callingCode = "+960", emoji = "🇲🇻"),
-        CountryInfo(isoCode = "ML", callingCode = "+223", emoji = "🇲🇱"),
-        CountryInfo(isoCode = "MT", callingCode = "+356", emoji = "🇲🇹"),
-        CountryInfo(isoCode = "MH", callingCode = "+692", emoji = "🇲🇭"),
-        CountryInfo(isoCode = "MQ", callingCode = "+596", emoji = "🇲🇶"),
-        CountryInfo(isoCode = "MR", callingCode = "+222", emoji = "🇲🇷"),
-        CountryInfo(isoCode = "MU", callingCode = "+230", emoji = "🇲🇺"),
-        CountryInfo(isoCode = "YT", callingCode = "+262", emoji = "🇾🇹"),
-        CountryInfo(isoCode = "MX", callingCode = "+52", emoji = "🇲🇽"),
-        CountryInfo(isoCode = "MC", callingCode = "+377", emoji = "🇲🇨"),
-        CountryInfo(isoCode = "MN", callingCode = "+976", emoji = "🇲🇳"),
-        CountryInfo(isoCode = "ME", callingCode = "+382", emoji = "🇲🇪"),
-        CountryInfo(isoCode = "MS", callingCode = "+1664", emoji = "🇲🇸"),
-        CountryInfo(isoCode = "MA", callingCode = "+212", emoji = "🇲🇦"),
-        CountryInfo(isoCode = "MM", callingCode = "+95", emoji = "🇲🇲"),
-        CountryInfo(isoCode = "NA", callingCode = "+264", emoji = "🇳🇦"),
-        CountryInfo(isoCode = "NR", callingCode = "+674", emoji = "🇳🇷"),
-        CountryInfo(isoCode = "NP", callingCode = "+977", emoji = "🇳🇵"),
-        CountryInfo(isoCode = "NL", callingCode = "+31", emoji = "🇳🇱"),
-        CountryInfo(isoCode = "AN", callingCode = "+599", emoji = "🇦🇳"),
-        CountryInfo(isoCode = "NC", callingCode = "+687", emoji = "🇳🇨"),
-        CountryInfo(isoCode = "NZ", callingCode = "+64", emoji = "🇳🇿"),
-        CountryInfo(isoCode = "NI", callingCode = "+505", emoji = "🇳🇮"),
-        CountryInfo(isoCode = "NE", callingCode = "+227", emoji = "🇳🇪"),
-        CountryInfo(isoCode = "NG", callingCode = "+234", emoji = "🇳🇬"),
-        CountryInfo(isoCode = "NU", callingCode = "+683", emoji = "🇳🇺"),
-        CountryInfo(isoCode = "NF", callingCode = "+672", emoji = "🇳🇫"),
-        CountryInfo(isoCode = "MP", callingCode = "+1670", emoji = "🇲🇵"),
-        CountryInfo(isoCode = "NO", callingCode = "+47", emoji = "🇳🇴"),
-        CountryInfo(isoCode = "OM", callingCode = "+968", emoji = "🇴🇲"),
-        CountryInfo(isoCode = "PK", callingCode = "+92", emoji = "🇵🇰"),
-        CountryInfo(isoCode = "PW", callingCode = "+680", emoji = "🇵🇼"),
-        CountryInfo(isoCode = "PA", callingCode = "+507", emoji = "🇵🇦"),
-        CountryInfo(isoCode = "PG", callingCode = "+675", emoji = "🇵🇬"),
-        CountryInfo(isoCode = "PY", callingCode = "+595", emoji = "🇵🇾"),
-        CountryInfo(isoCode = "PE", callingCode = "+51", emoji = "🇵🇪"),
-        CountryInfo(isoCode = "PH", callingCode = "+63", emoji = "🇵🇭"),
-        CountryInfo(isoCode = "PL", callingCode = "+48", emoji = "🇵🇱"),
-        CountryInfo(isoCode = "PT", callingCode = "+351", emoji = "🇵🇹"),
-        CountryInfo(isoCode = "PR", callingCode = "+1939", emoji = "🇵🇷"),
-        CountryInfo(isoCode = "QA", callingCode = "+974", emoji = "🇶🇦"),
-        CountryInfo(isoCode = "RO", callingCode = "+40", emoji = "🇷🇴"),
-        CountryInfo(isoCode = "RW", callingCode = "+250", emoji = "🇷🇼"),
-        CountryInfo(isoCode = "WS", callingCode = "+685", emoji = "🇼🇸"),
-        CountryInfo(isoCode = "SM", callingCode = "+378", emoji = "🇸🇲"),
-        CountryInfo(isoCode = "SA", callingCode = "+966", emoji = "🇸🇦"),
-        CountryInfo(isoCode = "SN", callingCode = "+221", emoji = "🇸🇳"),
-        CountryInfo(isoCode = "RS", callingCode = "+381", emoji = "🇷🇸"),
-        CountryInfo(isoCode = "SC", callingCode = "+248", emoji = "🇸🇨"),
-        CountryInfo(isoCode = "SL", callingCode = "+232", emoji = "🇸🇱"),
-        CountryInfo(isoCode = "SG", callingCode = "+65", emoji = "🇸🇬"),
-        CountryInfo(isoCode = "SK", callingCode = "+421", emoji = "🇸🇰"),
-        CountryInfo(isoCode = "SI", callingCode = "+386", emoji = "🇸🇮"),
-        CountryInfo(isoCode = "SB", callingCode = "+677", emoji = "🇸🇧"),
-        CountryInfo(isoCode = "ZA", callingCode = "+27", emoji = "🇿🇦"),
-        CountryInfo(isoCode = "GS", callingCode = "+500", emoji = "🇬🇸"),
-        CountryInfo(isoCode = "ES", callingCode = "+34", emoji = "🇪🇸"),
-        CountryInfo(isoCode = "LK", callingCode = "+94", emoji = "🇱🇰"),
-        CountryInfo(isoCode = "SD", callingCode = "+249", emoji = "🇸🇩"),
-        CountryInfo(isoCode = "SR", callingCode = "+597", emoji = "🇸🇷"),
-        CountryInfo(isoCode = "SZ", callingCode = "+268", emoji = "🇸🇿"),
-        CountryInfo(isoCode = "SE", callingCode = "+46", emoji = "🇸🇪"),
-        CountryInfo(isoCode = "CH", callingCode = "+41", emoji = "🇨🇭"),
-        CountryInfo(isoCode = "TJ", callingCode = "+992", emoji = "🇹🇯"),
-        CountryInfo(isoCode = "TH", callingCode = "+66", emoji = "🇹🇭"),
-        CountryInfo(isoCode = "TG", callingCode = "+228", emoji = "🇹🇬"),
-        CountryInfo(isoCode = "TK", callingCode = "+690", emoji = "🇹🇰"),
-        CountryInfo(isoCode = "TO", callingCode = "+676", emoji = "🇹🇴"),
-        CountryInfo(isoCode = "TT", callingCode = "+1868", emoji = "🇹🇹"),
-        CountryInfo(isoCode = "TN", callingCode = "+216", emoji = "🇹🇳"),
-        CountryInfo(isoCode = "TR", callingCode = "+90", emoji = "🇹🇷"),
-        CountryInfo(isoCode = "TM", callingCode = "+993", emoji = "🇹🇲"),
-        CountryInfo(isoCode = "TC", callingCode = "+1649", emoji = "🇹🇨"),
-        CountryInfo(isoCode = "TV", callingCode = "+688", emoji = "🇹🇻"),
-        CountryInfo(isoCode = "UG", callingCode = "+256", emoji = "🇺🇬"),
-        CountryInfo(isoCode = "UA", callingCode = "+380", emoji = "🇺🇦"),
-        CountryInfo(isoCode = "AE", callingCode = "+971", emoji = "🇦🇪"),
-        CountryInfo(isoCode = "GB", callingCode = "+44", emoji = "🇬🇧"),
-        CountryInfo(isoCode = "US", callingCode = "+1", emoji = "🇺🇸"),
-        CountryInfo(isoCode = "UY", callingCode = "+598", emoji = "🇺🇾"),
-        CountryInfo(isoCode = "UZ", callingCode = "+998", emoji = "🇺🇿"),
-        CountryInfo(isoCode = "VU", callingCode = "+678", emoji = "🇻🇺"),
-        CountryInfo(isoCode = "WF", callingCode = "+681", emoji = "🇼🇫"),
-        CountryInfo(isoCode = "YE", callingCode = "+967", emoji = "🇾🇪"),
-        CountryInfo(isoCode = "ZM", callingCode = "+260", emoji = "🇿🇲"),
-        CountryInfo(isoCode = "ZW", callingCode = "+263", emoji = "🇿🇼"),
-        CountryInfo(isoCode = "AX", callingCode = "+358", emoji = "🇦🇽"),
-        CountryInfo(isoCode = "AQ", callingCode = "+672", emoji = "🇦🇶"),
-        CountryInfo(isoCode = "BO", callingCode = "+591", emoji = "🇧🇴"),
-        CountryInfo(isoCode = "BN", callingCode = "+673", emoji = "🇧🇳"),
-        CountryInfo(isoCode = "CC", callingCode = "+61", emoji = "🇨🇨"),
-        CountryInfo(isoCode = "CD", callingCode = "+243", emoji = "🇨🇩"),
-        CountryInfo(isoCode = "CI", callingCode = "+225", emoji = "🇨🇮"),
-        CountryInfo(isoCode = "FK", callingCode = "+500", emoji = "🇫🇰"),
-        CountryInfo(isoCode = "GG", callingCode = "+44", emoji = "🇬🇬"),
-        CountryInfo(isoCode = "VA", callingCode = "+379", emoji = "🇻🇦"),
-        CountryInfo(isoCode = "HK", callingCode = "+852", emoji = "🇭🇰"),
-        CountryInfo(isoCode = "IR", callingCode = "+98", emoji = "🇮🇷"),
-        CountryInfo(isoCode = "IM", callingCode = "+44", emoji = "🇮🇲"),
-        CountryInfo(isoCode = "JE", callingCode = "+44", emoji = "🇯🇪"),
-        CountryInfo(isoCode = "KP", callingCode = "+850", emoji = "🇰🇵"),
-        CountryInfo(isoCode = "KR", callingCode = "+82", emoji = "🇰🇷"),
-        CountryInfo(isoCode = "LA", callingCode = "+856", emoji = "🇱🇦"),
-        CountryInfo(isoCode = "LY", callingCode = "+218", emoji = "🇱🇾"),
-        CountryInfo(isoCode = "MO", callingCode = "+853", emoji = "🇲🇴"),
-        CountryInfo(isoCode = "MK", callingCode = "+389", emoji = "🇲🇰"),
-        CountryInfo(isoCode = "FM", callingCode = "+691", emoji = "🇫🇲"),
-        CountryInfo(isoCode = "MD", callingCode = "+373", emoji = "🇲🇩"),
-        CountryInfo(isoCode = "MZ", callingCode = "+258", emoji = "🇲🇿"),
-        CountryInfo(isoCode = "PS", callingCode = "+970", emoji = "🇵🇸"),
-        CountryInfo(isoCode = "PN", callingCode = "+872", emoji = "🇵🇳"),
-        CountryInfo(isoCode = "RE", callingCode = "+262", emoji = "🇷🇪"),
-        CountryInfo(isoCode = "RU", callingCode = "+7", emoji = "🇷🇺"),
-        CountryInfo(isoCode = "BL", callingCode = "+590", emoji = "🇧🇱"),
-        CountryInfo(isoCode = "SH", callingCode = "+290", emoji = "🇸🇭"),
-        CountryInfo(isoCode = "KN", callingCode = "+1869", emoji = "🇰🇳"),
-        CountryInfo(isoCode = "LC", callingCode = "+1758", emoji = "🇱🇨"),
-        CountryInfo(isoCode = "MF", callingCode = "+590", emoji = "🇲🇫"),
-        CountryInfo(isoCode = "PM", callingCode = "+508", emoji = "🇵🇲"),
-        CountryInfo(isoCode = "VC", callingCode = "+1784", emoji = "🇻🇨"),
-        CountryInfo(isoCode = "ST", callingCode = "+239", emoji = "🇸🇹"),
-        CountryInfo(isoCode = "SO", callingCode = "+252", emoji = "🇸🇴"),
-        CountryInfo(isoCode = "SJ", callingCode = "+47", emoji = "🇸🇯"),
-        CountryInfo(isoCode = "SY", callingCode = "+963", emoji = "🇸🇾"),
-        CountryInfo(isoCode = "TW", callingCode = "+886", emoji = "🇹🇼"),
-        CountryInfo(isoCode = "TZ", callingCode = "+255", emoji = "🇹🇿"),
-        CountryInfo(isoCode = "TL", callingCode = "+670", emoji = "🇹🇱"),
-        CountryInfo(isoCode = "VE", callingCode = "+58", emoji = "🇻🇪"),
-        CountryInfo(isoCode = "VN", callingCode = "+84", emoji = "🇻🇳"),
-        CountryInfo(isoCode = "VG", callingCode = "+1284", emoji = "🇻🇬"),
-        CountryInfo(isoCode = "VI", callingCode = "+1340", emoji = "🇻🇮")
+        CountryInfo(isoCode = "AF", callingCode = "+93"),
+        CountryInfo(isoCode = "AL", callingCode = "+355"),
+        CountryInfo(isoCode = "DZ", callingCode = "+213"),
+        CountryInfo(isoCode = "AS", callingCode = "+1684"),
+        CountryInfo(isoCode = "AD", callingCode = "+376"),
+        CountryInfo(isoCode = "AO", callingCode = "+244"),
+        CountryInfo(isoCode = "AI", callingCode = "+1264"),
+        CountryInfo(isoCode = "AG", callingCode = "+1268"),
+        CountryInfo(isoCode = "AR", callingCode = "+54"),
+        CountryInfo(isoCode = "AM", callingCode = "+374"),
+        CountryInfo(isoCode = "AW", callingCode = "+297"),
+        CountryInfo(isoCode = "AU", callingCode = "+61"),
+        CountryInfo(isoCode = "AT", callingCode = "+43"),
+        CountryInfo(isoCode = "AZ", callingCode = "+994"),
+        CountryInfo(isoCode = "BS", callingCode = "+1242"),
+        CountryInfo(isoCode = "BH", callingCode = "+973"),
+        CountryInfo(isoCode = "BD", callingCode = "+880"),
+        CountryInfo(isoCode = "BB", callingCode = "+1246"),
+        CountryInfo(isoCode = "BY", callingCode = "+375"),
+        CountryInfo(isoCode = "BE", callingCode = "+32"),
+        CountryInfo(isoCode = "BZ", callingCode = "+501"),
+        CountryInfo(isoCode = "BJ", callingCode = "+229"),
+        CountryInfo(isoCode = "BM", callingCode = "+1441"),
+        CountryInfo(isoCode = "BT", callingCode = "+975"),
+        CountryInfo(isoCode = "BA", callingCode = "+387"),
+        CountryInfo(isoCode = "BW", callingCode = "+267"),
+        CountryInfo(isoCode = "BR", callingCode = "+55"),
+        CountryInfo(isoCode = "IO", callingCode = "+246"),
+        CountryInfo(isoCode = "BG", callingCode = "+359"),
+        CountryInfo(isoCode = "BF", callingCode = "+226"),
+        CountryInfo(isoCode = "BI", callingCode = "+257"),
+        CountryInfo(isoCode = "KH", callingCode = "+855"),
+        CountryInfo(isoCode = "CM", callingCode = "+237"),
+        CountryInfo(isoCode = "CA", callingCode = "+1"),
+        CountryInfo(isoCode = "CV", callingCode = "+238"),
+        CountryInfo(isoCode = "KY", callingCode = "+345"),
+        CountryInfo(isoCode = "CF", callingCode = "+236"),
+        CountryInfo(isoCode = "TD", callingCode = "+235"),
+        CountryInfo(isoCode = "CL", callingCode = "+56"),
+        CountryInfo(isoCode = "CN", callingCode = "+86"),
+        CountryInfo(isoCode = "CX", callingCode = "+61"),
+        CountryInfo(isoCode = "CO", callingCode = "+57"),
+        CountryInfo(isoCode = "KM", callingCode = "+269"),
+        CountryInfo(isoCode = "CG", callingCode = "+242"),
+        CountryInfo(isoCode = "CK", callingCode = "+682"),
+        CountryInfo(isoCode = "CR", callingCode = "+506"),
+        CountryInfo(isoCode = "HR", callingCode = "+385"),
+        CountryInfo(isoCode = "CU", callingCode = "+53"),
+        CountryInfo(isoCode = "CY", callingCode = "+537"),
+        CountryInfo(isoCode = "CZ", callingCode = "+420"),
+        CountryInfo(isoCode = "DK", callingCode = "+45"),
+        CountryInfo(isoCode = "DJ", callingCode = "+253"),
+        CountryInfo(isoCode = "DM", callingCode = "+1767"),
+        CountryInfo(isoCode = "DO", callingCode = "+1849"),
+        CountryInfo(isoCode = "EC", callingCode = "+593"),
+        CountryInfo(isoCode = "EG", callingCode = "+20"),
+        CountryInfo(isoCode = "SV", callingCode = "+503"),
+        CountryInfo(isoCode = "GQ", callingCode = "+240"),
+        CountryInfo(isoCode = "ER", callingCode = "+291"),
+        CountryInfo(isoCode = "EE", callingCode = "+372"),
+        CountryInfo(isoCode = "ET", callingCode = "+251"),
+        CountryInfo(isoCode = "FO", callingCode = "+298"),
+        CountryInfo(isoCode = "FJ", callingCode = "+679"),
+        CountryInfo(isoCode = "FI", callingCode = "+358"),
+        CountryInfo(isoCode = "FR", callingCode = "+33"),
+        CountryInfo(isoCode = "GF", callingCode = "+594"),
+        CountryInfo(isoCode = "PF", callingCode = "+689"),
+        CountryInfo(isoCode = "GA", callingCode = "+241"),
+        CountryInfo(isoCode = "GM", callingCode = "+220"),
+        CountryInfo(isoCode = "GE", callingCode = "+995"),
+        CountryInfo(isoCode = "DE", callingCode = "+49"),
+        CountryInfo(isoCode = "GH", callingCode = "+233"),
+        CountryInfo(isoCode = "GI", callingCode = "+350"),
+        CountryInfo(isoCode = "GR", callingCode = "+30"),
+        CountryInfo(isoCode = "GL", callingCode = "+299"),
+        CountryInfo(isoCode = "GD", callingCode = "+1473"),
+        CountryInfo(isoCode = "GP", callingCode = "+590"),
+        CountryInfo(isoCode = "GU", callingCode = "+1671"),
+        CountryInfo(isoCode = "GT", callingCode = "+502"),
+        CountryInfo(isoCode = "GN", callingCode = "+224"),
+        CountryInfo(isoCode = "GW", callingCode = "+245"),
+        CountryInfo(isoCode = "GY", callingCode = "+595"),
+        CountryInfo(isoCode = "HT", callingCode = "+509"),
+        CountryInfo(isoCode = "HN", callingCode = "+504"),
+        CountryInfo(isoCode = "HU", callingCode = "+36"),
+        CountryInfo(isoCode = "IS", callingCode = "+354"),
+        CountryInfo(isoCode = "IN", callingCode = "+91"),
+        CountryInfo(isoCode = "ID", callingCode = "+62"),
+        CountryInfo(isoCode = "IQ", callingCode = "+964"),
+        CountryInfo(isoCode = "IE", callingCode = "+353"),
+        CountryInfo(isoCode = "IL", callingCode = "+972"),
+        CountryInfo(isoCode = "IT", callingCode = "+39"),
+        CountryInfo(isoCode = "JM", callingCode = "+1876"),
+        CountryInfo(isoCode = "JP", callingCode = "+81"),
+        CountryInfo(isoCode = "JO", callingCode = "+962"),
+        CountryInfo(isoCode = "KZ", callingCode = "+77"),
+        CountryInfo(isoCode = "KE", callingCode = "+254"),
+        CountryInfo(isoCode = "KI", callingCode = "+686"),
+        CountryInfo(isoCode = "KW", callingCode = "+965"),
+        CountryInfo(isoCode = "KG", callingCode = "+996"),
+        CountryInfo(isoCode = "LV", callingCode = "+371"),
+        CountryInfo(isoCode = "LB", callingCode = "+961"),
+        CountryInfo(isoCode = "LS", callingCode = "+266"),
+        CountryInfo(isoCode = "LR", callingCode = "+231"),
+        CountryInfo(isoCode = "LI", callingCode = "+423"),
+        CountryInfo(isoCode = "LT", callingCode = "+370"),
+        CountryInfo(isoCode = "LU", callingCode = "+352"),
+        CountryInfo(isoCode = "MG", callingCode = "+261"),
+        CountryInfo(isoCode = "MW", callingCode = "+265"),
+        CountryInfo(isoCode = "MY", callingCode = "+60"),
+        CountryInfo(isoCode = "MV", callingCode = "+960"),
+        CountryInfo(isoCode = "ML", callingCode = "+223"),
+        CountryInfo(isoCode = "MT", callingCode = "+356"),
+        CountryInfo(isoCode = "MH", callingCode = "+692"),
+        CountryInfo(isoCode = "MQ", callingCode = "+596"),
+        CountryInfo(isoCode = "MR", callingCode = "+222"),
+        CountryInfo(isoCode = "MU", callingCode = "+230"),
+        CountryInfo(isoCode = "YT", callingCode = "+262"),
+        CountryInfo(isoCode = "MX", callingCode = "+52"),
+        CountryInfo(isoCode = "MC", callingCode = "+377"),
+        CountryInfo(isoCode = "MN", callingCode = "+976"),
+        CountryInfo(isoCode = "ME", callingCode = "+382"),
+        CountryInfo(isoCode = "MS", callingCode = "+1664"),
+        CountryInfo(isoCode = "MA", callingCode = "+212"),
+        CountryInfo(isoCode = "MM", callingCode = "+95"),
+        CountryInfo(isoCode = "NA", callingCode = "+264"),
+        CountryInfo(isoCode = "NR", callingCode = "+674"),
+        CountryInfo(isoCode = "NP", callingCode = "+977"),
+        CountryInfo(isoCode = "NL", callingCode = "+31"),
+        CountryInfo(isoCode = "AN", callingCode = "+599"),
+        CountryInfo(isoCode = "NC", callingCode = "+687"),
+        CountryInfo(isoCode = "NZ", callingCode = "+64"),
+        CountryInfo(isoCode = "NI", callingCode = "+505"),
+        CountryInfo(isoCode = "NE", callingCode = "+227"),
+        CountryInfo(isoCode = "NG", callingCode = "+234"),
+        CountryInfo(isoCode = "NU", callingCode = "+683"),
+        CountryInfo(isoCode = "NF", callingCode = "+672"),
+        CountryInfo(isoCode = "MP", callingCode = "+1670"),
+        CountryInfo(isoCode = "NO", callingCode = "+47"),
+        CountryInfo(isoCode = "OM", callingCode = "+968"),
+        CountryInfo(isoCode = "PK", callingCode = "+92"),
+        CountryInfo(isoCode = "PW", callingCode = "+680"),
+        CountryInfo(isoCode = "PA", callingCode = "+507"),
+        CountryInfo(isoCode = "PG", callingCode = "+675"),
+        CountryInfo(isoCode = "PY", callingCode = "+595"),
+        CountryInfo(isoCode = "PE", callingCode = "+51"),
+        CountryInfo(isoCode = "PH", callingCode = "+63"),
+        CountryInfo(isoCode = "PL", callingCode = "+48"),
+        CountryInfo(isoCode = "PT", callingCode = "+351"),
+        CountryInfo(isoCode = "PR", callingCode = "+1939"),
+        CountryInfo(isoCode = "QA", callingCode = "+974"),
+        CountryInfo(isoCode = "RO", callingCode = "+40"),
+        CountryInfo(isoCode = "RW", callingCode = "+250"),
+        CountryInfo(isoCode = "WS", callingCode = "+685"),
+        CountryInfo(isoCode = "SM", callingCode = "+378"),
+        CountryInfo(isoCode = "SA", callingCode = "+966"),
+        CountryInfo(isoCode = "SN", callingCode = "+221"),
+        CountryInfo(isoCode = "RS", callingCode = "+381"),
+        CountryInfo(isoCode = "SC", callingCode = "+248"),
+        CountryInfo(isoCode = "SL", callingCode = "+232"),
+        CountryInfo(isoCode = "SG", callingCode = "+65"),
+        CountryInfo(isoCode = "SK", callingCode = "+421"),
+        CountryInfo(isoCode = "SI", callingCode = "+386"),
+        CountryInfo(isoCode = "SB", callingCode = "+677"),
+        CountryInfo(isoCode = "ZA", callingCode = "+27"),
+        CountryInfo(isoCode = "GS", callingCode = "+500"),
+        CountryInfo(isoCode = "ES", callingCode = "+34"),
+        CountryInfo(isoCode = "LK", callingCode = "+94"),
+        CountryInfo(isoCode = "SD", callingCode = "+249"),
+        CountryInfo(isoCode = "SR", callingCode = "+597"),
+        CountryInfo(isoCode = "SZ", callingCode = "+268"),
+        CountryInfo(isoCode = "SE", callingCode = "+46"),
+        CountryInfo(isoCode = "CH", callingCode = "+41"),
+        CountryInfo(isoCode = "TJ", callingCode = "+992"),
+        CountryInfo(isoCode = "TH", callingCode = "+66"),
+        CountryInfo(isoCode = "TG", callingCode = "+228"),
+        CountryInfo(isoCode = "TK", callingCode = "+690"),
+        CountryInfo(isoCode = "TO", callingCode = "+676"),
+        CountryInfo(isoCode = "TT", callingCode = "+1868"),
+        CountryInfo(isoCode = "TN", callingCode = "+216"),
+        CountryInfo(isoCode = "TR", callingCode = "+90"),
+        CountryInfo(isoCode = "TM", callingCode = "+993"),
+        CountryInfo(isoCode = "TC", callingCode = "+1649"),
+        CountryInfo(isoCode = "TV", callingCode = "+688"),
+        CountryInfo(isoCode = "UG", callingCode = "+256"),
+        CountryInfo(isoCode = "UA", callingCode = "+380"),
+        CountryInfo(isoCode = "AE", callingCode = "+971"),
+        CountryInfo(isoCode = "GB", callingCode = "+44"),
+        CountryInfo(isoCode = "US", callingCode = "+1"),
+        CountryInfo(isoCode = "UY", callingCode = "+598"),
+        CountryInfo(isoCode = "UZ", callingCode = "+998"),
+        CountryInfo(isoCode = "VU", callingCode = "+678"),
+        CountryInfo(isoCode = "WF", callingCode = "+681"),
+        CountryInfo(isoCode = "YE", callingCode = "+967"),
+        CountryInfo(isoCode = "ZM", callingCode = "+260"),
+        CountryInfo(isoCode = "ZW", callingCode = "+263"),
+        CountryInfo(isoCode = "AX", callingCode = "+358"),
+        CountryInfo(isoCode = "AQ", callingCode = "+672"),
+        CountryInfo(isoCode = "BO", callingCode = "+591"),
+        CountryInfo(isoCode = "BN", callingCode = "+673"),
+        CountryInfo(isoCode = "CC", callingCode = "+61"),
+        CountryInfo(isoCode = "CD", callingCode = "+243"),
+        CountryInfo(isoCode = "CI", callingCode = "+225"),
+        CountryInfo(isoCode = "FK", callingCode = "+500"),
+        CountryInfo(isoCode = "GG", callingCode = "+44"),
+        CountryInfo(isoCode = "VA", callingCode = "+379"),
+        CountryInfo(isoCode = "HK", callingCode = "+852"),
+        CountryInfo(isoCode = "IR", callingCode = "+98"),
+        CountryInfo(isoCode = "IM", callingCode = "+44"),
+        CountryInfo(isoCode = "JE", callingCode = "+44"),
+        CountryInfo(isoCode = "KP", callingCode = "+850"),
+        CountryInfo(isoCode = "KR", callingCode = "+82"),
+        CountryInfo(isoCode = "LA", callingCode = "+856"),
+        CountryInfo(isoCode = "LY", callingCode = "+218"),
+        CountryInfo(isoCode = "MO", callingCode = "+853"),
+        CountryInfo(isoCode = "MK", callingCode = "+389"),
+        CountryInfo(isoCode = "FM", callingCode = "+691"),
+        CountryInfo(isoCode = "MD", callingCode = "+373"),
+        CountryInfo(isoCode = "MZ", callingCode = "+258"),
+        CountryInfo(isoCode = "PS", callingCode = "+970"),
+        CountryInfo(isoCode = "PN", callingCode = "+872"),
+        CountryInfo(isoCode = "RE", callingCode = "+262"),
+        CountryInfo(isoCode = "RU", callingCode = "+7"),
+        CountryInfo(isoCode = "BL", callingCode = "+590"),
+        CountryInfo(isoCode = "SH", callingCode = "+290"),
+        CountryInfo(isoCode = "KN", callingCode = "+1869"),
+        CountryInfo(isoCode = "LC", callingCode = "+1758"),
+        CountryInfo(isoCode = "MF", callingCode = "+590"),
+        CountryInfo(isoCode = "PM", callingCode = "+508"),
+        CountryInfo(isoCode = "VC", callingCode = "+1784"),
+        CountryInfo(isoCode = "ST", callingCode = "+239"),
+        CountryInfo(isoCode = "SO", callingCode = "+252"),
+        CountryInfo(isoCode = "SJ", callingCode = "+47"),
+        CountryInfo(isoCode = "SY", callingCode = "+963"),
+        CountryInfo(isoCode = "TW", callingCode = "+886"),
+        CountryInfo(isoCode = "TZ", callingCode = "+255"),
+        CountryInfo(isoCode = "TL", callingCode = "+670"),
+        CountryInfo(isoCode = "VE", callingCode = "+58"),
+        CountryInfo(isoCode = "VN", callingCode = "+84"),
+        CountryInfo(isoCode = "VG", callingCode = "+1284"),
+        CountryInfo(isoCode = "VI", callingCode = "+1340")
     )
 }
 
@@ -292,5 +292,4 @@ object CountryUtils {
 data class CountryInfo(
     val isoCode: String,
     val callingCode: String,
-    val emoji: String
 )
diff --git a/econtext/src/main/java/com/adyen/checkout/econtext/internal/ui/view/EContextView.kt b/econtext/src/main/java/com/adyen/checkout/econtext/internal/ui/view/EContextView.kt
index 9cb4c47d41..617b064ce3 100644
--- a/econtext/src/main/java/com/adyen/checkout/econtext/internal/ui/view/EContextView.kt
+++ b/econtext/src/main/java/com/adyen/checkout/econtext/internal/ui/view/EContextView.kt
@@ -104,19 +104,19 @@ internal class EContextView @JvmOverloads constructor(
     private fun initLocalizedStrings(localizedContext: Context) {
         binding.textInputLayoutFirstName.setLocalizedHintFromStyle(
             R.style.AdyenCheckout_EContext_FirstNameInput,
-            localizedContext
+            localizedContext,
         )
         binding.textInputLayoutLastName.setLocalizedHintFromStyle(
             R.style.AdyenCheckout_EContext_LastNameInput,
-            localizedContext
+            localizedContext,
         )
         binding.textInputLayoutMobileNumber.setLocalizedHintFromStyle(
             R.style.AdyenCheckout_EContext_PhoneNumberInput,
-            localizedContext
+            localizedContext,
         )
         binding.textInputLayoutEmailAddress.setLocalizedHintFromStyle(
             R.style.AdyenCheckout_EContext_ShopperEmailInput,
-            localizedContext
+            localizedContext,
         )
     }
 
@@ -163,7 +163,6 @@ internal class EContextView @JvmOverloads constructor(
                 isoCode = it.isoCode,
                 countryName = CountryUtils.getCountryName(it.isoCode, delegate.componentParams.shopperLocale),
                 callingCode = it.callingCode,
-                emoji = it.emoji
             )
         }
         countryAdapter = CountryAdapter(context, localizedContext).apply {
diff --git a/mbway/src/main/java/com/adyen/checkout/mbway/internal/ui/view/MbWayView.kt b/mbway/src/main/java/com/adyen/checkout/mbway/internal/ui/view/MbWayView.kt
index 96a3bd898b..33d3fead31 100644
--- a/mbway/src/main/java/com/adyen/checkout/mbway/internal/ui/view/MbWayView.kt
+++ b/mbway/src/main/java/com/adyen/checkout/mbway/internal/ui/view/MbWayView.kt
@@ -122,7 +122,6 @@ internal class MbWayView @JvmOverloads constructor(
             isoCode = it.isoCode,
             countryName = CountryUtils.getCountryName(it.isoCode, delegate.componentParams.shopperLocale),
             callingCode = it.callingCode,
-            emoji = it.emoji,
         )
     }
 }
diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/CountryViewHolder.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/CountryViewHolder.kt
index 7717f8f462..d800c9b8aa 100644
--- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/CountryViewHolder.kt
+++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/CountryViewHolder.kt
@@ -17,11 +17,11 @@ internal class CountryViewHolder(private val binding: CountryViewBinding) : Recy
 
     fun bindItem(country: CountryModel) {
         with(binding) {
-            textViewFlag.text = country.emoji
+            textViewCountryCode.text = country.isoCode
             textViewCountry.text = root.context.getString(
                 R.string.checkout_country_name_format,
                 country.countryName,
-                country.callingCode
+                country.callingCode,
             )
         }
     }
diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/model/CountryModel.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/model/CountryModel.kt
index 869fef5cef..815033b45d 100644
--- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/model/CountryModel.kt
+++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/model/CountryModel.kt
@@ -15,9 +15,8 @@ data class CountryModel(
     val isoCode: String,
     val countryName: String,
     val callingCode: String,
-    val emoji: String
 ) {
     fun toShortString(): String {
-        return "$emoji $callingCode"
+        return "$isoCode $callingCode"
     }
 }
diff --git a/ui-core/src/main/res/layout/country_view.xml b/ui-core/src/main/res/layout/country_view.xml
index cf188f51a4..073dde3d45 100644
--- a/ui-core/src/main/res/layout/country_view.xml
+++ b/ui-core/src/main/res/layout/country_view.xml
@@ -14,13 +14,13 @@
     android:padding="@dimen/standard_three_quarters_margin">
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/textView_flag"
+        android:id="@+id/textView_countryCode"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginEnd="@dimen/standard_half_margin"
         android:textSize="16sp"
-        tools:text="🇳🇱" />
+        tools:text="NL" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/textView_country"

From 02120688fd493a96ec4f0cbb700bd029feb34c58 Mon Sep 17 00:00:00 2001
From: Oscar Spruit <oscar.spruit@adyen.com>
Date: Wed, 24 Apr 2024 13:17:10 +0200
Subject: [PATCH 2/4] Update related strings

COAND-849
---
 example-app/src/main/res/values/strings.xml    | 4 ++--
 ui-core/src/main/res/values-ar/strings.xml     | 4 ++--
 ui-core/src/main/res/values-cs-rCZ/strings.xml | 4 ++--
 ui-core/src/main/res/values-da-rDK/strings.xml | 4 ++--
 ui-core/src/main/res/values-de-rDE/strings.xml | 4 ++--
 ui-core/src/main/res/values-el-rGR/strings.xml | 4 ++--
 ui-core/src/main/res/values-es-rES/strings.xml | 4 ++--
 ui-core/src/main/res/values-fi-rFI/strings.xml | 4 ++--
 ui-core/src/main/res/values-fr-rFR/strings.xml | 4 ++--
 ui-core/src/main/res/values-hr-rHR/strings.xml | 4 ++--
 ui-core/src/main/res/values-hu-rHU/strings.xml | 4 ++--
 ui-core/src/main/res/values-it-rIT/strings.xml | 4 ++--
 ui-core/src/main/res/values-ja-rJP/strings.xml | 4 ++--
 ui-core/src/main/res/values-ko-rKR/strings.xml | 4 ++--
 ui-core/src/main/res/values-nb-rNO/strings.xml | 4 ++--
 ui-core/src/main/res/values-nl-rNL/strings.xml | 4 ++--
 ui-core/src/main/res/values-pl-rPL/strings.xml | 4 ++--
 ui-core/src/main/res/values-pt-rBR/strings.xml | 4 ++--
 ui-core/src/main/res/values-pt-rPT/strings.xml | 4 ++--
 ui-core/src/main/res/values-ro-rRO/strings.xml | 4 ++--
 ui-core/src/main/res/values-ru-rRU/strings.xml | 4 ++--
 ui-core/src/main/res/values-sk-rSK/strings.xml | 4 ++--
 ui-core/src/main/res/values-sl-rSI/strings.xml | 4 ++--
 ui-core/src/main/res/values-sv-rSE/strings.xml | 4 ++--
 ui-core/src/main/res/values-zh-rTW/strings.xml | 4 ++--
 ui-core/src/main/res/values/strings.xml        | 4 ++--
 26 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/example-app/src/main/res/values/strings.xml b/example-app/src/main/res/values/strings.xml
index a3bfde5856..a790cc154d 100644
--- a/example-app/src/main/res/values/strings.xml
+++ b/example-app/src/main/res/values/strings.xml
@@ -13,7 +13,7 @@
     <string name="gift_card_component_entry">Gift Card</string>
     <string name="gift_card_with_session_component_entry">Gift Card</string>
 
-    <string name="country_code_error">Your country code must be %s</string>
+    <string name="country_code_error">Your country/region code must be %s</string>
     <string name="currency_code_error">Your currency code must be %s</string>
     <string name="google_pay_unavailable_error">Google Pay is unavailable on this device</string>
 
@@ -45,7 +45,7 @@
     <string name="threeds_mode_key">threeds_mode</string>
     <string name="threeds_mode_title">3D Secure</string>
     <string name="shopper_country_key">shopper_country</string>
-    <string name="shopper_country_title">Country</string>
+    <string name="shopper_country_title">Country/region</string>
     <string name="shopper_locale_key">shopper_locale</string>
     <string name="shopper_locale_title">Shopper Locale</string>
     <string name="shopper_email_key">shopper_email</string>
diff --git a/ui-core/src/main/res/values-ar/strings.xml b/ui-core/src/main/res/values-ar/strings.xml
index 29c36247bd..923fdc7d5d 100644
--- a/ui-core/src/main/res/values-ar/strings.xml
+++ b/ui-core/src/main/res/values-ar/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">رقم المنزل</string>
     <string name="checkout_address_form_apartment_suite_hint">الشقة / الجناح</string>
     <string name="checkout_address_form_city_hint">المدينة</string>
-    <string name="checkout_address_form_country_hint">البلد</string>
+    <string name="checkout_address_form_country_hint">البلد/المنطقة</string>
     <string name="checkout_address_form_states_hint">الولاية</string>
     <string name="checkout_address_postal_code_hint">الرمز البريدي</string>
     <string name="checkout_address_form_zip_code_hint">الرمز البريدي</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">رقم المنزل (اختياري)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">الشقة / الجناح (اختياري)</string>
     <string name="checkout_address_form_city_hint_optional"> المدينة (اختياري)</string>
-    <string name="checkout_address_form_country_hint_optional">البلد (اختياري)</string>
+    <string name="checkout_address_form_country_hint_optional">البلد/المنطقة (اختياري)</string>
     <string name="checkout_address_form_states_hint_optional">الولاية (اختياري)</string>
     <string name="checkout_address_postal_code_hint_optional">الرمز البريدي (اختياري)</string>
     <string name="checkout_address_form_zip_code_hint_optional">الرمز البريدي (اختياري)</string>
diff --git a/ui-core/src/main/res/values-cs-rCZ/strings.xml b/ui-core/src/main/res/values-cs-rCZ/strings.xml
index c38348c57c..6fc2124657 100644
--- a/ui-core/src/main/res/values-cs-rCZ/strings.xml
+++ b/ui-core/src/main/res/values-cs-rCZ/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Číslo popisné</string>
     <string name="checkout_address_form_apartment_suite_hint">Byt</string>
     <string name="checkout_address_form_city_hint">Město</string>
-    <string name="checkout_address_form_country_hint">Země</string>
+    <string name="checkout_address_form_country_hint">Země/region</string>
     <string name="checkout_address_form_states_hint">Stát</string>
     <string name="checkout_address_postal_code_hint">PSČ</string>
     <string name="checkout_address_form_zip_code_hint">PSČ</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Číslo popisné (nepovinné)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Byt (nepovinné)</string>
     <string name="checkout_address_form_city_hint_optional"> Město (nepovinné)</string>
-    <string name="checkout_address_form_country_hint_optional">Země (nepovinné)</string>
+    <string name="checkout_address_form_country_hint_optional">Země/region (nepovinné)</string>
     <string name="checkout_address_form_states_hint_optional">Stát (nepovinné)</string>
     <string name="checkout_address_postal_code_hint_optional">Poštovní směrovací číslo (nepovinné)</string>
     <string name="checkout_address_form_zip_code_hint_optional">PSČ (nepovinné)</string>
diff --git a/ui-core/src/main/res/values-da-rDK/strings.xml b/ui-core/src/main/res/values-da-rDK/strings.xml
index 32d5fe0038..6c7e7ea9e4 100644
--- a/ui-core/src/main/res/values-da-rDK/strings.xml
+++ b/ui-core/src/main/res/values-da-rDK/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Husnummer</string>
     <string name="checkout_address_form_apartment_suite_hint">Lejlighed/suite</string>
     <string name="checkout_address_form_city_hint">By</string>
-    <string name="checkout_address_form_country_hint">Land</string>
+    <string name="checkout_address_form_country_hint">Land/region</string>
     <string name="checkout_address_form_states_hint">Stat</string>
     <string name="checkout_address_postal_code_hint">Postnummer</string>
     <string name="checkout_address_form_zip_code_hint">Postnummer</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Husnummer (valgfrit)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Lejlighed/suite (valgfrit)</string>
     <string name="checkout_address_form_city_hint_optional"> By (valgfrit)</string>
-    <string name="checkout_address_form_country_hint_optional">Land (valgfrit)</string>
+    <string name="checkout_address_form_country_hint_optional">Land/region (valgfrit)</string>
     <string name="checkout_address_form_states_hint_optional">Stat (valgfrit)</string>
     <string name="checkout_address_postal_code_hint_optional">Postnummer (valgfrit)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Postnummer (valgfrit)</string>
diff --git a/ui-core/src/main/res/values-de-rDE/strings.xml b/ui-core/src/main/res/values-de-rDE/strings.xml
index 50cf511ac9..a3e2dfc03a 100644
--- a/ui-core/src/main/res/values-de-rDE/strings.xml
+++ b/ui-core/src/main/res/values-de-rDE/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Hausnummer</string>
     <string name="checkout_address_form_apartment_suite_hint">Wohnung/Geschoss</string>
     <string name="checkout_address_form_city_hint">Stadt</string>
-    <string name="checkout_address_form_country_hint">Land</string>
+    <string name="checkout_address_form_country_hint">Land/Region</string>
     <string name="checkout_address_form_states_hint">Bundesstaat</string>
     <string name="checkout_address_postal_code_hint">Postleitzahl</string>
     <string name="checkout_address_form_zip_code_hint">PLZ</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Hausnummer (optional)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Wohnung/Geschoss (optional)</string>
     <string name="checkout_address_form_city_hint_optional"> Stadt (optional)</string>
-    <string name="checkout_address_form_country_hint_optional">Land (optional)</string>
+    <string name="checkout_address_form_country_hint_optional">Land/Region (optional)</string>
     <string name="checkout_address_form_states_hint_optional">Bundesstaat (optional)</string>
     <string name="checkout_address_postal_code_hint_optional">Postleitzahl (optional)</string>
     <string name="checkout_address_form_zip_code_hint_optional">PLZ (optional)</string>
diff --git a/ui-core/src/main/res/values-el-rGR/strings.xml b/ui-core/src/main/res/values-el-rGR/strings.xml
index 07a0503a77..c427f4a4ec 100644
--- a/ui-core/src/main/res/values-el-rGR/strings.xml
+++ b/ui-core/src/main/res/values-el-rGR/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Αριθμός οικίας</string>
     <string name="checkout_address_form_apartment_suite_hint">Διαμέρισμα/Γραφείο</string>
     <string name="checkout_address_form_city_hint">Πόλη</string>
-    <string name="checkout_address_form_country_hint">Χώρα</string>
+    <string name="checkout_address_form_country_hint">Χώρα/Περιοχή</string>
     <string name="checkout_address_form_states_hint">Πολιτεία</string>
     <string name="checkout_address_postal_code_hint">Ταχυδρομικός κωδικός</string>
     <string name="checkout_address_form_zip_code_hint">Ταχυδρομικός κώδικας</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Αριθμός οικίας (προαιρετικό)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Διαμέρισμα/Γραφείο (προαιρετικό)</string>
     <string name="checkout_address_form_city_hint_optional"> Πόλη (προαιρετικό)</string>
-    <string name="checkout_address_form_country_hint_optional">Χώρα (προαιρετικό)</string>
+    <string name="checkout_address_form_country_hint_optional">Χώρα/Περιοχή (προαιρετικό)</string>
     <string name="checkout_address_form_states_hint_optional">Πολιτεία (προαιρετικό)</string>
     <string name="checkout_address_postal_code_hint_optional">Ταχυδρομικός κωδικός (προαιρετικό)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Ταχυδρομικός κωδικός (προαιρετικό)</string>
diff --git a/ui-core/src/main/res/values-es-rES/strings.xml b/ui-core/src/main/res/values-es-rES/strings.xml
index 189cbb4d2d..42c909f03d 100644
--- a/ui-core/src/main/res/values-es-rES/strings.xml
+++ b/ui-core/src/main/res/values-es-rES/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Número de vivienda</string>
     <string name="checkout_address_form_apartment_suite_hint">Apartamento/suite</string>
     <string name="checkout_address_form_city_hint">Ciudad</string>
-    <string name="checkout_address_form_country_hint">País</string>
+    <string name="checkout_address_form_country_hint">País o región</string>
     <string name="checkout_address_form_states_hint">Estado</string>
     <string name="checkout_address_postal_code_hint">Código postal</string>
     <string name="checkout_address_form_zip_code_hint">Código postal</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Número de vivienda (opcional)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Apartamento/suite (opcional)</string>
     <string name="checkout_address_form_city_hint_optional"> Ciudad (opcional)</string>
-    <string name="checkout_address_form_country_hint_optional">País (opcional)</string>
+    <string name="checkout_address_form_country_hint_optional">País o región (opcional)</string>
     <string name="checkout_address_form_states_hint_optional">Estado (opcional)</string>
     <string name="checkout_address_postal_code_hint_optional">Código postal (opcional)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Código postal (opcional)</string>
diff --git a/ui-core/src/main/res/values-fi-rFI/strings.xml b/ui-core/src/main/res/values-fi-rFI/strings.xml
index b336f5b5bc..0671c5c685 100644
--- a/ui-core/src/main/res/values-fi-rFI/strings.xml
+++ b/ui-core/src/main/res/values-fi-rFI/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Talon numero</string>
     <string name="checkout_address_form_apartment_suite_hint">Huoneisto / sviitti</string>
     <string name="checkout_address_form_city_hint">Kaupunki</string>
-    <string name="checkout_address_form_country_hint">Maa</string>
+    <string name="checkout_address_form_country_hint">Maa/alue</string>
     <string name="checkout_address_form_states_hint">Osavaltio</string>
     <string name="checkout_address_postal_code_hint">Postinumero</string>
     <string name="checkout_address_form_zip_code_hint">Postinumero</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Talon numero (valinnainen)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Huoneisto / sviitti (valinnainen)</string>
     <string name="checkout_address_form_city_hint_optional"> Kaupunki (valinnainen)</string>
-    <string name="checkout_address_form_country_hint_optional">Maa (valinnainen)</string>
+    <string name="checkout_address_form_country_hint_optional">Maa/alue (valinnainen)</string>
     <string name="checkout_address_form_states_hint_optional">Osavaltio (valinnainen)</string>
     <string name="checkout_address_postal_code_hint_optional">Postinumero (valinnainen)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Postinumero (valinnainen)</string>
diff --git a/ui-core/src/main/res/values-fr-rFR/strings.xml b/ui-core/src/main/res/values-fr-rFR/strings.xml
index 6b39c805c3..722f22a03d 100644
--- a/ui-core/src/main/res/values-fr-rFR/strings.xml
+++ b/ui-core/src/main/res/values-fr-rFR/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Numéro de rue</string>
     <string name="checkout_address_form_apartment_suite_hint">Appartement</string>
     <string name="checkout_address_form_city_hint">Ville</string>
-    <string name="checkout_address_form_country_hint">Pays</string>
+    <string name="checkout_address_form_country_hint">Pays/Région</string>
     <string name="checkout_address_form_states_hint">État</string>
     <string name="checkout_address_postal_code_hint">Code postal</string>
     <string name="checkout_address_form_zip_code_hint">Code postal</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Numéro de rue (facultatif)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Appartement (facultatif)</string>
     <string name="checkout_address_form_city_hint_optional"> Ville (facultatif)</string>
-    <string name="checkout_address_form_country_hint_optional">Pays (facultatif)</string>
+    <string name="checkout_address_form_country_hint_optional">Pays/Région (facultatif)</string>
     <string name="checkout_address_form_states_hint_optional">État (facultatif)</string>
     <string name="checkout_address_postal_code_hint_optional">Code postal (facultatif)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Code postal (facultatif)</string>
diff --git a/ui-core/src/main/res/values-hr-rHR/strings.xml b/ui-core/src/main/res/values-hr-rHR/strings.xml
index 62e0f17962..0c3a72fda8 100644
--- a/ui-core/src/main/res/values-hr-rHR/strings.xml
+++ b/ui-core/src/main/res/values-hr-rHR/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Kućni broj</string>
     <string name="checkout_address_form_apartment_suite_hint">Stan/apartman</string>
     <string name="checkout_address_form_city_hint">Grad</string>
-    <string name="checkout_address_form_country_hint">Zemlja</string>
+    <string name="checkout_address_form_country_hint">Zemlja/regija</string>
     <string name="checkout_address_form_states_hint">Savezna država</string>
     <string name="checkout_address_postal_code_hint">Poštanski broj</string>
     <string name="checkout_address_form_zip_code_hint">Poštanski broj</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Kućni broj (neobavezno)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Stan/apartman (neobavezno)</string>
     <string name="checkout_address_form_city_hint_optional"> Grad (nije obvezno)</string>
-    <string name="checkout_address_form_country_hint_optional">Zemlja (neobavezno)</string>
+    <string name="checkout_address_form_country_hint_optional">Zemlja/regija (neobavezno)</string>
     <string name="checkout_address_form_states_hint_optional">Savezna država (neobavezno)</string>
     <string name="checkout_address_postal_code_hint_optional">Poštanski broj (nije obvezno)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Poštanski broj (neobavezno)</string>
diff --git a/ui-core/src/main/res/values-hu-rHU/strings.xml b/ui-core/src/main/res/values-hu-rHU/strings.xml
index 3af44abe0f..6b182fa479 100644
--- a/ui-core/src/main/res/values-hu-rHU/strings.xml
+++ b/ui-core/src/main/res/values-hu-rHU/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Házszám</string>
     <string name="checkout_address_form_apartment_suite_hint">Lakás/ajtószám</string>
     <string name="checkout_address_form_city_hint">Város</string>
-    <string name="checkout_address_form_country_hint">Ország</string>
+    <string name="checkout_address_form_country_hint">Ország/régió</string>
     <string name="checkout_address_form_states_hint">Állam</string>
     <string name="checkout_address_postal_code_hint">Irányítószám</string>
     <string name="checkout_address_form_zip_code_hint">Irányítószám</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Házszám (nem kötelező)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Lakás/ajtószám (nem kötelező)</string>
     <string name="checkout_address_form_city_hint_optional"> Város (nem kötelező)</string>
-    <string name="checkout_address_form_country_hint_optional">Ország (nem kötelező)</string>
+    <string name="checkout_address_form_country_hint_optional">Ország/régió (nem kötelező)</string>
     <string name="checkout_address_form_states_hint_optional">Állam (nem kötelező)</string>
     <string name="checkout_address_postal_code_hint_optional">Irányítószám (nem kötelező)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Irányítószám (nem kötelező)</string>
diff --git a/ui-core/src/main/res/values-it-rIT/strings.xml b/ui-core/src/main/res/values-it-rIT/strings.xml
index f71fb9fdc0..438034ec69 100644
--- a/ui-core/src/main/res/values-it-rIT/strings.xml
+++ b/ui-core/src/main/res/values-it-rIT/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Numero civico</string>
     <string name="checkout_address_form_apartment_suite_hint">Appartamento/suite</string>
     <string name="checkout_address_form_city_hint">Città</string>
-    <string name="checkout_address_form_country_hint">Paese</string>
+    <string name="checkout_address_form_country_hint">Paese/Regione</string>
     <string name="checkout_address_form_states_hint">Stato</string>
     <string name="checkout_address_postal_code_hint">Codice postale</string>
     <string name="checkout_address_form_zip_code_hint">CAP</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Numero civico (facoltativo)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Appartamento / Suite (facoltativo)</string>
     <string name="checkout_address_form_city_hint_optional"> Città (facoltativo)</string>
-    <string name="checkout_address_form_country_hint_optional">Paese (facoltativo)</string>
+    <string name="checkout_address_form_country_hint_optional">Paese/Regione (facoltativo)</string>
     <string name="checkout_address_form_states_hint_optional">Stato (facoltativo)</string>
     <string name="checkout_address_postal_code_hint_optional">Codice postale (facoltativo)</string>
     <string name="checkout_address_form_zip_code_hint_optional">CAP (facoltativo)</string>
diff --git a/ui-core/src/main/res/values-ja-rJP/strings.xml b/ui-core/src/main/res/values-ja-rJP/strings.xml
index 7183bb2aaa..294819a5bd 100644
--- a/ui-core/src/main/res/values-ja-rJP/strings.xml
+++ b/ui-core/src/main/res/values-ja-rJP/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">部屋番号</string>
     <string name="checkout_address_form_apartment_suite_hint">アパート名/部屋名</string>
     <string name="checkout_address_form_city_hint">市区</string>
-    <string name="checkout_address_form_country_hint">国</string>
+    <string name="checkout_address_form_country_hint">国/地域</string>
     <string name="checkout_address_form_states_hint">都道府県</string>
     <string name="checkout_address_postal_code_hint">郵便番号</string>
     <string name="checkout_address_form_zip_code_hint">郵便番号</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">部屋番号 (任意)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">アパート名/部屋名 (任意)</string>
     <string name="checkout_address_form_city_hint_optional"> 市区町村 (任意)</string>
-    <string name="checkout_address_form_country_hint_optional">国 (任意)</string>
+    <string name="checkout_address_form_country_hint_optional">国/地域 (任意)</string>
     <string name="checkout_address_form_states_hint_optional">都道府県 (任意)</string>
     <string name="checkout_address_postal_code_hint_optional">郵便番号 (任意)</string>
     <string name="checkout_address_form_zip_code_hint_optional">郵便番号 (任意)</string>
diff --git a/ui-core/src/main/res/values-ko-rKR/strings.xml b/ui-core/src/main/res/values-ko-rKR/strings.xml
index 60d1d4437a..ebe601e514 100644
--- a/ui-core/src/main/res/values-ko-rKR/strings.xml
+++ b/ui-core/src/main/res/values-ko-rKR/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">집 전화번호</string>
     <string name="checkout_address_form_apartment_suite_hint">아파트/건물</string>
     <string name="checkout_address_form_city_hint">시</string>
-    <string name="checkout_address_form_country_hint">국가</string>
+    <string name="checkout_address_form_country_hint">국가/지역</string>
     <string name="checkout_address_form_states_hint">주</string>
     <string name="checkout_address_postal_code_hint">우편번호</string>
     <string name="checkout_address_form_zip_code_hint">우편번호</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">집 전화번호(선택 사항)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">아파트/건물(선택 사항)</string>
     <string name="checkout_address_form_city_hint_optional"> 도시(선택 사항)</string>
-    <string name="checkout_address_form_country_hint_optional">국가(선택 사항)</string>
+    <string name="checkout_address_form_country_hint_optional">국가/지역(선택 사항)</string>
     <string name="checkout_address_form_states_hint_optional">주(선택 사항)</string>
     <string name="checkout_address_postal_code_hint_optional">우편번호(선택 사항)</string>
     <string name="checkout_address_form_zip_code_hint_optional">우편 번호(선택 사항)</string>
diff --git a/ui-core/src/main/res/values-nb-rNO/strings.xml b/ui-core/src/main/res/values-nb-rNO/strings.xml
index ace064b24b..73fecbce5c 100644
--- a/ui-core/src/main/res/values-nb-rNO/strings.xml
+++ b/ui-core/src/main/res/values-nb-rNO/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Husnummer</string>
     <string name="checkout_address_form_apartment_suite_hint">Leilighet/suite</string>
     <string name="checkout_address_form_city_hint">Poststed</string>
-    <string name="checkout_address_form_country_hint">Land</string>
+    <string name="checkout_address_form_country_hint">Land/region</string>
     <string name="checkout_address_form_states_hint">Delstat</string>
     <string name="checkout_address_postal_code_hint">Postnummer</string>
     <string name="checkout_address_form_zip_code_hint">Postnummer</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Husnummer (valgfritt)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Leilighet/suite (valgfritt)</string>
     <string name="checkout_address_form_city_hint_optional"> Poststed (valgfritt)</string>
-    <string name="checkout_address_form_country_hint_optional">Land (valgfritt)</string>
+    <string name="checkout_address_form_country_hint_optional">Land/region (valgfritt)</string>
     <string name="checkout_address_form_states_hint_optional">Delstat (valgfritt)</string>
     <string name="checkout_address_postal_code_hint_optional">Postnummer (valgfritt)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Postnummer (valgfritt)</string>
diff --git a/ui-core/src/main/res/values-nl-rNL/strings.xml b/ui-core/src/main/res/values-nl-rNL/strings.xml
index c9fbb25dec..fc576a1557 100644
--- a/ui-core/src/main/res/values-nl-rNL/strings.xml
+++ b/ui-core/src/main/res/values-nl-rNL/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Huisnummer</string>
     <string name="checkout_address_form_apartment_suite_hint">Appartement/Suite</string>
     <string name="checkout_address_form_city_hint">Stad</string>
-    <string name="checkout_address_form_country_hint">Land</string>
+    <string name="checkout_address_form_country_hint">Land/regio</string>
     <string name="checkout_address_form_states_hint">Staat</string>
     <string name="checkout_address_postal_code_hint">Postcode</string>
     <string name="checkout_address_form_zip_code_hint">Postcode</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Huisnummer (optioneel)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Appartement/Suite (optioneel)</string>
     <string name="checkout_address_form_city_hint_optional"> Stad (optioneel)</string>
-    <string name="checkout_address_form_country_hint_optional">Land (optioneel)</string>
+    <string name="checkout_address_form_country_hint_optional">Land/regio (optioneel)</string>
     <string name="checkout_address_form_states_hint_optional">Staat (optioneel)</string>
     <string name="checkout_address_postal_code_hint_optional">Postcode (optioneel)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Postcode (optioneel)</string>
diff --git a/ui-core/src/main/res/values-pl-rPL/strings.xml b/ui-core/src/main/res/values-pl-rPL/strings.xml
index 05b97cec49..64fde1a5f7 100644
--- a/ui-core/src/main/res/values-pl-rPL/strings.xml
+++ b/ui-core/src/main/res/values-pl-rPL/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Numer domu i mieszkania</string>
     <string name="checkout_address_form_apartment_suite_hint">Numer domu/mieszkania</string>
     <string name="checkout_address_form_city_hint">Miasto</string>
-    <string name="checkout_address_form_country_hint">Kraj</string>
+    <string name="checkout_address_form_country_hint">Kraj/Region</string>
     <string name="checkout_address_form_states_hint">Stan</string>
     <string name="checkout_address_postal_code_hint">Kod pocztowy</string>
     <string name="checkout_address_form_zip_code_hint">Kod pocztowy</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Numer domu i mieszkania (opcjonalnie)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Numer domu/mieszkania (opcjonalnie)</string>
     <string name="checkout_address_form_city_hint_optional"> Miasto (opcjonalnie)</string>
-    <string name="checkout_address_form_country_hint_optional">Kraj (opcjonalnie)</string>
+    <string name="checkout_address_form_country_hint_optional">Kraj/Region (opcjonalnie)</string>
     <string name="checkout_address_form_states_hint_optional">Stan (opcjonalnie)</string>
     <string name="checkout_address_postal_code_hint_optional">Kod pocztowy (opcjonalnie)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Kod pocztowy (opcjonalnie)</string>
diff --git a/ui-core/src/main/res/values-pt-rBR/strings.xml b/ui-core/src/main/res/values-pt-rBR/strings.xml
index eababec81d..05e89f2c5a 100644
--- a/ui-core/src/main/res/values-pt-rBR/strings.xml
+++ b/ui-core/src/main/res/values-pt-rBR/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Número da casa</string>
     <string name="checkout_address_form_apartment_suite_hint">Apartamento/Conjunto</string>
     <string name="checkout_address_form_city_hint">Cidade</string>
-    <string name="checkout_address_form_country_hint">País</string>
+    <string name="checkout_address_form_country_hint">País/região</string>
     <string name="checkout_address_form_states_hint">Estado</string>
     <string name="checkout_address_postal_code_hint">CEP</string>
     <string name="checkout_address_form_zip_code_hint">Código postal</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Número da casa (opcional)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Apartamento/Conjunto (opcional)</string>
     <string name="checkout_address_form_city_hint_optional"> Cidade (opcional)</string>
-    <string name="checkout_address_form_country_hint_optional">País (opcional)</string>
+    <string name="checkout_address_form_country_hint_optional">País/região (opcional)</string>
     <string name="checkout_address_form_states_hint_optional">Estado (opcional)</string>
     <string name="checkout_address_postal_code_hint_optional">Código postal (opcional)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Código postal (opcional)</string>
diff --git a/ui-core/src/main/res/values-pt-rPT/strings.xml b/ui-core/src/main/res/values-pt-rPT/strings.xml
index 110e10a076..0dbce79f0c 100644
--- a/ui-core/src/main/res/values-pt-rPT/strings.xml
+++ b/ui-core/src/main/res/values-pt-rPT/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Número de porta</string>
     <string name="checkout_address_form_apartment_suite_hint">Apartamento/Suite</string>
     <string name="checkout_address_form_city_hint">Cidade</string>
-    <string name="checkout_address_form_country_hint">País</string>
+    <string name="checkout_address_form_country_hint">País/região</string>
     <string name="checkout_address_form_states_hint">Estado</string>
     <string name="checkout_address_postal_code_hint">Código postal</string>
     <string name="checkout_address_form_zip_code_hint">Código postal</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Número de porta (opcional)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Apartamento/Suite (opcional)</string>
     <string name="checkout_address_form_city_hint_optional"> Cidade (opcional)</string>
-    <string name="checkout_address_form_country_hint_optional">País (opcional)</string>
+    <string name="checkout_address_form_country_hint_optional">País/região (opcional)</string>
     <string name="checkout_address_form_states_hint_optional">Estado (opcional)</string>
     <string name="checkout_address_postal_code_hint_optional">Código postal (opcional)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Código postal (opcional)</string>
diff --git a/ui-core/src/main/res/values-ro-rRO/strings.xml b/ui-core/src/main/res/values-ro-rRO/strings.xml
index 852b0b2c11..061d869cb8 100644
--- a/ui-core/src/main/res/values-ro-rRO/strings.xml
+++ b/ui-core/src/main/res/values-ro-rRO/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Număr</string>
     <string name="checkout_address_form_apartment_suite_hint">Apartament</string>
     <string name="checkout_address_form_city_hint">Oraș</string>
-    <string name="checkout_address_form_country_hint">Țară</string>
+    <string name="checkout_address_form_country_hint">Țară/regiune</string>
     <string name="checkout_address_form_states_hint">Stat</string>
     <string name="checkout_address_postal_code_hint">Cod poștal</string>
     <string name="checkout_address_form_zip_code_hint">Cod poștal</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Număr (opțional)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Apartament(opțional)</string>
     <string name="checkout_address_form_city_hint_optional"> Oraș (opțional)</string>
-    <string name="checkout_address_form_country_hint_optional">Țară (opțional)</string>
+    <string name="checkout_address_form_country_hint_optional">Țară/regiune (opțional)</string>
     <string name="checkout_address_form_states_hint_optional">Stat (opțional)</string>
     <string name="checkout_address_postal_code_hint_optional">Cod poștal (opțional)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Cod poștal (opțional)</string>
diff --git a/ui-core/src/main/res/values-ru-rRU/strings.xml b/ui-core/src/main/res/values-ru-rRU/strings.xml
index 2cbda30d55..07d07ba731 100644
--- a/ui-core/src/main/res/values-ru-rRU/strings.xml
+++ b/ui-core/src/main/res/values-ru-rRU/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Номер дома</string>
     <string name="checkout_address_form_apartment_suite_hint">Квартира / помещение</string>
     <string name="checkout_address_form_city_hint">Город</string>
-    <string name="checkout_address_form_country_hint">Страна</string>
+    <string name="checkout_address_form_country_hint">Страна/регион</string>
     <string name="checkout_address_form_states_hint">Штат</string>
     <string name="checkout_address_postal_code_hint">Почтовый индекс</string>
     <string name="checkout_address_form_zip_code_hint">Почтовый индекс</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Номер дома (необязательно)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Квартира / помещение (необязательно)</string>
     <string name="checkout_address_form_city_hint_optional"> Город (необязательно)</string>
-    <string name="checkout_address_form_country_hint_optional">Страна (необязательно)</string>
+    <string name="checkout_address_form_country_hint_optional">Страна/регион (необязательно)</string>
     <string name="checkout_address_form_states_hint_optional">Штат (необязательно)</string>
     <string name="checkout_address_postal_code_hint_optional">Почтовый индекс (необязательно)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Почтовый индекс (необязательно)</string>
diff --git a/ui-core/src/main/res/values-sk-rSK/strings.xml b/ui-core/src/main/res/values-sk-rSK/strings.xml
index c6f80e1df9..3df4e0432a 100644
--- a/ui-core/src/main/res/values-sk-rSK/strings.xml
+++ b/ui-core/src/main/res/values-sk-rSK/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Číslo domu</string>
     <string name="checkout_address_form_apartment_suite_hint">Byt/apartmán</string>
     <string name="checkout_address_form_city_hint">Mesto</string>
-    <string name="checkout_address_form_country_hint">Krajina</string>
+    <string name="checkout_address_form_country_hint">Krajina/región</string>
     <string name="checkout_address_form_states_hint">Štát</string>
     <string name="checkout_address_postal_code_hint">PSČ</string>
     <string name="checkout_address_form_zip_code_hint">PSČ</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Číslo domu (nepovinné)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Byt/apartmán (voliteľné)</string>
     <string name="checkout_address_form_city_hint_optional"> Mesto (nepovinné)</string>
-    <string name="checkout_address_form_country_hint_optional">Krajina (voliteľné)</string>
+    <string name="checkout_address_form_country_hint_optional">Krajina/región (voliteľné)</string>
     <string name="checkout_address_form_states_hint_optional">Štát (nepovinné)</string>
     <string name="checkout_address_postal_code_hint_optional">Poštové smerovacie číslo (nepovinné)</string>
     <string name="checkout_address_form_zip_code_hint_optional">PSČ (nepovinné)</string>
diff --git a/ui-core/src/main/res/values-sl-rSI/strings.xml b/ui-core/src/main/res/values-sl-rSI/strings.xml
index 9700bb2e5c..f83f6d01a0 100644
--- a/ui-core/src/main/res/values-sl-rSI/strings.xml
+++ b/ui-core/src/main/res/values-sl-rSI/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Hišna številka</string>
     <string name="checkout_address_form_apartment_suite_hint">Št. apartmaja/stanovanja</string>
     <string name="checkout_address_form_city_hint">Mesto</string>
-    <string name="checkout_address_form_country_hint">Država</string>
+    <string name="checkout_address_form_country_hint">Država/regija</string>
     <string name="checkout_address_form_states_hint">Država</string>
     <string name="checkout_address_postal_code_hint">Poštna številka</string>
     <string name="checkout_address_form_zip_code_hint">Poštna številka</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Hišna številka (neobvezno)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Št. apartmaja/stanovanja (neobvezno)</string>
     <string name="checkout_address_form_city_hint_optional"> Kraj (neobvezno)</string>
-    <string name="checkout_address_form_country_hint_optional">Država (neobvezno)</string>
+    <string name="checkout_address_form_country_hint_optional">Država/regija (neobvezno)</string>
     <string name="checkout_address_form_states_hint_optional">Država (neobvezno)</string>
     <string name="checkout_address_postal_code_hint_optional">Poštna številka (neobvezno)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Poštna številka (neobvezno)</string>
diff --git a/ui-core/src/main/res/values-sv-rSE/strings.xml b/ui-core/src/main/res/values-sv-rSE/strings.xml
index 5e64df2f3b..5ce440ab6c 100644
--- a/ui-core/src/main/res/values-sv-rSE/strings.xml
+++ b/ui-core/src/main/res/values-sv-rSE/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">Husnummer</string>
     <string name="checkout_address_form_apartment_suite_hint">Lägenhetsnummer</string>
     <string name="checkout_address_form_city_hint">Stad</string>
-    <string name="checkout_address_form_country_hint">Land</string>
+    <string name="checkout_address_form_country_hint">Land/region</string>
     <string name="checkout_address_form_states_hint">Delstat</string>
     <string name="checkout_address_postal_code_hint">Postnummer</string>
     <string name="checkout_address_form_zip_code_hint">Postnummer</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">Husnummer (valfritt)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Lägenhetsnummer (valfritt)</string>
     <string name="checkout_address_form_city_hint_optional"> Ort (valfritt)</string>
-    <string name="checkout_address_form_country_hint_optional">Land (valfritt)</string>
+    <string name="checkout_address_form_country_hint_optional">Land/region (valfritt)</string>
     <string name="checkout_address_form_states_hint_optional">Delstat (valfritt)</string>
     <string name="checkout_address_postal_code_hint_optional">Postnummer (valfritt)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Postnummer (valfritt)</string>
diff --git a/ui-core/src/main/res/values-zh-rTW/strings.xml b/ui-core/src/main/res/values-zh-rTW/strings.xml
index 1aa118699b..5e6d50ecc2 100644
--- a/ui-core/src/main/res/values-zh-rTW/strings.xml
+++ b/ui-core/src/main/res/values-zh-rTW/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">門牌號</string>
     <string name="checkout_address_form_apartment_suite_hint">公寓／套房</string>
     <string name="checkout_address_form_city_hint">城市</string>
-    <string name="checkout_address_form_country_hint">國家/地區</string>
+    <string name="checkout_address_form_country_hint">國家／地區</string>
     <string name="checkout_address_form_states_hint">州</string>
     <string name="checkout_address_postal_code_hint">郵遞區號</string>
     <string name="checkout_address_form_zip_code_hint">郵遞區號</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">門牌號（選用）</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">公寓／套房（選用）</string>
     <string name="checkout_address_form_city_hint_optional"> 城市（選用）</string>
-    <string name="checkout_address_form_country_hint_optional">國家/地區（選用）</string>
+    <string name="checkout_address_form_country_hint_optional">國家／地區（選用）</string>
     <string name="checkout_address_form_states_hint_optional">州（選用）</string>
     <string name="checkout_address_postal_code_hint_optional">郵遞區號（選用）</string>
     <string name="checkout_address_form_zip_code_hint_optional">郵遞區號（選用）</string>
diff --git a/ui-core/src/main/res/values/strings.xml b/ui-core/src/main/res/values/strings.xml
index ebd8d3f7b0..e54764ef77 100644
--- a/ui-core/src/main/res/values/strings.xml
+++ b/ui-core/src/main/res/values/strings.xml
@@ -28,7 +28,7 @@
     <string name="checkout_address_form_house_number_hint">House number</string>
     <string name="checkout_address_form_apartment_suite_hint">Apartment / Suite</string>
     <string name="checkout_address_form_city_hint">City</string>
-    <string name="checkout_address_form_country_hint">Country</string>
+    <string name="checkout_address_form_country_hint">Country/Region</string>
     <string name="checkout_address_form_states_hint">State</string>
     <string name="checkout_address_postal_code_hint">Postal code</string>
     <string name="checkout_address_form_zip_code_hint">Zip code</string>
@@ -40,7 +40,7 @@
     <string name="checkout_address_form_house_number_hint_optional">House number (optional)</string>
     <string name="checkout_address_form_apartment_suite_hint_optional">Apartment / Suite (optional)</string>
     <string name="checkout_address_form_city_hint_optional"> City (optional)</string>
-    <string name="checkout_address_form_country_hint_optional">Country (optional)</string>
+    <string name="checkout_address_form_country_hint_optional">Country/Region (optional)</string>
     <string name="checkout_address_form_states_hint_optional">State (optional)</string>
     <string name="checkout_address_postal_code_hint_optional">Postal code (optional)</string>
     <string name="checkout_address_form_zip_code_hint_optional">Zip code (optional)</string>

From 6b37f214d856e167a96f6411f0db885d9b92fbfd Mon Sep 17 00:00:00 2001
From: Oscar Spruit <oscar.spruit@adyen.com>
Date: Wed, 24 Apr 2024 13:38:55 +0200
Subject: [PATCH 3/4] Add release notes

COAND-849
---
 RELEASE_NOTES.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index ce08fe74af..c6928a2b86 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -10,3 +10,7 @@
 
 ## Fixed
 - Fixed various memory leaks.
+
+## Changed
+- Flags are replaced by ISO codes in the phone number inputs (affected payment methods: MB Way, Pay Easy, Convenience Stores Japan, Online Banking Japan and Seven-Eleven).
+- Strings containing "country" are changed to "country/region".

From 9ee42a711a55a8c6021a1378e0d87fb1a8d72b5f Mon Sep 17 00:00:00 2001
From: Oscar Spruit <oscar.spruit@adyen.com>
Date: Wed, 24 Apr 2024 15:49:28 +0200
Subject: [PATCH 4/4] Add unit tests for CountryUtils

Also sort the list of countries based on alphabetical order.

COAND-849
---
 .../core/internal/util/CountryUtils.kt        | 298 +++++++++---------
 .../core/internal/util/CountryUtilsTest.kt    |  45 +++
 2 files changed, 195 insertions(+), 148 deletions(-)
 create mode 100644 components-core/src/test/java/com/adyen/checkout/components/core/internal/util/CountryUtilsTest.kt

diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/internal/util/CountryUtils.kt b/components-core/src/main/java/com/adyen/checkout/components/core/internal/util/CountryUtils.kt
index a146dc16ac..0da4fb4a63 100644
--- a/components-core/src/main/java/com/adyen/checkout/components/core/internal/util/CountryUtils.kt
+++ b/components-core/src/main/java/com/adyen/checkout/components/core/internal/util/CountryUtils.kt
@@ -9,6 +9,7 @@
 package com.adyen.checkout.components.core.internal.util
 
 import androidx.annotation.RestrictTo
+import androidx.annotation.VisibleForTesting
 import java.util.Locale
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
@@ -40,248 +41,249 @@ object CountryUtils {
         return countryLocale.getDisplayCountry(locale)
     }
 
-    private val countries = listOf(
+    @VisibleForTesting
+    internal val countries = listOf(
+        CountryInfo(isoCode = "AD", callingCode = "+376"),
+        CountryInfo(isoCode = "AE", callingCode = "+971"),
         CountryInfo(isoCode = "AF", callingCode = "+93"),
+        CountryInfo(isoCode = "AG", callingCode = "+1268"),
+        CountryInfo(isoCode = "AI", callingCode = "+1264"),
         CountryInfo(isoCode = "AL", callingCode = "+355"),
-        CountryInfo(isoCode = "DZ", callingCode = "+213"),
-        CountryInfo(isoCode = "AS", callingCode = "+1684"),
-        CountryInfo(isoCode = "AD", callingCode = "+376"),
+        CountryInfo(isoCode = "AM", callingCode = "+374"),
+        CountryInfo(isoCode = "AN", callingCode = "+599"),
         CountryInfo(isoCode = "AO", callingCode = "+244"),
-        CountryInfo(isoCode = "AI", callingCode = "+1264"),
-        CountryInfo(isoCode = "AG", callingCode = "+1268"),
+        CountryInfo(isoCode = "AQ", callingCode = "+672"),
         CountryInfo(isoCode = "AR", callingCode = "+54"),
-        CountryInfo(isoCode = "AM", callingCode = "+374"),
-        CountryInfo(isoCode = "AW", callingCode = "+297"),
-        CountryInfo(isoCode = "AU", callingCode = "+61"),
+        CountryInfo(isoCode = "AS", callingCode = "+1684"),
         CountryInfo(isoCode = "AT", callingCode = "+43"),
+        CountryInfo(isoCode = "AU", callingCode = "+61"),
+        CountryInfo(isoCode = "AW", callingCode = "+297"),
+        CountryInfo(isoCode = "AX", callingCode = "+358"),
         CountryInfo(isoCode = "AZ", callingCode = "+994"),
-        CountryInfo(isoCode = "BS", callingCode = "+1242"),
-        CountryInfo(isoCode = "BH", callingCode = "+973"),
-        CountryInfo(isoCode = "BD", callingCode = "+880"),
+        CountryInfo(isoCode = "BA", callingCode = "+387"),
         CountryInfo(isoCode = "BB", callingCode = "+1246"),
-        CountryInfo(isoCode = "BY", callingCode = "+375"),
+        CountryInfo(isoCode = "BD", callingCode = "+880"),
         CountryInfo(isoCode = "BE", callingCode = "+32"),
-        CountryInfo(isoCode = "BZ", callingCode = "+501"),
+        CountryInfo(isoCode = "BF", callingCode = "+226"),
+        CountryInfo(isoCode = "BG", callingCode = "+359"),
+        CountryInfo(isoCode = "BH", callingCode = "+973"),
+        CountryInfo(isoCode = "BI", callingCode = "+257"),
         CountryInfo(isoCode = "BJ", callingCode = "+229"),
+        CountryInfo(isoCode = "BL", callingCode = "+590"),
         CountryInfo(isoCode = "BM", callingCode = "+1441"),
+        CountryInfo(isoCode = "BN", callingCode = "+673"),
+        CountryInfo(isoCode = "BO", callingCode = "+591"),
+        CountryInfo(isoCode = "BR", callingCode = "+55"),
+        CountryInfo(isoCode = "BS", callingCode = "+1242"),
         CountryInfo(isoCode = "BT", callingCode = "+975"),
-        CountryInfo(isoCode = "BA", callingCode = "+387"),
         CountryInfo(isoCode = "BW", callingCode = "+267"),
-        CountryInfo(isoCode = "BR", callingCode = "+55"),
-        CountryInfo(isoCode = "IO", callingCode = "+246"),
-        CountryInfo(isoCode = "BG", callingCode = "+359"),
-        CountryInfo(isoCode = "BF", callingCode = "+226"),
-        CountryInfo(isoCode = "BI", callingCode = "+257"),
-        CountryInfo(isoCode = "KH", callingCode = "+855"),
-        CountryInfo(isoCode = "CM", callingCode = "+237"),
+        CountryInfo(isoCode = "BY", callingCode = "+375"),
+        CountryInfo(isoCode = "BZ", callingCode = "+501"),
         CountryInfo(isoCode = "CA", callingCode = "+1"),
-        CountryInfo(isoCode = "CV", callingCode = "+238"),
-        CountryInfo(isoCode = "KY", callingCode = "+345"),
+        CountryInfo(isoCode = "CC", callingCode = "+61"),
+        CountryInfo(isoCode = "CD", callingCode = "+243"),
         CountryInfo(isoCode = "CF", callingCode = "+236"),
-        CountryInfo(isoCode = "TD", callingCode = "+235"),
+        CountryInfo(isoCode = "CG", callingCode = "+242"),
+        CountryInfo(isoCode = "CH", callingCode = "+41"),
+        CountryInfo(isoCode = "CI", callingCode = "+225"),
+        CountryInfo(isoCode = "CK", callingCode = "+682"),
         CountryInfo(isoCode = "CL", callingCode = "+56"),
+        CountryInfo(isoCode = "CM", callingCode = "+237"),
         CountryInfo(isoCode = "CN", callingCode = "+86"),
-        CountryInfo(isoCode = "CX", callingCode = "+61"),
         CountryInfo(isoCode = "CO", callingCode = "+57"),
-        CountryInfo(isoCode = "KM", callingCode = "+269"),
-        CountryInfo(isoCode = "CG", callingCode = "+242"),
-        CountryInfo(isoCode = "CK", callingCode = "+682"),
         CountryInfo(isoCode = "CR", callingCode = "+506"),
-        CountryInfo(isoCode = "HR", callingCode = "+385"),
         CountryInfo(isoCode = "CU", callingCode = "+53"),
+        CountryInfo(isoCode = "CV", callingCode = "+238"),
+        CountryInfo(isoCode = "CX", callingCode = "+61"),
         CountryInfo(isoCode = "CY", callingCode = "+537"),
         CountryInfo(isoCode = "CZ", callingCode = "+420"),
-        CountryInfo(isoCode = "DK", callingCode = "+45"),
+        CountryInfo(isoCode = "DE", callingCode = "+49"),
         CountryInfo(isoCode = "DJ", callingCode = "+253"),
+        CountryInfo(isoCode = "DK", callingCode = "+45"),
         CountryInfo(isoCode = "DM", callingCode = "+1767"),
         CountryInfo(isoCode = "DO", callingCode = "+1849"),
+        CountryInfo(isoCode = "DZ", callingCode = "+213"),
         CountryInfo(isoCode = "EC", callingCode = "+593"),
+        CountryInfo(isoCode = "EE", callingCode = "+372"),
         CountryInfo(isoCode = "EG", callingCode = "+20"),
-        CountryInfo(isoCode = "SV", callingCode = "+503"),
-        CountryInfo(isoCode = "GQ", callingCode = "+240"),
         CountryInfo(isoCode = "ER", callingCode = "+291"),
-        CountryInfo(isoCode = "EE", callingCode = "+372"),
+        CountryInfo(isoCode = "ES", callingCode = "+34"),
         CountryInfo(isoCode = "ET", callingCode = "+251"),
-        CountryInfo(isoCode = "FO", callingCode = "+298"),
-        CountryInfo(isoCode = "FJ", callingCode = "+679"),
         CountryInfo(isoCode = "FI", callingCode = "+358"),
+        CountryInfo(isoCode = "FJ", callingCode = "+679"),
+        CountryInfo(isoCode = "FK", callingCode = "+500"),
+        CountryInfo(isoCode = "FM", callingCode = "+691"),
+        CountryInfo(isoCode = "FO", callingCode = "+298"),
         CountryInfo(isoCode = "FR", callingCode = "+33"),
-        CountryInfo(isoCode = "GF", callingCode = "+594"),
-        CountryInfo(isoCode = "PF", callingCode = "+689"),
         CountryInfo(isoCode = "GA", callingCode = "+241"),
-        CountryInfo(isoCode = "GM", callingCode = "+220"),
+        CountryInfo(isoCode = "GB", callingCode = "+44"),
+        CountryInfo(isoCode = "GD", callingCode = "+1473"),
         CountryInfo(isoCode = "GE", callingCode = "+995"),
-        CountryInfo(isoCode = "DE", callingCode = "+49"),
+        CountryInfo(isoCode = "GF", callingCode = "+594"),
+        CountryInfo(isoCode = "GG", callingCode = "+44"),
         CountryInfo(isoCode = "GH", callingCode = "+233"),
         CountryInfo(isoCode = "GI", callingCode = "+350"),
-        CountryInfo(isoCode = "GR", callingCode = "+30"),
         CountryInfo(isoCode = "GL", callingCode = "+299"),
-        CountryInfo(isoCode = "GD", callingCode = "+1473"),
+        CountryInfo(isoCode = "GM", callingCode = "+220"),
+        CountryInfo(isoCode = "GN", callingCode = "+224"),
         CountryInfo(isoCode = "GP", callingCode = "+590"),
-        CountryInfo(isoCode = "GU", callingCode = "+1671"),
+        CountryInfo(isoCode = "GQ", callingCode = "+240"),
+        CountryInfo(isoCode = "GR", callingCode = "+30"),
+        CountryInfo(isoCode = "GS", callingCode = "+500"),
         CountryInfo(isoCode = "GT", callingCode = "+502"),
-        CountryInfo(isoCode = "GN", callingCode = "+224"),
+        CountryInfo(isoCode = "GU", callingCode = "+1671"),
         CountryInfo(isoCode = "GW", callingCode = "+245"),
         CountryInfo(isoCode = "GY", callingCode = "+595"),
-        CountryInfo(isoCode = "HT", callingCode = "+509"),
+        CountryInfo(isoCode = "HK", callingCode = "+852"),
         CountryInfo(isoCode = "HN", callingCode = "+504"),
+        CountryInfo(isoCode = "HR", callingCode = "+385"),
+        CountryInfo(isoCode = "HT", callingCode = "+509"),
         CountryInfo(isoCode = "HU", callingCode = "+36"),
-        CountryInfo(isoCode = "IS", callingCode = "+354"),
-        CountryInfo(isoCode = "IN", callingCode = "+91"),
         CountryInfo(isoCode = "ID", callingCode = "+62"),
-        CountryInfo(isoCode = "IQ", callingCode = "+964"),
         CountryInfo(isoCode = "IE", callingCode = "+353"),
         CountryInfo(isoCode = "IL", callingCode = "+972"),
+        CountryInfo(isoCode = "IM", callingCode = "+44"),
+        CountryInfo(isoCode = "IN", callingCode = "+91"),
+        CountryInfo(isoCode = "IO", callingCode = "+246"),
+        CountryInfo(isoCode = "IQ", callingCode = "+964"),
+        CountryInfo(isoCode = "IR", callingCode = "+98"),
+        CountryInfo(isoCode = "IS", callingCode = "+354"),
         CountryInfo(isoCode = "IT", callingCode = "+39"),
+        CountryInfo(isoCode = "JE", callingCode = "+44"),
         CountryInfo(isoCode = "JM", callingCode = "+1876"),
-        CountryInfo(isoCode = "JP", callingCode = "+81"),
         CountryInfo(isoCode = "JO", callingCode = "+962"),
-        CountryInfo(isoCode = "KZ", callingCode = "+77"),
+        CountryInfo(isoCode = "JP", callingCode = "+81"),
         CountryInfo(isoCode = "KE", callingCode = "+254"),
+        CountryInfo(isoCode = "KG", callingCode = "+996"),
+        CountryInfo(isoCode = "KH", callingCode = "+855"),
         CountryInfo(isoCode = "KI", callingCode = "+686"),
+        CountryInfo(isoCode = "KM", callingCode = "+269"),
+        CountryInfo(isoCode = "KN", callingCode = "+1869"),
+        CountryInfo(isoCode = "KP", callingCode = "+850"),
+        CountryInfo(isoCode = "KR", callingCode = "+82"),
         CountryInfo(isoCode = "KW", callingCode = "+965"),
-        CountryInfo(isoCode = "KG", callingCode = "+996"),
-        CountryInfo(isoCode = "LV", callingCode = "+371"),
+        CountryInfo(isoCode = "KY", callingCode = "+345"),
+        CountryInfo(isoCode = "KZ", callingCode = "+77"),
+        CountryInfo(isoCode = "LA", callingCode = "+856"),
         CountryInfo(isoCode = "LB", callingCode = "+961"),
-        CountryInfo(isoCode = "LS", callingCode = "+266"),
-        CountryInfo(isoCode = "LR", callingCode = "+231"),
+        CountryInfo(isoCode = "LC", callingCode = "+1758"),
         CountryInfo(isoCode = "LI", callingCode = "+423"),
+        CountryInfo(isoCode = "LK", callingCode = "+94"),
+        CountryInfo(isoCode = "LR", callingCode = "+231"),
+        CountryInfo(isoCode = "LS", callingCode = "+266"),
         CountryInfo(isoCode = "LT", callingCode = "+370"),
         CountryInfo(isoCode = "LU", callingCode = "+352"),
+        CountryInfo(isoCode = "LV", callingCode = "+371"),
+        CountryInfo(isoCode = "LY", callingCode = "+218"),
+        CountryInfo(isoCode = "MA", callingCode = "+212"),
+        CountryInfo(isoCode = "MC", callingCode = "+377"),
+        CountryInfo(isoCode = "MD", callingCode = "+373"),
+        CountryInfo(isoCode = "ME", callingCode = "+382"),
+        CountryInfo(isoCode = "MF", callingCode = "+590"),
         CountryInfo(isoCode = "MG", callingCode = "+261"),
-        CountryInfo(isoCode = "MW", callingCode = "+265"),
-        CountryInfo(isoCode = "MY", callingCode = "+60"),
-        CountryInfo(isoCode = "MV", callingCode = "+960"),
-        CountryInfo(isoCode = "ML", callingCode = "+223"),
-        CountryInfo(isoCode = "MT", callingCode = "+356"),
         CountryInfo(isoCode = "MH", callingCode = "+692"),
+        CountryInfo(isoCode = "MK", callingCode = "+389"),
+        CountryInfo(isoCode = "ML", callingCode = "+223"),
+        CountryInfo(isoCode = "MM", callingCode = "+95"),
+        CountryInfo(isoCode = "MN", callingCode = "+976"),
+        CountryInfo(isoCode = "MO", callingCode = "+853"),
+        CountryInfo(isoCode = "MP", callingCode = "+1670"),
         CountryInfo(isoCode = "MQ", callingCode = "+596"),
         CountryInfo(isoCode = "MR", callingCode = "+222"),
+        CountryInfo(isoCode = "MS", callingCode = "+1664"),
+        CountryInfo(isoCode = "MT", callingCode = "+356"),
         CountryInfo(isoCode = "MU", callingCode = "+230"),
-        CountryInfo(isoCode = "YT", callingCode = "+262"),
+        CountryInfo(isoCode = "MV", callingCode = "+960"),
+        CountryInfo(isoCode = "MW", callingCode = "+265"),
         CountryInfo(isoCode = "MX", callingCode = "+52"),
-        CountryInfo(isoCode = "MC", callingCode = "+377"),
-        CountryInfo(isoCode = "MN", callingCode = "+976"),
-        CountryInfo(isoCode = "ME", callingCode = "+382"),
-        CountryInfo(isoCode = "MS", callingCode = "+1664"),
-        CountryInfo(isoCode = "MA", callingCode = "+212"),
-        CountryInfo(isoCode = "MM", callingCode = "+95"),
+        CountryInfo(isoCode = "MY", callingCode = "+60"),
+        CountryInfo(isoCode = "MZ", callingCode = "+258"),
         CountryInfo(isoCode = "NA", callingCode = "+264"),
-        CountryInfo(isoCode = "NR", callingCode = "+674"),
-        CountryInfo(isoCode = "NP", callingCode = "+977"),
-        CountryInfo(isoCode = "NL", callingCode = "+31"),
-        CountryInfo(isoCode = "AN", callingCode = "+599"),
         CountryInfo(isoCode = "NC", callingCode = "+687"),
-        CountryInfo(isoCode = "NZ", callingCode = "+64"),
-        CountryInfo(isoCode = "NI", callingCode = "+505"),
         CountryInfo(isoCode = "NE", callingCode = "+227"),
-        CountryInfo(isoCode = "NG", callingCode = "+234"),
-        CountryInfo(isoCode = "NU", callingCode = "+683"),
         CountryInfo(isoCode = "NF", callingCode = "+672"),
-        CountryInfo(isoCode = "MP", callingCode = "+1670"),
+        CountryInfo(isoCode = "NG", callingCode = "+234"),
+        CountryInfo(isoCode = "NI", callingCode = "+505"),
+        CountryInfo(isoCode = "NL", callingCode = "+31"),
         CountryInfo(isoCode = "NO", callingCode = "+47"),
+        CountryInfo(isoCode = "NP", callingCode = "+977"),
+        CountryInfo(isoCode = "NR", callingCode = "+674"),
+        CountryInfo(isoCode = "NU", callingCode = "+683"),
+        CountryInfo(isoCode = "NZ", callingCode = "+64"),
         CountryInfo(isoCode = "OM", callingCode = "+968"),
-        CountryInfo(isoCode = "PK", callingCode = "+92"),
-        CountryInfo(isoCode = "PW", callingCode = "+680"),
         CountryInfo(isoCode = "PA", callingCode = "+507"),
-        CountryInfo(isoCode = "PG", callingCode = "+675"),
-        CountryInfo(isoCode = "PY", callingCode = "+595"),
         CountryInfo(isoCode = "PE", callingCode = "+51"),
+        CountryInfo(isoCode = "PF", callingCode = "+689"),
+        CountryInfo(isoCode = "PG", callingCode = "+675"),
         CountryInfo(isoCode = "PH", callingCode = "+63"),
+        CountryInfo(isoCode = "PK", callingCode = "+92"),
         CountryInfo(isoCode = "PL", callingCode = "+48"),
-        CountryInfo(isoCode = "PT", callingCode = "+351"),
+        CountryInfo(isoCode = "PM", callingCode = "+508"),
+        CountryInfo(isoCode = "PN", callingCode = "+872"),
         CountryInfo(isoCode = "PR", callingCode = "+1939"),
+        CountryInfo(isoCode = "PS", callingCode = "+970"),
+        CountryInfo(isoCode = "PT", callingCode = "+351"),
+        CountryInfo(isoCode = "PW", callingCode = "+680"),
+        CountryInfo(isoCode = "PY", callingCode = "+595"),
         CountryInfo(isoCode = "QA", callingCode = "+974"),
+        CountryInfo(isoCode = "RE", callingCode = "+262"),
         CountryInfo(isoCode = "RO", callingCode = "+40"),
+        CountryInfo(isoCode = "RS", callingCode = "+381"),
+        CountryInfo(isoCode = "RU", callingCode = "+7"),
         CountryInfo(isoCode = "RW", callingCode = "+250"),
-        CountryInfo(isoCode = "WS", callingCode = "+685"),
-        CountryInfo(isoCode = "SM", callingCode = "+378"),
         CountryInfo(isoCode = "SA", callingCode = "+966"),
-        CountryInfo(isoCode = "SN", callingCode = "+221"),
-        CountryInfo(isoCode = "RS", callingCode = "+381"),
+        CountryInfo(isoCode = "SB", callingCode = "+677"),
         CountryInfo(isoCode = "SC", callingCode = "+248"),
-        CountryInfo(isoCode = "SL", callingCode = "+232"),
+        CountryInfo(isoCode = "SD", callingCode = "+249"),
+        CountryInfo(isoCode = "SE", callingCode = "+46"),
         CountryInfo(isoCode = "SG", callingCode = "+65"),
-        CountryInfo(isoCode = "SK", callingCode = "+421"),
+        CountryInfo(isoCode = "SH", callingCode = "+290"),
         CountryInfo(isoCode = "SI", callingCode = "+386"),
-        CountryInfo(isoCode = "SB", callingCode = "+677"),
-        CountryInfo(isoCode = "ZA", callingCode = "+27"),
-        CountryInfo(isoCode = "GS", callingCode = "+500"),
-        CountryInfo(isoCode = "ES", callingCode = "+34"),
-        CountryInfo(isoCode = "LK", callingCode = "+94"),
-        CountryInfo(isoCode = "SD", callingCode = "+249"),
+        CountryInfo(isoCode = "SJ", callingCode = "+47"),
+        CountryInfo(isoCode = "SK", callingCode = "+421"),
+        CountryInfo(isoCode = "SL", callingCode = "+232"),
+        CountryInfo(isoCode = "SM", callingCode = "+378"),
+        CountryInfo(isoCode = "SN", callingCode = "+221"),
+        CountryInfo(isoCode = "SO", callingCode = "+252"),
         CountryInfo(isoCode = "SR", callingCode = "+597"),
+        CountryInfo(isoCode = "ST", callingCode = "+239"),
+        CountryInfo(isoCode = "SV", callingCode = "+503"),
+        CountryInfo(isoCode = "SY", callingCode = "+963"),
         CountryInfo(isoCode = "SZ", callingCode = "+268"),
-        CountryInfo(isoCode = "SE", callingCode = "+46"),
-        CountryInfo(isoCode = "CH", callingCode = "+41"),
-        CountryInfo(isoCode = "TJ", callingCode = "+992"),
-        CountryInfo(isoCode = "TH", callingCode = "+66"),
+        CountryInfo(isoCode = "TC", callingCode = "+1649"),
+        CountryInfo(isoCode = "TD", callingCode = "+235"),
         CountryInfo(isoCode = "TG", callingCode = "+228"),
+        CountryInfo(isoCode = "TH", callingCode = "+66"),
+        CountryInfo(isoCode = "TJ", callingCode = "+992"),
         CountryInfo(isoCode = "TK", callingCode = "+690"),
-        CountryInfo(isoCode = "TO", callingCode = "+676"),
-        CountryInfo(isoCode = "TT", callingCode = "+1868"),
+        CountryInfo(isoCode = "TL", callingCode = "+670"),
+        CountryInfo(isoCode = "TM", callingCode = "+993"),
         CountryInfo(isoCode = "TN", callingCode = "+216"),
+        CountryInfo(isoCode = "TO", callingCode = "+676"),
         CountryInfo(isoCode = "TR", callingCode = "+90"),
-        CountryInfo(isoCode = "TM", callingCode = "+993"),
-        CountryInfo(isoCode = "TC", callingCode = "+1649"),
+        CountryInfo(isoCode = "TT", callingCode = "+1868"),
         CountryInfo(isoCode = "TV", callingCode = "+688"),
-        CountryInfo(isoCode = "UG", callingCode = "+256"),
+        CountryInfo(isoCode = "TW", callingCode = "+886"),
+        CountryInfo(isoCode = "TZ", callingCode = "+255"),
         CountryInfo(isoCode = "UA", callingCode = "+380"),
-        CountryInfo(isoCode = "AE", callingCode = "+971"),
-        CountryInfo(isoCode = "GB", callingCode = "+44"),
+        CountryInfo(isoCode = "UG", callingCode = "+256"),
         CountryInfo(isoCode = "US", callingCode = "+1"),
         CountryInfo(isoCode = "UY", callingCode = "+598"),
         CountryInfo(isoCode = "UZ", callingCode = "+998"),
+        CountryInfo(isoCode = "VA", callingCode = "+379"),
+        CountryInfo(isoCode = "VC", callingCode = "+1784"),
+        CountryInfo(isoCode = "VE", callingCode = "+58"),
+        CountryInfo(isoCode = "VG", callingCode = "+1284"),
+        CountryInfo(isoCode = "VI", callingCode = "+1340"),
+        CountryInfo(isoCode = "VN", callingCode = "+84"),
         CountryInfo(isoCode = "VU", callingCode = "+678"),
         CountryInfo(isoCode = "WF", callingCode = "+681"),
+        CountryInfo(isoCode = "WS", callingCode = "+685"),
         CountryInfo(isoCode = "YE", callingCode = "+967"),
+        CountryInfo(isoCode = "YT", callingCode = "+262"),
+        CountryInfo(isoCode = "ZA", callingCode = "+27"),
         CountryInfo(isoCode = "ZM", callingCode = "+260"),
         CountryInfo(isoCode = "ZW", callingCode = "+263"),
-        CountryInfo(isoCode = "AX", callingCode = "+358"),
-        CountryInfo(isoCode = "AQ", callingCode = "+672"),
-        CountryInfo(isoCode = "BO", callingCode = "+591"),
-        CountryInfo(isoCode = "BN", callingCode = "+673"),
-        CountryInfo(isoCode = "CC", callingCode = "+61"),
-        CountryInfo(isoCode = "CD", callingCode = "+243"),
-        CountryInfo(isoCode = "CI", callingCode = "+225"),
-        CountryInfo(isoCode = "FK", callingCode = "+500"),
-        CountryInfo(isoCode = "GG", callingCode = "+44"),
-        CountryInfo(isoCode = "VA", callingCode = "+379"),
-        CountryInfo(isoCode = "HK", callingCode = "+852"),
-        CountryInfo(isoCode = "IR", callingCode = "+98"),
-        CountryInfo(isoCode = "IM", callingCode = "+44"),
-        CountryInfo(isoCode = "JE", callingCode = "+44"),
-        CountryInfo(isoCode = "KP", callingCode = "+850"),
-        CountryInfo(isoCode = "KR", callingCode = "+82"),
-        CountryInfo(isoCode = "LA", callingCode = "+856"),
-        CountryInfo(isoCode = "LY", callingCode = "+218"),
-        CountryInfo(isoCode = "MO", callingCode = "+853"),
-        CountryInfo(isoCode = "MK", callingCode = "+389"),
-        CountryInfo(isoCode = "FM", callingCode = "+691"),
-        CountryInfo(isoCode = "MD", callingCode = "+373"),
-        CountryInfo(isoCode = "MZ", callingCode = "+258"),
-        CountryInfo(isoCode = "PS", callingCode = "+970"),
-        CountryInfo(isoCode = "PN", callingCode = "+872"),
-        CountryInfo(isoCode = "RE", callingCode = "+262"),
-        CountryInfo(isoCode = "RU", callingCode = "+7"),
-        CountryInfo(isoCode = "BL", callingCode = "+590"),
-        CountryInfo(isoCode = "SH", callingCode = "+290"),
-        CountryInfo(isoCode = "KN", callingCode = "+1869"),
-        CountryInfo(isoCode = "LC", callingCode = "+1758"),
-        CountryInfo(isoCode = "MF", callingCode = "+590"),
-        CountryInfo(isoCode = "PM", callingCode = "+508"),
-        CountryInfo(isoCode = "VC", callingCode = "+1784"),
-        CountryInfo(isoCode = "ST", callingCode = "+239"),
-        CountryInfo(isoCode = "SO", callingCode = "+252"),
-        CountryInfo(isoCode = "SJ", callingCode = "+47"),
-        CountryInfo(isoCode = "SY", callingCode = "+963"),
-        CountryInfo(isoCode = "TW", callingCode = "+886"),
-        CountryInfo(isoCode = "TZ", callingCode = "+255"),
-        CountryInfo(isoCode = "TL", callingCode = "+670"),
-        CountryInfo(isoCode = "VE", callingCode = "+58"),
-        CountryInfo(isoCode = "VN", callingCode = "+84"),
-        CountryInfo(isoCode = "VG", callingCode = "+1284"),
-        CountryInfo(isoCode = "VI", callingCode = "+1340")
     )
 }
 
diff --git a/components-core/src/test/java/com/adyen/checkout/components/core/internal/util/CountryUtilsTest.kt b/components-core/src/test/java/com/adyen/checkout/components/core/internal/util/CountryUtilsTest.kt
new file mode 100644
index 0000000000..49f8189ecf
--- /dev/null
+++ b/components-core/src/test/java/com/adyen/checkout/components/core/internal/util/CountryUtilsTest.kt
@@ -0,0 +1,45 @@
+package com.adyen.checkout.components.core.internal.util
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
+import java.util.Locale
+
+internal class CountryUtilsTest {
+
+    @Nested
+    inner class GetCountriesTest {
+
+        @Test
+        fun `when passing nothing, then all countries are returned`() {
+            val actual = CountryUtils.getCountries()
+
+            assertEquals(CountryUtils.countries, actual)
+        }
+
+        @Test
+        fun `when passing list of countries, then only specified countries are returned`() {
+            val specifiedCountries = listOf(
+                "NL",
+                "US",
+                "DE",
+            )
+            val actual = CountryUtils.getCountries(specifiedCountries)
+
+            val expected = listOf(
+                CountryInfo(isoCode = "DE", callingCode = "+49"),
+                CountryInfo(isoCode = "NL", callingCode = "+31"),
+                CountryInfo(isoCode = "US", callingCode = "+1"),
+            )
+            assertEquals(expected, actual)
+        }
+    }
+
+    @Test
+    fun `when getting country name, then it is returned localized`() {
+        val actual = CountryUtils.getCountryName("NL", Locale.US)
+
+        val expected = "Netherlands"
+        assertEquals(expected, actual)
+    }
+}