Skip to content

Make CountrySelectionPage use new SelectionList #76979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grgia merged 2 commits into from
Dec 9, 2025
Merged

Make CountrySelectionPage use new SelectionList #76979

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e89582f
Make CountrySelectionPage use new SelectionList
zfurtak Dec 8, 2025
f99729a
Merge branch 'main' into @zfurtak/migrate-CountrySelectionPage
zfurtak Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, {useCallback, useMemo, useState} from 'react';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import SelectionList from '@components/SelectionListWithSections';
import RadioListItem from '@components/SelectionListWithSections/RadioListItem';
import SelectionList from '@components/SelectionList';
import RadioListItem from '@components/SelectionList/ListItem/RadioListItem';
import useLocalize from '@hooks/useLocalize';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
Expand Down Expand Up @@ -39,7 +39,6 @@ function CountrySelectionPage({route}: CountrySelectionPageProps) {
);

const searchResults = searchOptions(searchValue, countries);
const headerMessage = searchValue.trim() && !searchResults.length ? translate('common.noResultsFound') : '';

const selectCountry = useCallback(
(option: Option) => {
Expand All @@ -56,6 +55,16 @@ function CountrySelectionPage({route}: CountrySelectionPageProps) {
[route.params.backTo],
);

const textInputOptions = useMemo(
() => ({
headerMessage: searchValue.trim() && !searchResults.length ? translate('common.noResultsFound') : '',
label: translate('common.country'),
value: searchValue,
onChangeText: setSearchValue,
}),
[searchResults.length, searchValue, translate],
);

return (
<ScreenWrapper
testID={CountrySelectionPage.displayName}
Expand All @@ -72,16 +81,12 @@ function CountrySelectionPage({route}: CountrySelectionPageProps) {
/>

<SelectionList
headerMessage={headerMessage}
textInputLabel={translate('common.country')}
textInputValue={searchValue}
sections={[{data: searchResults}]}
data={searchResults}
ListItem={RadioListItem}
onSelectRow={selectCountry}
textInputOptions={textInputOptions}
initiallyFocusedItemKey={currentCountry}
shouldSingleExecuteRowSelect
onChangeText={setSearchValue}
initiallyFocusedOptionKey={currentCountry}
shouldUseDynamicMaxToRenderPerBatch
addBottomSafeAreaPadding
/>
</ScreenWrapper>
Expand Down
Loading