Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ export default function Settings() {
isDisabled={!languages?.length}
onOdsChange={onChange}
onBlur={onBlur}
key={`languages_for_${selectedCountry}`}
key={`languages_for_${selectedCountry}_${selectedCurrency}`}
hasError={Boolean(languages?.length && errors[name])}
data-testid="language-select"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,8 @@ describe('SettingsPage', () => {
await setInputhValue(currencySelectElement, 'EUR');
});

const languageSelectElement = screen.getByTestId('language-select');

await waitFor(() => {
const languageSelectElement = screen.getByTestId('language-select');
expect(languageSelectElement.getAttribute('is-disabled')).not.toBe(
'true',
);
Expand All @@ -134,10 +133,9 @@ describe('SettingsPage', () => {
await setInputhValue(countryComboboxElement, 'GB');
});

const currencySelectElement = screen.getByTestId('currency-select');
const languageSelectElement = screen.getByTestId('language-select');

await waitFor(() => {
const currencySelectElement = screen.getByTestId('currency-select');
const languageSelectElement = screen.getByTestId('language-select');
expect(currencySelectElement.getAttribute('value')).toBe('GBP');
expect(languageSelectElement.getAttribute('value')).toBe('en-GB');
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export default (
Component={LayoutPage}
errorElement={
<ErrorBoundary
isPreloaderHide
isRouteShellSync
redirectionApp="account-creation"
/>
Expand Down
Loading