Merge pull request #29736 from tienifr/fix/29620

fix: 29620 Site in Spanish automatically changes to English on signing out

src/pages/signin/SignInPage.js

@@ -70,13 +70,17 @@ const propTypes = {
 
     /** Whether or not the sign in page is being rendered in the RHP modal */
     isInModal: PropTypes.bool,
+
+    /** The user's preferred locale */
+    preferredLocale: PropTypes.string,
 };
 
 const defaultProps = {
     account: {},
     credentials: {},
     isInModal: false,
     activeClients: [],
+    preferredLocale: '',
 };
 
 /**
@@ -131,7 +135,7 @@ function getRenderOptions({hasLogin, hasValidateCode, account, isPrimaryLogin, i
     };
 }
 
-function SignInPage({credentials, account, isInModal, activeClients}) {
+function SignInPage({credentials, account, isInModal, activeClients, preferredLocale}) {
     const {translate, formatPhoneNumber} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
     const shouldShowSmallScreen = isSmallScreenWidth || isInModal;
@@ -153,8 +157,11 @@ function SignInPage({credentials, account, isInModal, activeClients}) {
 
     useEffect(() => Performance.measureTTI(), []);
     useEffect(() => {
+        if (preferredLocale) {
+            return;
+        }
         App.setLocale(Localize.getDevicePreferredLocale());
-    }, []);
+    }, [preferredLocale]);
 
     const {
         shouldShowLoginForm,
@@ -273,4 +280,7 @@ export default withOnyx({
     We use that function to prevent repeating code that checks which client is the leader.
     */
     activeClients: {key: ONYXKEYS.ACTIVE_CLIENTS},
+    preferredLocale: {
+        key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+    },
 })(SignInPage);