From 3f4bb2dcb9ba9f2e0a8f6a47640daf78d451e7a9 Mon Sep 17 00:00:00 2001
From: achraf hafedh <achraf.hafedh.ext@ovhcloud.com>
Date: Wed, 26 Nov 2025 16:58:05 +0100
Subject: [PATCH] fix(account-creation): fix crashe in settings page

ref: #MANAGER-20305

Signed-off-by: achraf hafedh <achraf.hafedh.ext@ovhcloud.com>
---
 .../account-creation/src/pages/settings/settings.page.tsx | 2 +-
 .../account-creation/src/pages/settings/settings.spec.tsx | 8 +++-----
 .../manager/apps/account-creation/src/routes/routes.tsx   | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/manager/apps/account-creation/src/pages/settings/settings.page.tsx b/packages/manager/apps/account-creation/src/pages/settings/settings.page.tsx
index e25180874980..5852ea7c5284 100644
--- a/packages/manager/apps/account-creation/src/pages/settings/settings.page.tsx
+++ b/packages/manager/apps/account-creation/src/pages/settings/settings.page.tsx
@@ -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"
               >
diff --git a/packages/manager/apps/account-creation/src/pages/settings/settings.spec.tsx b/packages/manager/apps/account-creation/src/pages/settings/settings.spec.tsx
index 71cbd5ffcb1d..4d396237594d 100644
--- a/packages/manager/apps/account-creation/src/pages/settings/settings.spec.tsx
+++ b/packages/manager/apps/account-creation/src/pages/settings/settings.spec.tsx
@@ -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',
       );
@@ -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');
     });
diff --git a/packages/manager/apps/account-creation/src/routes/routes.tsx b/packages/manager/apps/account-creation/src/routes/routes.tsx
index 8aea108504c8..aa974ed98ad6 100644
--- a/packages/manager/apps/account-creation/src/routes/routes.tsx
+++ b/packages/manager/apps/account-creation/src/routes/routes.tsx
@@ -20,7 +20,6 @@ export default (
     Component={LayoutPage}
     errorElement={
       <ErrorBoundary
-        isPreloaderHide
         isRouteShellSync
         redirectionApp="account-creation"
       />