Skip to content

Fix country list is scrolled with animation on mount #62978

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
inimaga merged 1 commit into from
Jun 1, 2025
Merged

Fix country list is scrolled with animation on mount #62978

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 18 additions & 19 deletions src/pages/workspace/companyCards/addNew/SelectCountryStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,24 @@ function SelectCountryStep({policyID}: CountryStepProps) {
const policy = usePolicy(policyID);
const [currencyList = {}] = useOnyx(ONYXKEYS.CURRENCY_LIST, {canBeMissing: true});
const [countryByIp] = useOnyx(ONYXKEYS.COUNTRY, {canBeMissing: false});
const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD, {canBeMissing: true});

const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');
const [currentCountry, setCurrentCountry] = useState<string | undefined>('');
const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD, {canBeMissing: true});

const getCountry = useCallback(() => {
if (addNewCard?.data?.selectedCountry) {
return addNewCard.data.selectedCountry;
}
const selectedCurrency = policy?.outputCurrency ? currencyList?.[policy.outputCurrency] : null;
const countries = selectedCurrency?.countries;

if (policy?.outputCurrency === CONST.CURRENCY.EUR && countryByIp && countries?.includes(countryByIp)) {
return countryByIp;
}
const country = countries?.[0];
return country ?? '';
}, [addNewCard?.data.selectedCountry, countryByIp, currencyList, policy?.outputCurrency]);
const [currentCountry, setCurrentCountry] = useState<string | undefined>(getCountry);
const [hasError, setHasError] = useState(false);

const submit = () => {
Expand All @@ -59,23 +73,8 @@ function SelectCountryStep({policyID}: CountryStepProps) {
};

useEffect(() => {
if (addNewCard?.data?.selectedCountry) {
setCurrentCountry(addNewCard.data.selectedCountry);
return;
}
const selectedCurrency = policy?.outputCurrency ? currencyList?.[policy.outputCurrency] : null;
const countries = selectedCurrency?.countries;

if (policy?.outputCurrency === CONST.CURRENCY.EUR && countryByIp && countries?.includes(countryByIp)) {
setCurrentCountry(countryByIp);
return;
}
const country = countries?.[0];

if (country) {
setCurrentCountry(country);
}
}, [addNewCard?.data.selectedCountry, countryByIp, currencyList, policy?.outputCurrency]);
setCurrentCountry(getCountry());
}, [getCountry]);

const handleBackButtonPress = () => {
if (route?.params?.backTo) {
Expand Down