From b04a5bc591cfa9cd195069c7dece8e03d604bf6c Mon Sep 17 00:00:00 2001
From: Delucse <46593742+Delucse@users.noreply.github.com>
Date: Mon, 14 Dec 2020 20:04:49 +0100
Subject: [PATCH] store locale in localStorage only if user is not logged in

---
 src/actions/authActions.js    | 5 ++++-
 src/actions/generalActions.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/actions/authActions.js b/src/actions/authActions.js
index ebd8151..77e3f4b 100644
--- a/src/actions/authActions.js
+++ b/src/actions/authActions.js
@@ -54,6 +54,9 @@ const timeToLogout = 14.9*60*1000; // nearly 15 minutes corresponding to the API
 
 // Login user
 export const login = ({ email, password }) => (dispatch) => {
+  dispatch({
+    type: USER_LOADING
+  });
   // Headers
   const config = {
     headers: {
@@ -70,11 +73,11 @@ export const login = ({ email, password }) => (dispatch) => {
       timeToLogout
     );
     logoutTimerId = logoutTimer();
+    dispatch(setLanguage(res.data.user.language));
     dispatch({
       type: LOGIN_SUCCESS,
       payload: res.data
     });
-    dispatch(setLanguage(res.data.user.language));
     dispatch({
       type: GET_STATUS,
       payload: res.data.user.status
diff --git a/src/actions/generalActions.js b/src/actions/generalActions.js
index 6d1838b..754f438 100644
--- a/src/actions/generalActions.js
+++ b/src/actions/generalActions.js
@@ -8,7 +8,7 @@ export const visitPage = () => (dispatch) => {
 };
 
 export const setLanguage = (language) => (dispatch, getState) => {
-  if(!getState().auth.isAuthenticated){
+  if(!getState().auth.progress && !getState().auth.isAuthenticated){
     window.localStorage.setItem('locale', language);
   }
   dispatch({