From e1759845068d6dd2d8f72e07c4dd27d5cb014f64 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Fri, 19 Jan 2024 16:11:18 -0800 Subject: [PATCH] Improve country-code handling for text verification (#2579) --- src/lib/country-codes.ts | 253 +++++++++++++++++++++++++++++ src/view/com/auth/create/Step2.tsx | 112 ++++++++++++- src/view/com/auth/create/state.ts | 13 +- 3 files changed, 371 insertions(+), 7 deletions(-) create mode 100644 src/lib/country-codes.ts diff --git a/src/lib/country-codes.ts b/src/lib/country-codes.ts new file mode 100644 index 00000000..c7afc62a --- /dev/null +++ b/src/lib/country-codes.ts @@ -0,0 +1,253 @@ +import {CountryCode} from 'libphonenumber-js' + +// ISO 3166-1 alpha-2 codes + +export interface CountryCodeMap { + code2: CountryCode + name: string +} + +export const COUNTRY_CODES: CountryCodeMap[] = [ + {code2: 'AF', name: 'Afghanistan (+93)'}, + {code2: 'AX', name: 'Åland Islands (+358)'}, + {code2: 'AL', name: 'Albania (+355)'}, + {code2: 'DZ', name: 'Algeria (+213)'}, + {code2: 'AS', name: 'American Samoa (+1)'}, + {code2: 'AD', name: 'Andorra (+376)'}, + {code2: 'AO', name: 'Angola (+244)'}, + {code2: 'AI', name: 'Anguilla (+1)'}, + {code2: 'AG', name: 'Antigua and Barbuda (+1)'}, + {code2: 'AR', name: 'Argentina (+54)'}, + {code2: 'AM', name: 'Armenia (+374)'}, + {code2: 'AW', name: 'Aruba (+297)'}, + {code2: 'AU', name: 'Australia (+61)'}, + {code2: 'AT', name: 'Austria (+43)'}, + {code2: 'AZ', name: 'Azerbaijan (+994)'}, + {code2: 'BS', name: 'Bahamas (+1)'}, + {code2: 'BH', name: 'Bahrain (+973)'}, + {code2: 'BD', name: 'Bangladesh (+880)'}, + {code2: 'BB', name: 'Barbados (+1)'}, + {code2: 'BY', name: 'Belarus (+375)'}, + {code2: 'BE', name: 'Belgium (+32)'}, + {code2: 'BZ', name: 'Belize (+501)'}, + {code2: 'BJ', name: 'Benin (+229)'}, + {code2: 'BM', name: 'Bermuda (+1)'}, + {code2: 'BT', name: 'Bhutan (+975)'}, + {code2: 'BO', name: 'Bolivia (Plurinational State of) (+591)'}, + {code2: 'BQ', name: 'Bonaire, Sint Eustatius and Saba (+599)'}, + {code2: 'BA', name: 'Bosnia and Herzegovina (+387)'}, + {code2: 'BW', name: 'Botswana (+267)'}, + {code2: 'BR', name: 'Brazil (+55)'}, + {code2: 'IO', name: 'British Indian Ocean Territory (+246)'}, + {code2: 'BN', name: 'Brunei Darussalam (+673)'}, + {code2: 'BG', name: 'Bulgaria (+359)'}, + {code2: 'BF', name: 'Burkina Faso (+226)'}, + {code2: 'BI', name: 'Burundi (+257)'}, + {code2: 'CV', name: 'Cabo Verde (+238)'}, + {code2: 'KH', name: 'Cambodia (+855)'}, + {code2: 'CM', name: 'Cameroon (+237)'}, + {code2: 'CA', name: 'Canada (+1)'}, + {code2: 'KY', name: 'Cayman Islands (+1)'}, + {code2: 'CF', name: 'Central African Republic (+236)'}, + {code2: 'TD', name: 'Chad (+235)'}, + {code2: 'CL', name: 'Chile (+56)'}, + {code2: 'CN', name: 'China (+86)'}, + {code2: 'CX', name: 'Christmas Island (+61)'}, + {code2: 'CC', name: 'Cocos (Keeling) Islands (+61)'}, + {code2: 'CO', name: 'Colombia (+57)'}, + {code2: 'KM', name: 'Comoros (+269)'}, + {code2: 'CG', name: 'Congo (+242)'}, + {code2: 'CD', name: 'Congo, Democratic Republic of the (+243)'}, + {code2: 'CK', name: 'Cook Islands (+682)'}, + {code2: 'CR', name: 'Costa Rica (+506)'}, + {code2: 'CI', name: "Côte d'Ivoire (+225)"}, + {code2: 'HR', name: 'Croatia (+385)'}, + {code2: 'CU', name: 'Cuba (+53)'}, + {code2: 'CW', name: 'Curaçao (+599)'}, + {code2: 'CY', name: 'Cyprus (+357)'}, + {code2: 'CZ', name: 'Czechia (+420)'}, + {code2: 'DK', name: 'Denmark (+45)'}, + {code2: 'DJ', name: 'Djibouti (+253)'}, + {code2: 'DM', name: 'Dominica (+1)'}, + {code2: 'DO', name: 'Dominican Republic (+1)'}, + {code2: 'EC', name: 'Ecuador (+593)'}, + {code2: 'EG', name: 'Egypt (+20)'}, + {code2: 'SV', name: 'El Salvador (+503)'}, + {code2: 'GQ', name: 'Equatorial Guinea (+240)'}, + {code2: 'ER', name: 'Eritrea (+291)'}, + {code2: 'EE', name: 'Estonia (+372)'}, + {code2: 'SZ', name: 'Eswatini (+268)'}, + {code2: 'ET', name: 'Ethiopia (+251)'}, + {code2: 'FK', name: 'Falkland Islands (Malvinas) (+500)'}, + {code2: 'FO', name: 'Faroe Islands (+298)'}, + {code2: 'FJ', name: 'Fiji (+679)'}, + {code2: 'FI', name: 'Finland (+358)'}, + {code2: 'FR', name: 'France (+33)'}, + {code2: 'GF', name: 'French Guiana (+594)'}, + {code2: 'PF', name: 'French Polynesia (+689)'}, + {code2: 'GA', name: 'Gabon (+241)'}, + {code2: 'GM', name: 'Gambia (+220)'}, + {code2: 'GE', name: 'Georgia (+995)'}, + {code2: 'DE', name: 'Germany (+49)'}, + {code2: 'GH', name: 'Ghana (+233)'}, + {code2: 'GI', name: 'Gibraltar (+350)'}, + {code2: 'GB', name: 'Great Britain (+44)'}, + {code2: 'GR', name: 'Greece (+30)'}, + {code2: 'GL', name: 'Greenland (+299)'}, + {code2: 'GD', name: 'Grenada (+1)'}, + {code2: 'GP', name: 'Guadeloupe (+590)'}, + {code2: 'GU', name: 'Guam (+1)'}, + {code2: 'GT', name: 'Guatemala (+502)'}, + {code2: 'GG', name: 'Guernsey (+44)'}, + {code2: 'GN', name: 'Guinea (+224)'}, + {code2: 'GW', name: 'Guinea-Bissau (+245)'}, + {code2: 'GY', name: 'Guyana (+592)'}, + {code2: 'HT', name: 'Haiti (+509)'}, + {code2: 'VA', name: 'Holy See (+39)'}, + {code2: 'HN', name: 'Honduras (+504)'}, + {code2: 'HK', name: 'Hong Kong (+852)'}, + {code2: 'HU', name: 'Hungary (+36)'}, + {code2: 'IS', name: 'Iceland (+354)'}, + {code2: 'IN', name: 'India (+91)'}, + {code2: 'ID', name: 'Indonesia (+62)'}, + {code2: 'IR', name: 'Iran (Islamic Republic of) (+98)'}, + {code2: 'IQ', name: 'Iraq (+964)'}, + {code2: 'IE', name: 'Ireland (+353)'}, + {code2: 'IM', name: 'Isle of Man (+44)'}, + {code2: 'IL', name: 'Israel (+972)'}, + {code2: 'IT', name: 'Italy (+39)'}, + {code2: 'JM', name: 'Jamaica (+1)'}, + {code2: 'JP', name: 'Japan (+81)'}, + {code2: 'JE', name: 'Jersey (+44)'}, + {code2: 'JO', name: 'Jordan (+962)'}, + {code2: 'KZ', name: 'Kazakhstan (+7)'}, + {code2: 'KE', name: 'Kenya (+254)'}, + {code2: 'KI', name: 'Kiribati (+686)'}, + {code2: 'KP', name: "Korea (Democratic People's Republic of) (+850)"}, + {code2: 'KR', name: 'Korea, Republic of (+82)'}, + {code2: 'KW', name: 'Kuwait (+965)'}, + {code2: 'KG', name: 'Kyrgyzstan (+996)'}, + {code2: 'LA', name: "Lao People's Democratic Republic (+856)"}, + {code2: 'LV', name: 'Latvia (+371)'}, + {code2: 'LB', name: 'Lebanon (+961)'}, + {code2: 'LS', name: 'Lesotho (+266)'}, + {code2: 'LR', name: 'Liberia (+231)'}, + {code2: 'LY', name: 'Libya (+218)'}, + {code2: 'LI', name: 'Liechtenstein (+423)'}, + {code2: 'LT', name: 'Lithuania (+370)'}, + {code2: 'LU', name: 'Luxembourg (+352)'}, + {code2: 'MO', name: 'Macao (+853)'}, + {code2: 'MG', name: 'Madagascar (+261)'}, + {code2: 'MW', name: 'Malawi (+265)'}, + {code2: 'MY', name: 'Malaysia (+60)'}, + {code2: 'MV', name: 'Maldives (+960)'}, + {code2: 'ML', name: 'Mali (+223)'}, + {code2: 'MT', name: 'Malta (+356)'}, + {code2: 'MH', name: 'Marshall Islands (+692)'}, + {code2: 'MQ', name: 'Martinique (+596)'}, + {code2: 'MR', name: 'Mauritania (+222)'}, + {code2: 'MU', name: 'Mauritius (+230)'}, + {code2: 'YT', name: 'Mayotte (+262)'}, + {code2: 'MX', name: 'Mexico (+52)'}, + {code2: 'FM', name: 'Micronesia (Federated States of) (+691)'}, + {code2: 'MD', name: 'Moldova, Republic of (+373)'}, + {code2: 'MC', name: 'Monaco (+377)'}, + {code2: 'MN', name: 'Mongolia (+976)'}, + {code2: 'ME', name: 'Montenegro (+382)'}, + {code2: 'MS', name: 'Montserrat (+1)'}, + {code2: 'MA', name: 'Morocco (+212)'}, + {code2: 'MZ', name: 'Mozambique (+258)'}, + {code2: 'MM', name: 'Myanmar (+95)'}, + {code2: 'NA', name: 'Namibia (+264)'}, + {code2: 'NR', name: 'Nauru (+674)'}, + {code2: 'NP', name: 'Nepal (+977)'}, + {code2: 'NL', name: 'Netherlands, Kingdom of the (+31)'}, + {code2: 'NC', name: 'New Caledonia (+687)'}, + {code2: 'NZ', name: 'New Zealand (+64)'}, + {code2: 'NI', name: 'Nicaragua (+505)'}, + {code2: 'NE', name: 'Niger (+227)'}, + {code2: 'NG', name: 'Nigeria (+234)'}, + {code2: 'NU', name: 'Niue (+683)'}, + {code2: 'NF', name: 'Norfolk Island (+672)'}, + {code2: 'MK', name: 'North Macedonia (+389)'}, + {code2: 'MP', name: 'Northern Mariana Islands (+1)'}, + {code2: 'NO', name: 'Norway (+47)'}, + {code2: 'OM', name: 'Oman (+968)'}, + {code2: 'PK', name: 'Pakistan (+92)'}, + {code2: 'PW', name: 'Palau (+680)'}, + {code2: 'PS', name: 'Palestine, State of (+970)'}, + {code2: 'PA', name: 'Panama (+507)'}, + {code2: 'PG', name: 'Papua New Guinea (+675)'}, + {code2: 'PY', name: 'Paraguay (+595)'}, + {code2: 'PE', name: 'Peru (+51)'}, + {code2: 'PH', name: 'Philippines (+63)'}, + {code2: 'PL', name: 'Poland (+48)'}, + {code2: 'PT', name: 'Portugal (+351)'}, + {code2: 'PR', name: 'Puerto Rico (+1)'}, + {code2: 'QA', name: 'Qatar (+974)'}, + {code2: 'RE', name: 'Réunion (+262)'}, + {code2: 'RO', name: 'Romania (+40)'}, + {code2: 'RU', name: 'Russian Federation (+7)'}, + {code2: 'RW', name: 'Rwanda (+250)'}, + {code2: 'BL', name: 'Saint Barthélemy (+590)'}, + {code2: 'SH', name: 'Saint Helena, Ascension and Tristan da Cunha (+290)'}, + {code2: 'KN', name: 'Saint Kitts and Nevis (+1)'}, + {code2: 'LC', name: 'Saint Lucia (+1)'}, + {code2: 'MF', name: 'Saint Martin (French part) (+590)'}, + {code2: 'PM', name: 'Saint Pierre and Miquelon (+508)'}, + {code2: 'VC', name: 'Saint Vincent and the Grenadines (+1)'}, + {code2: 'WS', name: 'Samoa (+685)'}, + {code2: 'SM', name: 'San Marino (+378)'}, + {code2: 'ST', name: 'Sao Tome and Principe (+239)'}, + {code2: 'SA', name: 'Saudi Arabia (+966)'}, + {code2: 'SN', name: 'Senegal (+221)'}, + {code2: 'RS', name: 'Serbia (+381)'}, + {code2: 'SC', name: 'Seychelles (+248)'}, + {code2: 'SL', name: 'Sierra Leone (+232)'}, + {code2: 'SG', name: 'Singapore (+65)'}, + {code2: 'SX', name: 'Sint Maarten (Dutch part) (+1)'}, + {code2: 'SK', name: 'Slovakia (+421)'}, + {code2: 'SI', name: 'Slovenia (+386)'}, + {code2: 'SB', name: 'Solomon Islands (+677)'}, + {code2: 'SO', name: 'Somalia (+252)'}, + {code2: 'ZA', name: 'South Africa (+27)'}, + {code2: 'SS', name: 'South Sudan (+211)'}, + {code2: 'ES', name: 'Spain (+34)'}, + {code2: 'LK', name: 'Sri Lanka (+94)'}, + {code2: 'SD', name: 'Sudan (+249)'}, + {code2: 'SR', name: 'Suriname (+597)'}, + {code2: 'SJ', name: 'Svalbard and Jan Mayen (+47)'}, + {code2: 'SE', name: 'Sweden (+46)'}, + {code2: 'CH', name: 'Switzerland (+41)'}, + {code2: 'SY', name: 'Syrian Arab Republic (+963)'}, + {code2: 'TW', name: 'Taiwan, Province of China (+886)'}, + {code2: 'TJ', name: 'Tajikistan (+992)'}, + {code2: 'TZ', name: 'Tanzania, United Republic of (+255)'}, + {code2: 'TH', name: 'Thailand (+66)'}, + {code2: 'TL', name: 'Timor-Leste (+670)'}, + {code2: 'TG', name: 'Togo (+228)'}, + {code2: 'TK', name: 'Tokelau (+690)'}, + {code2: 'TO', name: 'Tonga (+676)'}, + {code2: 'TT', name: 'Trinidad and Tobago (+1)'}, + {code2: 'TN', name: 'Tunisia (+216)'}, + {code2: 'TR', name: 'Türkiye (+90)'}, + {code2: 'TM', name: 'Turkmenistan (+993)'}, + {code2: 'TC', name: 'Turks and Caicos Islands (+1)'}, + {code2: 'TV', name: 'Tuvalu (+688)'}, + {code2: 'UG', name: 'Uganda (+256)'}, + {code2: 'UA', name: 'Ukraine (+380)'}, + {code2: 'AE', name: 'United Arab Emirates (+971)'}, + {code2: 'US', name: 'United States of America (+1)'}, + {code2: 'UY', name: 'Uruguay (+598)'}, + {code2: 'UZ', name: 'Uzbekistan (+998)'}, + {code2: 'VU', name: 'Vanuatu (+678)'}, + {code2: 'VE', name: 'Venezuela (Bolivarian Republic of) (+58)'}, + {code2: 'VN', name: 'Viet Nam (+84)'}, + {code2: 'VI', name: 'Virgin Islands (+1)'}, + {code2: 'VG', name: 'Virgin Islands (British) (+1)'}, + {code2: 'WF', name: 'Wallis and Futuna (+681)'}, + {code2: 'EH', name: 'Western Sahara (+212)'}, + {code2: 'YE', name: 'Yemen (+967)'}, + {code2: 'ZM', name: 'Zambia (+260)'}, + {code2: 'ZW', name: 'Zimbabwe (+263)'}, +] diff --git a/src/view/com/auth/create/Step2.tsx b/src/view/com/auth/create/Step2.tsx index f938bb9c..e3e938d1 100644 --- a/src/view/com/auth/create/Step2.tsx +++ b/src/view/com/auth/create/Step2.tsx @@ -5,6 +5,7 @@ import { TouchableWithoutFeedback, View, } from 'react-native' +import RNPickerSelect from 'react-native-picker-select' import { CreateAccountState, CreateAccountDispatch, @@ -17,11 +18,16 @@ import {usePalette} from 'lib/hooks/usePalette' import {TextInput} from '../util/TextInput' import {Button} from '../../util/forms/Button' import {ErrorMessage} from 'view/com/util/error/ErrorMessage' -import {isWeb} from 'platform/detection' +import {isAndroid, isWeb} from 'platform/detection' import {Trans, msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries' import parsePhoneNumber from 'libphonenumber-js' +import {COUNTRY_CODES} from '#/lib/country-codes' +import { + FontAwesomeIcon, + FontAwesomeIconStyle, +} from '@fortawesome/react-native-fontawesome' export function Step2({ uiState, @@ -37,14 +43,14 @@ export function Step2({ const onPressRequest = React.useCallback(() => { if ( uiState.verificationPhone.length >= 9 && - parsePhoneNumber(uiState.verificationPhone, 'US') + parsePhoneNumber(uiState.verificationPhone, uiState.phoneCountry) ) { requestVerificationCode({uiState, uiDispatch, _}) } else { uiDispatch({ type: 'set-error', value: _( - msg`There's something wrong with this number. Please include your country and/or area code!`, + msg`There's something wrong with this number. Please choose your country and enter your full phone number!`, ), }) } @@ -59,10 +65,14 @@ export function Step2({ uiState.hasRequestedVerificationCode ? parsePhoneNumber( uiState.verificationPhone, - 'US', + uiState.phoneCountry, )?.formatInternational() : '', - [uiState.hasRequestedVerificationCode, uiState.verificationPhone], + [ + uiState.hasRequestedVerificationCode, + uiState.verificationPhone, + uiState.phoneCountry, + ], ) return ( @@ -71,6 +81,98 @@ export function Step2({ {!uiState.hasRequestedVerificationCode ? ( <> + + + Country + + + + uiDispatch({type: 'set-phone-country', value}) + } + items={COUNTRY_CODES.filter(l => Boolean(l.code2)).map(l => ({ + label: l.name, + value: l.code2, + key: l.code2, + }))} + style={{ + inputAndroid: { + backgroundColor: pal.view.backgroundColor, + color: pal.text.color, + fontSize: 21, + letterSpacing: 0.5, + fontWeight: '500', + paddingHorizontal: 14, + paddingVertical: 8, + borderRadius: 4, + }, + inputIOS: { + backgroundColor: pal.view.backgroundColor, + color: pal.text.color, + fontSize: 14, + letterSpacing: 0.5, + fontWeight: '500', + paddingHorizontal: 14, + paddingVertical: 8, + borderWidth: 1, + borderColor: pal.border.borderColor, + borderRadius: 4, + }, + inputWeb: { + // @ts-ignore web only + cursor: 'pointer', + '-moz-appearance': 'none', + '-webkit-appearance': 'none', + appearance: 'none', + outline: 0, + borderWidth: 1, + borderColor: pal.border.borderColor, + backgroundColor: pal.view.backgroundColor, + color: pal.text.color, + fontSize: 14, + letterSpacing: 0.5, + fontWeight: '500', + paddingHorizontal: 14, + paddingVertical: 8, + borderRadius: 4, + }, + }} + accessibilityLabel={_(msg`Select your phone's country`)} + accessibilityHint="" + accessibilityLabelledBy="phoneCountry" + /> + + + + + +